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
//default version name, used if the file is not found
private static String versionN = "0.1.x";
- private String versionFile = "version.properties";
+ private String versionFile = "/version.properties";
private TransMessages messages = new TransMessages();
private boolean genPopPush=false;
- private boolean genInlinePrint=false;
+ private boolean genInlinePrint = false;
+
+ private boolean genLocalVars = true;
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
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:=2 TO ");
- ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+ 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("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
}
private String createStartVar(String... vars){
- StringBuilder ret = new StringBuilder("VAR < ");
- ret.append(vars[0] + " := 0");
- for (int i=1; i<vars.length; i++)
- ret.append(", "+ vars[i] +" := 0");
- ret.append(" > : ");
-
- return ret.toString();
+ if (genLocalVars) {
+ StringBuilder ret = new StringBuilder("VAR < ");
+ ret.append(vars[0] + " := 0");
+ for (int i = 1; i < vars.length; i++)
+ ret.append(", " + vars[i] + " := 0");
+ ret.append(" > : ");
+
+ return ret.toString();
+ }
+ return "";
}
private String createEndVar(){
- return "ENDVAR;";
+ if (genLocalVars)
+ return "ENDVAR;";
+ else
+ return "";
}
private String createLocal(int i) {
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;
}
}
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;
break;
}
case print: {
- // TODO printing numbers needs different lengths of spacing
prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
}
public void printHelpDirectives(){
- System.out.println("Alternatives for code generation:");
- System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD");
- System.out.println(" --genHeadTail generate TAIL/HEAD instead of POP/PUSH ");
+ System.out.println("Alternatives for code generation (* are the defaults):");
+ System.out.print(genPopPush?'*':' ');
+ System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD");
+ System.out.print(!genPopPush?'*':' ');
+ System.out.println(" --genHeadTail generate TAIL/HEAD instead of POP/PUSH ");
+ System.out.println();
+ System.out.print(genInlinePrint?'*':' ');
+ System.out.println(" --genInlinePrint generate prints directly instead of procedure calls");
+ System.out.print(!genInlinePrint?'*':' ');
+ System.out.println(" --genProcedurePrint generate prints as custom procedure calls");
System.out.println();
- System.out.println(" --genInlinePrint generate prints directly instead of procedure calls");
- System.out.println(" --genProcedurePrint generate prints as custom procedure calls");
+ System.out.print(genLocalVars?'*':' ');
+ System.out.println(" --genLocalVars generate local VAR block for temp variables");
+ System.out.print(!genLocalVars?'*':' ');
+ System.out.println(" --genGlobalVars do NOT generate local VAR block for temp variables");
}
public void printHelpHelp() {
genPopPush = false;
} else if (args[i].compareToIgnoreCase("--genProcedurePrint") == 0) {
genInlinePrint = false;
+ } else if (args[i].compareToIgnoreCase("--genLocalVars") == 0) {
+ genLocalVars = true;
+ } else if (args[i].compareToIgnoreCase("--genGlobalVars") == 0) {
+ genLocalVars = false;
+ } else {
+ System.err.println("unknown option: "+args[i]);
}
i++;
}