X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=8ee7852c13a9ff67570e5db945b44caeca8fa0b9;hp=bed0f378d498bb9963a4b5b72664ef4d97cd1b97;hb=ec5ee9b63f3f86802c8ca1d5fee0e87ef521de98;hpb=26e7629391c7e34522dff7ebea448781152079c0

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index bed0f37..8ee7852 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -192,20 +192,31 @@ public class mjc2wsl{
 			"C:\" This file automatically converted from microjava bytecode\";\n"
 			+"C:\" with mjc2wsl v "+versionN+"\";\n");
 	
+		ret.append("BEGIN ");
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\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 := < >, "); 
-		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
-		ret.append("\n	t_e_m_p := 0 > :");
+		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < > > : "); 
 	
 		return ret.toString();
 	}
 
 	public String createStandardEnd(){
-		return "SKIP\nENDVAR";
+		StringBuilder ret = new StringBuilder("SKIP\nENDVAR");
+		ret.append("\nWHERE\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");
+		
+		return ret.toString();
 	}
 
 	private String createLocal(int i) {
@@ -501,13 +512,8 @@ public class mjc2wsl{
 			}
 			case arraylength: {
 				prl(createTopEStack());
-				// TODO make an array length function of some sort!
-				prl(createComment(
-						"array length not known - LENGTH not aplicable to arrays",
-						C_ERR));
-				messages.message("array length not known - LENGTH not aplicable to arrays", TransMessages.M_ERR);
-				prl(createComment("put 1 on the stack for consistency", C_SPEC));
-				prl(createToEStack(1));
+				prl("tempb := LENGTH("+ createArray("tempa") + ");");
+				prl(createToEStack("tempb"));
 				break;
 			}
 
@@ -597,9 +603,7 @@ public class mjc2wsl{
 			case print: {
 				// TODO printing numbers needs different lengths of spacing
 				prl(createTopTwoEStack());
-				pr(createComment("print spacing", C_SPEC));
-				prl("IF tempa>1 THEN FOR i:=2 TO tempa STEP 1 DO PRINFLUSH(\" \") OD FI;");
-				prl("PRINFLUSH(tempb);");
+				prl("Print_MJ(tempb,tempa);");
 				break;
 			}
 
@@ -622,7 +626,7 @@ public class mjc2wsl{
 				else
 					prl("CALL a" + counter + " END");
 		}
-		prl("CALL Z;\nSKIP END\nENDACTIONS;\n");
+		prl("\nSKIP END\nENDACTIONS;\n");
 		prl(createStandardEnd());
 	}
 
@@ -636,38 +640,51 @@ public class mjc2wsl{
 	
 	public void printHelp() {
 		printVersion();
-		System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]");
-		System.out.println("basic options:\n\t--screen print output to screen");
-		System.out.println("\t-o --oc[+-] include original code in comments");
-		System.out.println("\t-v verbose, print warning messages");
-		System.out.println("\t-q quiet; don't print even the error messages");
-		System.out.println("\t-d print detailed debug messages");
-		System.out.println("\t-h basic help; this screen");
-		System.out.println("\t--help print more detailed help");
+		printUsage();
+		printHelpOutput();
+		printHelpHelp();
 	}
 	
 	public void printLongHelp() {
 		printVersion();
-		System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]");
+		printUsage();
+		System.out.println();
+		printHelpOutput();
+		System.out.println();
+		printHelpGenerating();
+		System.out.println();
+		printHelpHelp();
+	}
+
+	public void printHelpOutput() {
 		System.out.println("Output options:");
 		System.out.println("  --screen print output to screen");
 		System.out.println("  -o --oc[+-] include original code in comments");
 		System.out.println("  -v verbose, print warning messages");
 		System.out.println("  -q quiet; don't print even the error messages");
 		System.out.println("  -d print detailed debug messages");
+	}
 		
-		System.out.println("\nOptions for generating extra code for tracking code execution");
+	public void printHelpGenerating() {
+		System.out.println("Options for generating extra code for tracking code execution");
 		System.out.println("  --genEStackPrint generate print for all EStack changes");
 		System.out.println("  --genAddrPrint  generate prints after every address of the original code ");
 		System.out.println("  --genAddrPause  generate a pause after every address of the original code ");
 		System.out.println("  --genAddr  short for --genAddrPrint and --genAddrPause");
 		System.out.println("  --genAll   short for applying all code generation");
-		
-		System.out.println("\nHelp options");
+	}
+
+	public void printHelpHelp() {
+		System.out.println("Help and info options");
 		System.out.println("  -h basic help");
-		System.out.println("  --help print more detailed help; this screen");
+		System.out.println("  --help print more detailed help");
+		System.out.println("  --version or -version print version and exit");
 	}
 	
+	public void printUsage(){
+		System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]");
+	}
+
 	public void printVersion() {
 		System.out.println("MicroJava bytecode to WSL converter. v " + versionN
 				+ ", by Doni Pracner");
@@ -692,6 +709,10 @@ public class mjc2wsl{
 				} else if (args[i].compareTo("--help") == 0) {
 					printLongHelp();
 					return;
+				} else if (args[i].compareTo("--version") == 0 
+						|| args[i].compareTo("-version") == 0) {
+					printVersion();
+					return;
 				} else if (args[i].compareTo("-o") == 0
 						|| args[i].startsWith("--oc")) {
 					if (args[i].length() == 2)