X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=87177112908a7923d7a282be0825afdec10b0659;hp=858cae30017462a3e99346d55bb7e958db7230f6;hb=3163f812ec467db6a4af65840c52133c77fd9eb6;hpb=02e2c1fee13ee40f7dc1cb292de6ba53771d526f

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 858cae3..8717711 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -28,7 +28,7 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
-	public static String versionN = "0.1.5";
+	public static String versionN = "0.1.6";
 
 	private TransMessages messages = new TransMessages();
 
@@ -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) + "]";
@@ -257,26 +271,31 @@ public class mjc2wsl{
 	public static String createComment(String str, char type) {
 		return "C:\"" + type + str.replace("\"", "''") + "\";";
 	}
+	
+	// generalised stack operations
+	
+	private String createToStack(String stack, String var){
+			return stack + " := <" + var + " > ++ " + stack +";";
+	}
 
-	//Expression stack
+	private String createFromStack(String stack, String var){
+			return var + ":= HEAD("+stack+"); "+stack+" := TAIL("+stack+");";
+	}
+//Expression stack
 	
 	private String createToEStack(int i) {
-		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
-		if (genPrintEStackOnChange)
-			res += "PRINT(\"eStack\",mjvm_estack);";
-		return res;
+		return createToEStack(i+"");
 	}
 
 	private String createToEStack(String i) {
-		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		String res = createToStack("mjvm_estack", i);
 		if (genPrintEStackOnChange)
 			res += "PRINT(\"eStack\",mjvm_estack);";
 		return res;
 	}
 
 	private String createFromEStack(String st) {
-		String res = st
-				+ " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
+		String res = createFromStack("mjvm_estack",st);
 		if (genPrintEStackOnChange)
 			res += "PRINT(\"eStack\",mjvm_estack);";
 		return res;
@@ -300,15 +319,15 @@ public class mjc2wsl{
 	//Method stack
 
 	private String createToMStack(int i) {
-		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+		return createToMStack(i+"");
 	}
 
 	private String createToMStack(String i) {
-		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+		return createToStack("mjvm_mstack", i);
 	}
 
 	private String createFromMStack(String st) {
-		return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);";
+		return createFromStack("mjvm_mstack", st);
 	}
 
 	private String getRelationFor(int opcode) throws Exception {
@@ -415,41 +434,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 +578,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 +621,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 +637,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;
 			}