mjc2wsl - fixed number print procedure to use the length of the number; removed TODO

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index 26452e802f4b3afb5c92775d9316b322f187af5a..9a61bbf827dba89de8d19a6c2c8766625a39df01 100644 (file)
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -212,8 +212,8 @@ 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:=2 TO ");
-                               ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+                               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("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
@@ -670,7 +670,6 @@ public class mjc2wsl{
                                break;
                        }
                        case print: {
-                               // TODO printing numbers needs different lengths of spacing
                                prl(createStartVar("tempa", "tempb"));
 
                                prl(createTopTwoEStack());