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=6ff03f47b8e126b722dc2fbd0597033dbf58c2d1;hp=d50c5a4b9827d107d7de29b5608d6aa2d7c9b6fc;hb=fe1bfd73d2ccac1c35625815fe85080ff1a0f50a;hpb=6e7963e611956408e4fb26e69ccababdcfa61845

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index d50c5a4..6ff03f4 100644
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -1,6 +1,6 @@
 package com.quemaster.transformations.mjc2wsl;
 /*
-   Copyright (C) 2014  Doni Pracner
+   Copyright (C) 2014,2015  Doni Pracner
    
     This file is part of mjc2wsl.
 
@@ -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");
@@ -366,7 +361,7 @@ public class mjc2wsl{
 			if (genPrintForEachAddress) {
 				prl("PRINT(\"a" + mjInput.getCounter() + "\");");
 				if (genPauseAfterEachAddress)
-					prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+					prl("@Read_Line_Proc(VAR debug_disposable_string, Standard_Input_Port);");
 			}
 			switch (op) {
 			case load: {
@@ -653,13 +648,18 @@ public class mjc2wsl{
 
 			// read, print
 			case bread: {
-				// TODO make it a char for read
-				messages.message("char is read like a number", TransMessages.M_WAR);
-				prl(createComment("char is read like a number", C_SPEC));
+				// TODO maybe we'll need a bufer for multi chars!
+				prl(createStartVar("tempa"));
+				prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+				prl("tempa := @String_To_List(tempa)[1];");
+				prl(createToEStack("tempa"));
+				prl(createEndVar());
+				break;
 			}
 			case read: {
 				prl(createStartVar("tempa"));
-				prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+				prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+				prl("tempa := @String_To_Num(tempa);");
 				prl(createToEStack("tempa"));
 				prl(createEndVar());
 				break;
@@ -671,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());
@@ -683,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);");
@@ -790,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");
 	}
 	
@@ -806,7 +806,7 @@ public class mjc2wsl{
 			printHelp();
 		} else {
 			int i = 0;
-			while (i < args.length && args[i].charAt(0) == '-') {
+			while (i < args.length && args[i].length() > 0 && args[i].charAt(0) == '-') {
 				if (args[i].compareTo("-h") == 0) {
 					printHelp();
 					return;
@@ -870,7 +870,7 @@ public class mjc2wsl{
 			}
 
 			Path p = FileSystems.getDefault().getPath(args[i]);
-			if (!Files.exists(p)){
+			if (!Files.isRegularFile(p)){
 				System.err.println("input file does not exist");
 				System.exit(1);
 			}