X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=129cebf91bf2cf79e947116ec09abeaf44a4e694;hp=133ca3da99eecb12fa8d2f8aa1a8e2c6f716ef5c;hb=e5a96da12beab4abfd4ad207f88746a3e13c8adb;hpb=425b6415e631fbac06bf831daaee351fa523d01f

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 133ca3d..129cebf 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -197,9 +197,7 @@ public class mjc2wsl{
 		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();
 	}
@@ -501,13 +499,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;
 			}
 
@@ -622,7 +615,7 @@ public class mjc2wsl{
 				else
 					prl("CALL a" + counter + " END");
 		}
-		prl("CALL Z;\nSKIP END\nENDACTIONS;\n");
+		prl("\nSKIP END\nENDACTIONS;\n");
 		prl(createStandardEnd());
 	}
 
@@ -635,39 +628,55 @@ public class mjc2wsl{
 	}
 	
 	public void printHelp() {
-		System.out.println("MicroJava bytecode to WSL converter. v " + versionN
-				+ ", by Doni Pracner");
-		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");
+		printVersion();
+		printUsage();
+		printHelpOutput();
+		printHelpHelp();
 	}
 	
 	public void printLongHelp() {
-		System.out.println("MicroJava bytecode to WSL converter. v " + versionN
-				+ ", by Doni Pracner");
-		System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]");
+		printVersion();
+		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");
 	}
 	
 	public String makeDefaultOutName(String inname){
@@ -689,6 +698,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)