X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=fe9b0bd19e41b4afddaf5d13d8aabb3d8c983bee;hp=129cebf91bf2cf79e947116ec09abeaf44a4e694;hb=5112419f1e9e2ccc279823d658391547db3712a4;hpb=e5a96da12beab4abfd4ad207f88746a3e13c8adb

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 129cebf..fe9b0bd 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -192,6 +192,7 @@ public class mjc2wsl{
 			"C:\" This file automatically converted from microjava bytecode\";\n"
 			+"C:\" with mjc2wsl v "+versionN+"\";\n");
 	
+		ret.append("BEGIN ");
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
 		ret.append("mjvm_locals := ARRAY(1,0), ");
 		ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
@@ -203,7 +204,19 @@ public class mjc2wsl{
 	}
 
 	public String createStandardEnd(){
-		return "SKIP\nENDVAR";
+		StringBuilder ret = new StringBuilder("SKIP\nENDVAR");
+		ret.append("\nWHERE\n");
+		
+		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("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+		
+		ret.append("\nEND\n");
+		
+		return ret.toString();
 	}
 
 	private String createLocal(int i) {
@@ -326,8 +339,7 @@ public class mjc2wsl{
 		int mainAdr = get4();
 		
 		prl(createStandardStart(numberOfWords));
-		prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr)
-				+ " END");
+		prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
 		int op = get();
 		while (op >= 0) {
 			if (originalInComments)
@@ -590,9 +602,7 @@ public class mjc2wsl{
 			case print: {
 				// TODO printing numbers needs different lengths of spacing
 				prl(createTopTwoEStack());
-				pr(createComment("print spacing", C_SPEC));
-				prl("IF tempa>1 THEN FOR i:=2 TO tempa STEP 1 DO PRINFLUSH(\" \") OD FI;");
-				prl("PRINFLUSH(tempb);");
+				prl("Print_MJ(tempb,tempa);");
 				break;
 			}