mjc2wsl -adding more VARS to the actions

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 858cae3..52fc10a 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -193,7 +193,7 @@ public class mjc2wsl{
                        +"C:\" with mjc2wsl v "+versionN+"\";\n");
        
                ret.append("BEGIN ");
-               ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
+               ret.append("VAR < \n\t");
                ret.append("mjvm_locals := ARRAY(1,0), ");
                ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
                ret.append("\n\tmjvm_arrays := < >, ");
@@ -219,6 +219,20 @@ public class mjc2wsl{
                return ret.toString();
        }
 
+       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();
+       }
+       
+       private String createEndVar(){
+               return "ENDVAR;";
+       }
+       
        private String createLocal(int i) {
                // arrays start at 1 in WSL, so we need an offset
                return "mjvm_locals[" + (i + 1) + "]";
@@ -415,41 +429,53 @@ public class mjc2wsl{
                        }
 
                        case add: {
+                               prl(createStartVar("tempa", "tempb", "tempres"));
                                prl(createTopTwoEStack());
                                prl("tempres := tempb + tempa;");
                                prl(createToEStack("tempres"));
+                               prl(createEndVar());
                                break;
                        }
                        case sub: {
+                               prl(createStartVar("tempa", "tempb", "tempres"));
                                prl(createTopTwoEStack());
                                prl("tempres := tempb - tempa;");
                                prl(createToEStack("tempres"));
+                               prl(createEndVar());
                                break;
                        }
                        case mul: {
+                               prl(createStartVar("tempa", "tempb", "tempres"));
                                prl(createTopTwoEStack());
                                prl("tempres := tempb * tempa;");
                                prl(createToEStack("tempres"));
+                               prl(createEndVar());
                                break;
                        }
                        case div: {
+                               prl(createStartVar("tempa", "tempb", "tempres"));
                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb DIV tempa;");
                                prl(createToEStack("tempres"));
+                               prl(createEndVar());
                                break;
                        }
                        case rem: {
+                               prl(createStartVar("tempa", "tempb", "tempres"));
                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb MOD tempa;");
                                prl(createToEStack("tempres"));
+                               prl(createEndVar());
                                break;
                        }
 
                        case neg: {
+                               prl(createStartVar("tempa"));
                                prl(createTopEStack());
                                prl(createToEStack("-tempa"));
+                               prl(createEndVar());                            
                                break;
                        }
 
@@ -547,10 +573,13 @@ public class mjc2wsl{
                        case jle:
                        case jgt:
                        case jge: {
+                               prl(createStartVar("tempa", "tempb"));
                                prl(createTopTwoEStack());
                                prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
                                                + (counter + get2()) + " ELSE CALL a" + (counter + 1)
                                                + " FI;");
+                               prl(createEndVar());
+                               
                                break;
                        }
 
@@ -587,8 +616,10 @@ public class mjc2wsl{
                                prl(createComment("char is read like a number", C_SPEC));
                        }
                        case read: {
+                               prl(createStartVar("tempa"));
                                prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
                                prl(createToEStack("tempa"));
+                               prl(createEndVar());
                                break;
                        }
 
@@ -601,8 +632,11 @@ public class mjc2wsl{
                        }
                        case print: {
                                // TODO printing numbers needs different lengths of spacing
+                               prl(createStartVar("tempa", "tempb"));
+
                                prl(createTopTwoEStack());
                                prl("Print_MJ(tempb,tempa);");
+                               prl(createEndVar());
                                break;
                        }