simplified ascii codes to chars in printing based on a new FermaT feature

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 18551d1..6cd59e0 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -192,9 +192,7 @@ public class mjc2wsl{
        public String createStandardStart(int numWords){
                StringBuilder ret = new StringBuilder(
                        "C:\" This file automatically converted from microjava bytecode\";\n"
        public String createStandardStart(int numWords){
                StringBuilder ret = new StringBuilder(
                        "C:\" This file automatically converted from microjava bytecode\";\n"

-                       +"C:\" with mjc2wsl v "+versionN+"\";\n\n");
-
-               ret.append(createAsciiString());
+                       +"C:\" with mjc2wsl v "+versionN+"\";\n");

 
                ret.append("\nBEGIN");
                ret.append("\nVAR <\n\t");
 
                ret.append("\nBEGIN");
                ret.append("\nVAR <\n\t");


@@ -221,7 +219,7 @@ public class mjc2wsl{
                ret.append("\nWHERE\n");
                
                ret.append("\nFUNCT CHR(num) ==:\n");
                ret.append("\nWHERE\n");
                
                ret.append("\nFUNCT CHR(num) ==:\n");

-               ret.append("\tSUBSTR(ascii,num,1)\n");
+               ret.append("\t@List_To_String(< num >)\n");

                ret.append("END\n");
 
                ret.append("\nPROC Print_MJ(val, format VAR)==\n");
                ret.append("END\n");
 
                ret.append("\nPROC Print_MJ(val, format VAR)==\n");


@@ -232,13 +230,9 @@ public class mjc2wsl{
 
                ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
                ret.append(createComment("print spacing", C_SPEC));
 
                ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
                ret.append(createComment("print spacing", C_SPEC));

-               ret.append("\n\tIF val=10 OR val=13 THEN\n");
-               ret.append("\t\tPRINT(\"\");\n");
-               ret.append("\tELSE\n");
-               ret.append("\t\tIF format>1 THEN\n\t\t\tFOR i:=2 TO ");
+               ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");

                ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
                ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");

-               ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
-               ret.append("\tFI\n");
+               ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");

                ret.append("END\n");
 
                ret.append("\nEND");
                ret.append("END\n");
 
                ret.append("\nEND");


@@ -523,19 +517,23 @@ public class mjc2wsl{
                        }
 
                        case shl: {
                        }
 
                        case shl: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopTwoEStack());
                                prl("VAR <tempres :=tempb, i:=1 >:");
                                prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
                                prl(createToEStack("tempres"));
                                prl("ENDVAR;");
                                prl(createTopTwoEStack());
                                prl("VAR <tempres :=tempb, i:=1 >:");
                                prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
                                prl(createToEStack("tempres"));
                                prl("ENDVAR;");

+                               prl(createEndVar());

                                break;
                        }
                        case shr: {
                                break;
                        }
                        case shr: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopTwoEStack());
                                prl("VAR <tempres :=tempb, i:=1 >:");
                                prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
                                prl(createToEStack("tempres"));
                                prl("ENDVAR;");
                                prl(createTopTwoEStack());
                                prl("VAR <tempres :=tempb, i:=1 >:");
                                prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
                                prl(createToEStack("tempres"));
                                prl("ENDVAR;");

+                               prl(createEndVar());

                                break;
                        }
 
                                break;
                        }
 


@@ -556,16 +554,20 @@ public class mjc2wsl{
                        case newarray: {
                                get();// 0 - bytes, 1 - words; ignore for now
                                // TODO take into consideration 0/1
                        case newarray: {
                                get();// 0 - bytes, 1 - words; ignore for now
                                // TODO take into consideration 0/1

+                               prl(createStartVar("tempa"));

                                prl(createTopEStack());
                                prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
                                prl(createToEStack("LENGTH(mjvm_arrays)"));
                                prl(createTopEStack());
                                prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
                                prl(createToEStack("LENGTH(mjvm_arrays)"));

+                               prl(createEndVar());

                                break;
                        }
 
                        case aload:
                        case baload: {
                                break;
                        }
 
                        case aload:
                        case baload: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopTwoEStack());
                                prl(createToEStack(createArray("tempb") + "[tempa+1]"));
                                prl(createTopTwoEStack());
                                prl(createToEStack(createArray("tempb") + "[tempa+1]"));

+                               prl(createEndVar());

                                break;
                        }
                        case astore:
                                break;
                        }
                        case astore:


@@ -578,24 +580,30 @@ public class mjc2wsl{
                                break;
                        }
                        case arraylength: {
                                break;
                        }
                        case arraylength: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopEStack());
                                prl("tempb := LENGTH("+ createArray("tempa") + ");");
                                prl(createToEStack("tempb"));
                                prl(createTopEStack());
                                prl("tempb := LENGTH("+ createArray("tempa") + ");");
                                prl(createToEStack("tempb"));

+                               prl(createEndVar());

                                break;
                        }
 
                        case dup: {
                                break;
                        }
 
                        case dup: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopEStack());
                                prl(createToEStack("tempa"));
                                prl(createToEStack("tempa"));
                                prl(createTopEStack());
                                prl(createToEStack("tempa"));
                                prl(createToEStack("tempa"));

+                               prl(createEndVar());

                                break;
                        }
                        case dup2: {
                                break;
                        }
                        case dup2: {

+                               prl(createStartVar("tempa", "tempb"));

                                prl(createTopTwoEStack());
                                prl(createToEStack("tempb"));
                                prl(createToEStack("tempa"));
                                prl(createToEStack("tempb"));
                                prl(createToEStack("tempa"));
                                prl(createTopTwoEStack());
                                prl(createToEStack("tempb"));
                                prl(createToEStack("tempa"));
                                prl(createToEStack("tempb"));
                                prl(createToEStack("tempa"));

+                               prl(createEndVar());

                                break;
                        }
 
                                break;
                        }