X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=18551d13e89223770ff6ec177ef117d30645b74f;hp=52c75422b7b7a6bd6ecc6a044830c69da686dbce;hb=9ad77207956d30c4ad2e3020d389989777e5b7b4;hpb=632c14358ddeee497f769cf98f31345f19fad03d

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 52c7542..18551d1 100644
--- 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{
-	public static String versionN = "0.1.6";
+	public static String versionN = "0.1.7";
 
 	private TransMessages messages = new TransMessages();
 
@@ -192,32 +192,56 @@ 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 "+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_flag_jump := 0,");
+		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(){
-		StringBuilder ret = new StringBuilder("SKIP\nENDVAR");
+		StringBuilder ret = new StringBuilder("SKIP\nENDVAR\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("\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();
 	}
 
@@ -369,9 +393,9 @@ public class mjc2wsl{
 		prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
 		int op = get();
 		while (op >= 0) {
+			prl(" a" + counter + " ==");
 			if (originalInComments)
 				prl(createComment(describeOpCode(op), C_OC));
-			prl(" a" + counter + " == ");
 			if (genPrintForEachAddress) {
 				prl("PRINT(\"a" + counter + "\");");
 				if (genPauseAfterEachAddress)
@@ -546,12 +570,11 @@ public class mjc2wsl{
 			}
 			case astore:
 			case bastore: {
+				prl(createStartVar("tempa", "tempb", "tempres"));
 				prl(createFromEStack("tempres"));
 				prl(createTopTwoEStack());
-				// we need to use a temparray as a pointer, WSL
-				// otherwise tries to access it as a list of lists and fails
-				prl("VAR < tempArray := " + createArray("tempb") + " > :");
-				prl("tempArray[tempa+1]:=tempres ENDVAR;");
+				prl("mjvm_arrays[tempb][tempa+1]:=tempres;");
+				prl(createEndVar());
 				break;
 			}
 			case arraylength: {
@@ -594,10 +617,15 @@ public class mjc2wsl{
 			case jge: {
 				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
-				prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
-						+ (counter + get2()) + " ELSE CALL a" + (counter + 1)
+				prl("IF tempb " + getRelationFor(op) 
+						+ " tempa THEN mjvm_flag_jump := 1"
+						+ " ELSE mjvm_flag_jump := 0" 
 						+ " FI;");
 				prl(createEndVar());
+				prl("IF mjvm_flag_jump = 1 THEN CALL a"
+						+ (counter + get2()) 
+						+ " ELSE CALL a" + (counter + 1)
+						+ " FI;");
 				
 				break;
 			}
@@ -644,10 +672,11 @@ public class mjc2wsl{
 
 			// 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
@@ -679,7 +708,7 @@ public class mjc2wsl{
 					prl("CALL a" + counter + "\n END");
 		}
 		prl("SKIP\n END\nENDACTIONS;\n");
-		prl(createStandardEnd());
+		pr(createStandardEnd());
 	}
 
 	public void convertFile(File f) {