start of 0.1.7

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 52c7542..dde880e 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -28,7 +28,7 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{

-       public static String versionN = "0.1.6";
+       public static String versionN = "0.1.7";

 
        private TransMessages messages = new TransMessages();
 
 
        private TransMessages messages = new TransMessages();
 


@@ -192,32 +192,55 @@ 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");
-       
-               ret.append("BEGIN ");
-               ret.append("VAR < \n\t");
-               ret.append("mjvm_locals := ARRAY(1,0), ");
-               ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
-               ret.append("\n\tmjvm_arrays := < >, ");
-               ret.append("\n\tmjvm_objects := < >, ");
-               ret.append("\n  mjvm_estack := < >, mjvm_mstack := < > > : "); 
-       
+                       +"C:\" with mjc2wsl v "+versionN+"\";\n\n");
+
+               ret.append(createAsciiString());
+
+               ret.append("\nBEGIN");
+               ret.append("\nVAR <\n\t");
+               ret.append("mjvm_locals := ARRAY(1,0),");
+               ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0),");
+               ret.append("\n\tmjvm_arrays := < >,");
+               ret.append("\n\tmjvm_objects := < >,");
+               ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
+
+               return ret.toString();
+       }
+
+       public String createAsciiString(){
+               StringBuilder ret = new StringBuilder("C:\"char array for ascii code conversions\";");
+               ret.append("\nascii := \"????????????????????????????????\"++\n");
+               ret.append("\" !\"++Quote++\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\";\n");
+

                return ret.toString();
        }
 
        public String createStandardEnd(){
                return ret.toString();
        }
 
        public String createStandardEnd(){

-               StringBuilder ret = new StringBuilder("SKIP\nENDVAR");
+               StringBuilder ret = new StringBuilder("SKIP\nENDVAR\n");

                ret.append("\nWHERE\n");
                
                ret.append("\nWHERE\n");
                

+               ret.append("\nFUNCT CHR(num) ==:\n");
+               ret.append("\tSUBSTR(ascii,num,1)\n");
+               ret.append("END\n");
+

                ret.append("\nPROC Print_MJ(val, format VAR)==\n");
                ret.append(createComment("print spacing", C_SPEC));
                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("\tFI;\n\tPRINFLUSH(val)\nEND\n");
                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(val)\nEND\n");

-               
-               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 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("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+               ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
+               ret.append("\tFI\n");
+               ret.append("END\n");
+
+               ret.append("\nEND");

                return ret.toString();
        }
 
                return ret.toString();
        }
 


@@ -369,9 +392,9 @@ public class mjc2wsl{
                prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
                int op = get();
                while (op >= 0) {
                prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
                int op = get();
                while (op >= 0) {

+                       prl(" a" + counter + " ==");

                        if (originalInComments)
                                prl(createComment(describeOpCode(op), C_OC));
                        if (originalInComments)
                                prl(createComment(describeOpCode(op), C_OC));

-                       prl(" a" + counter + " == ");

                        if (genPrintForEachAddress) {
                                prl("PRINT(\"a" + counter + "\");");
                                if (genPauseAfterEachAddress)
                        if (genPrintForEachAddress) {
                                prl("PRINT(\"a" + counter + "\");");
                                if (genPauseAfterEachAddress)


@@ -644,10 +667,11 @@ public class mjc2wsl{
 
                        // the prints
                        case bprint: {
 
                        // the prints
                        case bprint: {

-                               // TODO need to make it a char on print
-                               messages.message("chars will be printed as number codes", TransMessages.M_WAR);
-                               prl(createComment("char will be printed as a number code",
-                                               C_SPEC));
+                               prl(createStartVar("tempa", "tempb"));
+                               prl(createTopTwoEStack());
+                               prl("Print_MJ_CHAR(tempb,tempa);");
+                               prl(createEndVar());
+                               break;

                        }
                        case print: {
                                // TODO printing numbers needs different lengths of spacing
                        }
                        case print: {
                                // TODO printing numbers needs different lengths of spacing


@@ -679,7 +703,7 @@ public class mjc2wsl{
                                        prl("CALL a" + counter + "\n END");
                }
                prl("SKIP\n END\nENDACTIONS;\n");
                                        prl("CALL a" + counter + "\n END");
                }
                prl("SKIP\n END\nENDACTIONS;\n");

-               prl(createStandardEnd());
+               pr(createStandardEnd());

        }
 
        public void convertFile(File f) {
        }
 
        public void convertFile(File f) {