X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fcom%2Fquemaster%2Ftransformations%2Fmjc2wsl%2Fmjc2wsl.java;h=0620e377387d7a5f334881ec5faaf547e7ca8a8c;hp=78f30eb36c060084259e14f7a54df26b1879bcac;hb=1d3d87aee2f3b75cf213754b58aabf8364ccd3f1;hpb=9e84964fb3bb33b019cac3063c7944d89a0460c8

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index 78f30eb..0620e37 100644
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -40,7 +40,7 @@ import com.quemaster.transformations.TransMessages;
  */
 public class mjc2wsl{
 	//default version name, used if the file is not found
-	private static String versionN = "0.1.x";
+	private static String versionN = "v0.2.x";
 
 	private String versionFile = "/version.properties";
 	
@@ -176,7 +176,7 @@ public class mjc2wsl{
 	public String createStandardStart(int numWords){
 		StringBuilder ret = new StringBuilder(
 			"C:\" This file automatically converted from microjava bytecode\";\n"
-			+"C:\" with mjc2wsl v "+getVersion()+"\";\n");
+			+"C:\" with mjc2wsl "+getVersion()+"\";\n");
 
 		ret.append("\nBEGIN");
 		ret.append("\nVAR <\n\t");
@@ -211,17 +211,12 @@ public class mjc2wsl{
 
 		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:=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("PRINFLUSH(@Format(format, val ))");
+				ret.append("\nEND\n");
 
 				ret.append("\nPROC Print_MJ_CHAR(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(CHR(val))\n");
-				ret.append("END\n");
+				ret.append("PRINFLUSH(@Format(format, CHR(val)))");
+				ret.append("\nEND\n");
 		}
 
 		ret.append("\nEND");
@@ -676,7 +671,7 @@ public class mjc2wsl{
 				prl(createTopTwoEStack());
 				if (genInlinePrint){
 					prl(createComment("print spacing and transformation",C_SPEC));
-					prl("PRINFLUSH(SUBSTR(\"          \", 0, MIN(10, MAX(0,tempa-1))), @List_To_String(< tempb >));");
+					prl("PRINFLUSH(@Format(tempa, @List_To_String(< tempb >)));");
 				} else
 					prl("Print_MJ_CHAR(tempb,tempa);");
 				prl(createEndVar());
@@ -688,7 +683,7 @@ public class mjc2wsl{
 				prl(createTopTwoEStack());
 				if (genInlinePrint){
 					prl(createComment("print spacing",C_SPEC));
-					prl("PRINFLUSH(SUBSTR(\"          \", 0, MIN(10, MAX(0, tempa-SLENGTH(@String(tempb))))), tempb);");
+					prl("PRINFLUSH(@Format(tempa,tempb));");
 				}
 				else
 					prl("Print_MJ(tempb,tempa);");
@@ -795,7 +790,7 @@ public class mjc2wsl{
 	}
 
 	public void printVersion() {
-		System.out.println("MicroJava bytecode to WSL converter. v " + getVersion()
+		System.out.println("MicroJava bytecode to WSL converter " + getVersion()
 				+ ", by Doni Pracner");
 	}