X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=8ee7852c13a9ff67570e5db945b44caeca8fa0b9;hp=a552b08b0a96cbea0dd148be49876ecb1dcf13a0;hb=ec5ee9b63f3f86802c8ca1d5fee0e87ef521de98;hpb=971602ed888ad2769f927a4f1a48b4e03b8c2ec4

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index a552b08..8ee7852 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -192,20 +192,31 @@ 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), ");
 		ret.append("\n\tmjvm_arrays := < >, ");
 		ret.append("\n\tmjvm_objects := < >, ");
-		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < >, "); 
-		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
-		ret.append("\n	t_e_m_p := 0 > :");
+		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < > > : "); 
 	
 		return ret.toString();
 	}
 
 	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) {
@@ -592,9 +603,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;
 			}