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=9a4493c30c3f7eed26d06c526ad42899173a9bca;hp=f5bb3ea96b6e8aecd5f8cbb132f0876a193cdc8b;hb=e4a1d3722827c39ca4c3d92680abad1728000554;hpb=cb772f818f110f996bdd38b5da4a1c035838e7e5

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index f5bb3ea..9a4493c 100644
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -213,7 +213,7 @@ public class mjc2wsl{
 				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("MAX(0, format-SLENGTH(@String(val))) STEP 1 DO PRINFLUSH(\" \") OD\n");
 				ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
 
 				ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
@@ -366,7 +366,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 +653,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;
@@ -858,6 +863,8 @@ public class mjc2wsl{
 					genLocalVars = true;
 				} else if (args[i].compareToIgnoreCase("--genGlobalVars") == 0) {
 					genLocalVars = false;
+				} else {
+					System.err.println("unknown option: "+args[i]);
 				}
 				i++;
 			}