gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control system
diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
*/
public class mjc2wsl{
//default version name, used if the file is not found
- private static String versionN = "0.1.x";
+ private static String versionN = "v0.2.x";
private String versionFile = "/version.properties";
public String createStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
- +"C:\" with mjc2wsl v "+getVersion()+"\";\n");
+ +"C:\" with mjc2wsl "+getVersion()+"\";\n");
ret.append("\nBEGIN");
ret.append("\nVAR <\n\t");
if (!genLocalVars){
ret.append("\n\ttempa := 0, tempb :=0, tempres := 0,");
- }
+ } else
+ ret.append("\n\tmjvm_flag_jump := 0,");
ret.append("mjvm_locals := ARRAY(1,0),");
ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0),");
ret.append("\n\tmjvm_arrays := < >,");
- ret.append("\n\tmjvm_flag_jump := 0,");
ret.append("\n\tmjvm_objects := < >,");
ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
if (!genInlinePrint) {
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
- ret.append(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=1 TO ");
- ret.append("MAX(0, format-SLENGTH(@String(tempb))) STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+ ret.append("PRINFLUSH(@Format(format, val ))");
+ ret.append("\nEND\n");
ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
- ret.append(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
- ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
- ret.append("END\n");
+ ret.append("PRINFLUSH(@Format(format, CHR(val)))");
+ ret.append("\nEND\n");
}
ret.append("\nEND");
if (genPrintForEachAddress) {
prl("PRINT(\"a" + mjInput.getCounter() + "\");");
if (genPauseAfterEachAddress)
- prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+ prl("@Read_Line_Proc(VAR debug_disposable_string, Standard_Input_Port);");
}
switch (op) {
case load: {
case jle:
case jgt:
case jge: {
- prl(createStartVar("tempa", "tempb"));
- prl(createTopTwoEStack());
- prl("IF tempb " + mjInput.getRelationFor(op)
- + " tempa THEN mjvm_flag_jump := 1"
- + " ELSE mjvm_flag_jump := 0"
- + " FI;");
- prl(createEndVar());
- prl("IF mjvm_flag_jump = 1 THEN CALL a"
- + (mjInput.getCounter() + mjInput.get2())
- + " ELSE CALL a" + (mjInput.getCounter() + 1)
- + " FI;");
-
+ if (genLocalVars) {
+ prl(createStartVar("tempa", "tempb"));
+ prl(createTopTwoEStack());
+ prl("IF tempb " + mjInput.getRelationFor(op)
+ + " tempa THEN mjvm_flag_jump := 1"
+ + " ELSE mjvm_flag_jump := 0"
+ + " FI;");
+ prl(createEndVar());
+ prl("IF mjvm_flag_jump = 1 THEN CALL a"
+ + (mjInput.getCounter() + mjInput.get2())
+ + " ELSE CALL a" + (mjInput.getCounter() + 1)
+ + " FI;");
+ } else {
+ prl(createTopTwoEStack());
+ prl("IF tempb " + mjInput.getRelationFor(op)
+ + " tempa THEN CALL a"
+ + (mjInput.getCounter() + mjInput.get2())
+ + " ELSE CALL a" + (mjInput.getCounter() + 1)
+ + " FI;");
+ }
break;
}
// read, print
case bread: {
- // TODO make it a char for read
- messages.message("char is read like a number", TransMessages.M_WAR);
- prl(createComment("char is read like a number", C_SPEC));
+ // TODO maybe we'll need a bufer for multi chars!
+ prl(createStartVar("tempa"));
+ prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+ prl("tempa := @String_To_List(tempa)[1];");
+ prl(createToEStack("tempa"));
+ prl(createEndVar());
+ break;
}
case read: {
prl(createStartVar("tempa"));
- prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+ prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+ prl("tempa := @String_To_Num(tempa);");
prl(createToEStack("tempa"));
prl(createEndVar());
break;
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing and transformation",C_SPEC));
- prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, MAX(0,tempa-1))), @List_To_String(< tempb >));");
+ prl("PRINFLUSH(@Format(tempa, @List_To_String(< tempb >)));");
} else
prl("Print_MJ_CHAR(tempb,tempa);");
prl(createEndVar());
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing",C_SPEC));
- prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, MAX(0, tempa-SLENGTH(@String(tempb))))), tempb);");
+ prl("PRINFLUSH(@Format(tempa,tempb));");
}
else
prl("Print_MJ(tempb,tempa);");
}
public void printVersion() {
- System.out.println("MicroJava bytecode to WSL converter. v " + getVersion()
+ System.out.println("MicroJava bytecode to WSL converter " + getVersion()
+ ", by Doni Pracner");
}
printHelp();
} else {
int i = 0;
- while (i < args.length && args[i].charAt(0) == '-') {
+ while (i < args.length && args[i].length() > 0 && args[i].charAt(0) == '-') {
if (args[i].compareTo("-h") == 0) {
printHelp();
return;
genLocalVars = true;
} else if (args[i].compareToIgnoreCase("--genGlobalVars") == 0) {
genLocalVars = false;
+ } else {
+ System.err.println("unknown option: "+args[i]);
}
i++;
}
}
Path p = FileSystems.getDefault().getPath(args[i]);
- if (!Files.exists(p)){
+ if (!Files.isRegularFile(p)){
System.err.println("input file does not exist");
System.exit(1);
}