Copyright years

[mjc2wsl.git] / src / com / quemaster / transformations / mjc2wsl / mjc2wsl.java

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index f5714aa..f1ac5a0 100644 (file)
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -1,6 +1,6 @@
 package com.quemaster.transformations.mjc2wsl;
 /*
-   Copyright (C) 2014  Doni Pracner
+   Copyright (C) 2014,2015, 2016  Doni Pracner
    
     This file is part of mjc2wsl.
 
@@ -40,7 +40,7 @@ import com.quemaster.transformations.TransMessages;
  */
 public class mjc2wsl{
        //default version name, used if the file is not found
-       private static String versionN = "0.1.x";
+       private static String versionN = "v0.2.x";
 
        private String versionFile = "/version.properties";
        
@@ -176,7 +176,7 @@ 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 "+getVersion()+"\";\n");
+                       +"C:\" with mjc2wsl "+getVersion()+"\";\n");
 
                ret.append("\nBEGIN");
                ret.append("\nVAR <\n\t");
@@ -211,17 +211,12 @@ public class mjc2wsl{
 
                if (!genInlinePrint) {
                                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:=1 TO ");
-                               ret.append("MAX(0, format-SLENGTH(@String(val))) STEP 1 DO PRINFLUSH(\" \") OD\n");
-                               ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+                               ret.append("PRINFLUSH(@Format(format, val ))");
+                               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 format>1 THEN\n\t\tFOR i:=2 TO ");
-                               ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
-                               ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
-                               ret.append("END\n");
+                               ret.append("PRINFLUSH(@Format(format, CHR(val)))");
+                               ret.append("\nEND\n");
                }
 
                ret.append("\nEND");
@@ -795,7 +790,7 @@ public class mjc2wsl{
        }
 
        public void printVersion() {
-               System.out.println("MicroJava bytecode to WSL converter. v " + getVersion()
+               System.out.println("MicroJava bytecode to WSL converter " + getVersion()
                                + ", by Doni Pracner");
        }
        
@@ -811,7 +806,7 @@ public class mjc2wsl{
                        printHelp();
                } else {
                        int i = 0;
-                       while (i < args.length && args[i].charAt(0) == '-') {
+                       while (i < args.length && args[i].length() > 0 && args[i].charAt(0) == '-') {
                                if (args[i].compareTo("-h") == 0) {
                                        printHelp();
                                        return;
@@ -875,7 +870,7 @@ public class mjc2wsl{
                        }
 
                        Path p = FileSystems.getDefault().getPath(args[i]);
-                       if (!Files.exists(p)){
+                       if (!Files.isRegularFile(p)){
                                System.err.println("input file does not exist");
                                System.exit(1);
                        }