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

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 9eff3ad..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());
 	}
 
@@ -671,9 +664,10 @@ public class mjc2wsl{
 	}
 
 	public void printHelpHelp() {
-		System.out.println("Help options");
+		System.out.println("Help and info options");
 		System.out.println("  -h basic help");
 		System.out.println("  --help print more detailed help");
+		System.out.println("  --version or -version print version and exit");
 	}
 	
 	public void printUsage(){
@@ -704,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)