mjc2wsl - removed a final CALL Z that was not needed anyway

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index bed0f37..a552b08 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -501,13 +501,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 +617,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 +631,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 +700,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)