X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=dde880ee299a30f46f72d80ff559af68b94629c0;hp=003081897da1d559f6220449cdd7bd6517f1d2c2;hb=102044c2e6ad75c7ccd28cc9a11082b819534a7a;hpb=2f7415a1b72f06124c38c71019b8117a7cbada10;ds=inline diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 0030818..dde880e 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -1,3 +1,21 @@ +/* + Copyright (C) 2014 Doni Pracner + + This file is part of mjc2wsl. + + mjc2wsl is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mjc2wsl is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mjc2wsl. If not, see . +*/ import java.io.*; import java.util.*; @@ -10,31 +28,15 @@ import java.util.*; * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com */ public class mjc2wsl{ - public static String versionN = "0.1.4"; + public static String versionN = "0.1.7"; + + private TransMessages messages = new TransMessages(); - public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0; - - private int printLevel = M_ERR; - - private int[] messageCounters = new int[M_ERR+1]; - - private void message(String mes, int level){ - if (level>=printLevel) - System.out.println(mes); - messageCounters[level]++; - } - - private void printMessageCounters(){ - printMessageCounters(System.out); - } - - private void printMessageCounters(PrintStream out){ - out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]); - } - private boolean genPauseAfterEachAddress=false, genPrintForEachAddress = false, genPrintEStackOnChange = false; + + private boolean genPopPush=false; /** Constant used for marking a regular comment from the original file */ public static final char C_REG = ' '; @@ -108,31 +110,6 @@ public class mjc2wsl{ bprint = 56, trap = 57; - public String getStandardStart(){ - return getStandardStart(10); - } - - public String getStandardStart(int numWords){ - StringBuilder ret = new StringBuilder( - "C:\" This file automatically converted from microjava bytecode\";\n" - +"C:\" with mjc2wsl v "+versionN+"\";\n"); - - 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 > :"); - - return ret.toString(); - } - - public String getStandardEnd(){ - return "SKIP\nENDVAR"; - } - private boolean originalInComments = false; private HashMap opMap = null; @@ -208,24 +185,97 @@ public class mjc2wsl{ return (get2() << 16) + (get2() << 16 >>> 16); } - private String loc(int i) { + public String createStandardStart(){ + return createStandardStart(10); + } + + public String createStandardStart(int numWords){ + StringBuilder ret = new StringBuilder( + "C:\" This file automatically converted from microjava bytecode\";\n" + +"C:\" with mjc2wsl v "+versionN+"\";\n\n"); + + ret.append(createAsciiString()); + + ret.append("\nBEGIN"); + ret.append("\nVAR <\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\tmjvm_estack := < >, mjvm_mstack := < > > :"); + + return ret.toString(); + } + + public String createAsciiString(){ + StringBuilder ret = new StringBuilder("C:\"char array for ascii code conversions\";"); + ret.append("\nascii := \"????????????????????????????????\"++\n"); + ret.append("\" !\"++Quote++\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\";\n"); + + return ret.toString(); + } + + public String createStandardEnd(){ + StringBuilder ret = new StringBuilder("SKIP\nENDVAR\n"); + ret.append("\nWHERE\n"); + + ret.append("\nFUNCT CHR(num) ==:\n"); + ret.append("\tSUBSTR(ascii,num,1)\n"); + ret.append("END\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("\nPROC Print_MJ_CHAR(val, format VAR)==\n"); + ret.append(createComment("print spacing", C_SPEC)); + ret.append("\n\tIF val=10 OR val=13 THEN\n"); + ret.append("\t\tPRINT(\"\");\n"); + ret.append("\tELSE\n"); + ret.append("\t\tIF format>1 THEN\n\t\t\tFOR i:=2 TO "); + ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n"); + ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n"); + ret.append("\tFI\n"); + ret.append("END\n"); + + ret.append("\nEND"); + return ret.toString(); + } + + private String createStartVar(String... vars){ + StringBuilder ret = new StringBuilder("VAR < "); + ret.append(vars[0] + " := 0"); + for (int i=1; i : "); + + return ret.toString(); + } + + private String createEndVar(){ + return "ENDVAR;"; + } + + private String createLocal(int i) { // arrays start at 1 in WSL, so we need an offset return "mjvm_locals[" + (i + 1) + "]"; } - private String genStatic(int i) { + private String createStatic(int i) { return "mjvm_statics[" + (i + 1) + "]"; } - private String genArray(int i) { + private String createArray(int i) { return "mjvm_arrays[" + i + "]"; } - private String genArray(String i) { + private String createArray(String i) { return "mjvm_arrays[" + i + "]"; } - private String genObject(String i) { + private String createObject(String i) { return "mjvm_objects[" + i + "]"; } @@ -246,58 +296,69 @@ public class mjc2wsl{ public static String createComment(String str, char type) { return "C:\"" + type + str.replace("\"", "''") + "\";"; } + + // generalised stack operations + + private String createToStack(String stack, String var){ + if (genPopPush) + return "PUSH("+stack+"," + var + ");"; + else + return stack + " := <" + var + " > ++ " + stack +";"; + } - //Expression stack + private String createFromStack(String stack, String var){ + if (genPopPush) + return "POP("+ var + ", "+stack+");"; + else + return var + ":= HEAD("+stack+"); "+stack+" := TAIL("+stack+");"; + } +//Expression stack - private String cmdToEStack(int i) { - String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; - if (genPrintEStackOnChange) - res += "PRINT(\"eStack\",mjvm_estack);"; - return res; + private String createToEStack(int i) { + return createToEStack(i+""); } - private String cmdToEStack(String i) { - String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; + private String createToEStack(String i) { + String res = createToStack("mjvm_estack", i); if (genPrintEStackOnChange) res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - private String cmdFromEStack(String st) { - String res = st - + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; + private String createFromEStack(String st) { + String res = createFromStack("mjvm_estack",st); if (genPrintEStackOnChange) res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - private String cmdPopEStack() { + private String createPopEStack() { String res = "mjvm_estack := TAIL(mjvm_estack);"; if (genPrintEStackOnChange) res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - private String getTopTwo() { - return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb"); + private String createTopTwoEStack() { + return createFromEStack("tempa") + "\n" + createFromEStack("tempb"); } - private String getTop() { - return cmdFromEStack("tempa"); + private String createTopEStack() { + return createFromEStack("tempa"); } //Method stack - private String cmdToMStack(int i) { - return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; + private String createToMStack(int i) { + return createToMStack(i+""); } - private String cmdToMStack(String i) { - return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; + private String createToMStack(String i) { + return createToStack("mjvm_mstack", i); } - private String cmdFromMStack(String st) { - return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);"; + private String createFromMStack(String st) { + return createFromStack("mjvm_mstack", st); } private String getRelationFor(int opcode) throws Exception { @@ -327,14 +388,13 @@ public class mjc2wsl{ int numberOfWords = get4(); int mainAdr = get4(); - prl(getStandardStart(numberOfWords)); - prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr) - + " END"); + prl(createStandardStart(numberOfWords)); + prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :"); int op = get(); while (op >= 0) { + prl(" a" + counter + " =="); if (originalInComments) prl(createComment(describeOpCode(op), C_OC)); - prl("a" + counter + " == "); if (genPrintForEachAddress) { prl("PRINT(\"a" + counter + "\");"); if (genPauseAfterEachAddress) @@ -342,55 +402,61 @@ public class mjc2wsl{ } switch (op) { case load: { - prl(cmdToEStack(loc(get()))); + prl(createToEStack(createLocal(get()))); break; } case load_0: case load_1: case load_2: case load_3: { - prl(cmdToEStack(loc(op - load_0))); + prl(createStartVar("tempa")); + prl("tempa :="+createLocal(op - load_0)+";"); + prl(createToEStack("tempa")); + prl(createEndVar()); break; } case store: { - prl(cmdFromEStack(loc(get()))); + prl(createFromEStack(createLocal(get()))); break; } case store_0: case store_1: case store_2: case store_3: { - prl(cmdFromEStack(loc(op - store_0))); + prl(createStartVar("tempa")); + prl(createFromEStack("tempa")); + prl(createLocal(op - store_0)+" := tempa;"); + prl(createEndVar()); break; } case getstatic: { - prl(cmdToEStack(genStatic(get2()))); + prl(createToEStack(createStatic(get2()))); break; } case putstatic: { - prl(cmdFromEStack(genStatic(get2()))); + prl(createFromEStack(createStatic(get2()))); break; } case getfield: { int f = get2(); - prl(getTop()); - prl(cmdToEStack(genObject("tempa") + "[" + (f + 1) + "]")); + prl(createTopEStack()); + prl(createToEStack(createObject("tempa") + "[" + (f + 1) + "]")); break; } case putfield: { int f = get2(); // we need to use a temparray as a pointer, WSL // otherwise tries to access it as a list of lists and fails - prl(getTopTwo()); - prl("VAR < tempArray := " + genObject("tempb") + " > :"); + prl(createTopTwoEStack()); + prl("VAR < tempArray := " + createObject("tempb") + " > :"); prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;"); break; } case const_: { - prl(cmdToEStack(get4())); + prl(createToEStack(get4())); break; } @@ -400,69 +466,81 @@ public class mjc2wsl{ case const_3: case const_4: case const_5: { - prl(cmdToEStack(op - const_0)); + prl(createToEStack(op - const_0)); break; } case add: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb", "tempres")); + prl(createTopTwoEStack()); prl("tempres := tempb + tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); + prl(createEndVar()); break; } case sub: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb", "tempres")); + prl(createTopTwoEStack()); prl("tempres := tempb - tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); + prl(createEndVar()); break; } case mul: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb", "tempres")); + prl(createTopTwoEStack()); prl("tempres := tempb * tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); + prl(createEndVar()); break; } case div: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb", "tempres")); + prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb DIV tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); + prl(createEndVar()); break; } case rem: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb", "tempres")); + prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb MOD tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); + prl(createEndVar()); break; } case neg: { - prl(getTop()); - prl(cmdToEStack("-tempa")); + prl(createStartVar("tempa")); + prl(createTopEStack()); + prl(createToEStack("-tempa")); + prl(createEndVar()); break; } case shl: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); prl("ENDVAR;"); break; } case shr: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); prl("ENDVAR;"); break; } case inc: { int b1 = get(), b2 = get(); - prl(loc(b1) + " := " + loc(b1) + " + " + b2 + ";"); + prl(createLocal(b1) + " := " + createLocal(b1) + " + " + b2 + ";"); break; } @@ -471,64 +549,58 @@ public class mjc2wsl{ // TODO maybe objects and arrays should be in the same list? prl("mjvm_objects := mjvm_objects ++ < ARRAY(" + size + ",0) >;"); - prl(cmdToEStack("LENGTH(mjvm_objects)")); + prl(createToEStack("LENGTH(mjvm_objects)")); break; } case newarray: { get();// 0 - bytes, 1 - words; ignore for now // TODO take into consideration 0/1 - prl(getTop()); + prl(createTopEStack()); prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;"); - prl(cmdToEStack("LENGTH(mjvm_arrays)")); + prl(createToEStack("LENGTH(mjvm_arrays)")); break; } case aload: case baload: { - prl(getTopTwo()); - prl(cmdToEStack(genArray("tempb") + "[tempa+1]")); + prl(createTopTwoEStack()); + prl(createToEStack(createArray("tempb") + "[tempa+1]")); break; } case astore: case bastore: { - prl(cmdFromEStack("tempres")); - prl(getTopTwo()); + prl(createFromEStack("tempres")); + prl(createTopTwoEStack()); // we need to use a temparray as a pointer, WSL // otherwise tries to access it as a list of lists and fails - prl("VAR < tempArray := " + genArray("tempb") + " > :"); + prl("VAR < tempArray := " + createArray("tempb") + " > :"); prl("tempArray[tempa+1]:=tempres ENDVAR;"); break; } case arraylength: { - prl(getTop()); - // TODO make an array length function of some sort! - prl(createComment( - "array length not known - LENGTH not aplicable to arrays", - C_ERR)); - message("array length not known - LENGTH not aplicable to arrays", - M_ERR); - prl(createComment("put 1 on the stack for consistency", C_SPEC)); - prl(cmdToEStack(1)); + prl(createTopEStack()); + prl("tempb := LENGTH("+ createArray("tempa") + ");"); + prl(createToEStack("tempb")); break; } case dup: { - prl(getTop()); - prl(cmdToEStack("tempa")); - prl(cmdToEStack("tempa")); + prl(createTopEStack()); + prl(createToEStack("tempa")); + prl(createToEStack("tempa")); break; } case dup2: { - prl(getTopTwo()); - prl(cmdToEStack("tempb")); - prl(cmdToEStack("tempa")); - prl(cmdToEStack("tempb")); - prl(cmdToEStack("tempa")); + prl(createTopTwoEStack()); + prl(createToEStack("tempb")); + prl(createToEStack("tempa")); + prl(createToEStack("tempb")); + prl(createToEStack("tempa")); break; } case pop: { - prl(cmdPopEStack()); + prl(createPopEStack()); break; } @@ -543,10 +615,13 @@ public class mjc2wsl{ case jle: case jgt: case jge: { - prl(getTopTwo()); + prl(createStartVar("tempa", "tempb")); + prl(createTopTwoEStack()); prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a" + (counter + get2()) + " ELSE CALL a" + (counter + 1) + " FI;"); + prl(createEndVar()); + break; } @@ -558,49 +633,53 @@ public class mjc2wsl{ case return_: { // we let the actions return // there is nothing to clean up - prl("SKIP END b" + counter + " =="); + prl("SKIP\n END\n b" + counter + " =="); break; } case enter: { int parameters = get(); int locals = get(); - prl(cmdToMStack("mjvm_locals")); + prl(createToMStack("mjvm_locals")); prl("mjvm_locals := ARRAY(" + locals + ",0);"); for (int i = parameters - 1; i >= 0; i--) - prl(cmdFromEStack(loc(i))); + prl(createFromEStack(createLocal(i))); break; } case exit: { - prl(cmdFromMStack("mjvm_locals")); + prl(createFromMStack("mjvm_locals")); break; } // read, print case bread: { // TODO make it a char for read - message("char is read like a number", M_WAR); + messages.message("char is read like a number", TransMessages.M_WAR); prl(createComment("char is read like a number", C_SPEC)); } case read: { + prl(createStartVar("tempa")); prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));"); - prl(cmdToEStack("tempa")); + prl(createToEStack("tempa")); + prl(createEndVar()); break; } // the prints case bprint: { - // TODO need to make it a char on print - message("chars will be printed as number codes", M_WAR); - prl(createComment("char will be printed as a number code", - C_SPEC)); + prl(createStartVar("tempa", "tempb")); + prl(createTopTwoEStack()); + prl("Print_MJ_CHAR(tempb,tempa);"); + prl(createEndVar()); + break; } case print: { // TODO printing numbers needs different lengths of spacing - prl(getTopTwo()); - 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(createStartVar("tempa", "tempb")); + + prl(createTopTwoEStack()); + prl("Print_MJ(tempb,tempa);"); + prl(createEndVar()); break; } @@ -611,7 +690,7 @@ public class mjc2wsl{ default: prl(createComment("unknown op error: " + op, C_ERR)); - message("unknown op error: " + op, M_ERR); + messages.message("unknown op error: " + op, TransMessages.M_ERR); break; } @@ -619,12 +698,12 @@ public class mjc2wsl{ op = get(); if (op >= 0) if (wasJump) - prl("SKIP END"); + prl("SKIP\n END"); else - prl("CALL a" + counter + " END"); + prl("CALL a" + counter + "\n END"); } - prl("CALL Z;\nSKIP END\nENDACTIONS;\n"); - prl(getStandardEnd()); + prl("SKIP\n END\nENDACTIONS;\n"); + pr(createStandardEnd()); } public void convertFile(File f) { @@ -636,14 +715,62 @@ public class mjc2wsl{ } public void printHelp() { + printVersion(); + printUsage(); + printHelpOutput(); + printHelpHelp(); + } + + public void printLongHelp() { + printVersion(); + printUsage(); + System.out.println(); + printHelpOutput(); + System.out.println(); + printHelpDirectives(); + 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"); + } + + 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"); + } + + public void printHelpDirectives(){ + System.out.println("Alternatives for code generation:"); + System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD"); + } + + public void printHelpHelp() { + 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(){ + 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"); - System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]"); - System.out.println("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 don't print even the error messages"); - System.out.println("\t-d print detailed debug messages"); } public String makeDefaultOutName(String inname){ @@ -662,6 +789,13 @@ public class mjc2wsl{ if (args[i].compareTo("-h") == 0) { printHelp(); return; + } 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) @@ -673,11 +807,11 @@ public class mjc2wsl{ } else if (args[i].compareTo("--screen") == 0) { out = new PrintWriter(System.out); } else if (args[i].compareTo("-d") == 0) { - printLevel = M_DEB;// print debug info + messages.setPrintLevel(TransMessages.M_DEB);// print debug info } else if (args[i].compareTo("-v") == 0) { - printLevel = M_WAR;// print warnings + messages.setPrintLevel(TransMessages.M_WAR);// print warnings } else if (args[i].compareTo("-q") == 0) { - printLevel = M_ERR + 1;// no printing + messages.setPrintLevel(TransMessages.M_QUIET);// no printing } else if (args[i].compareToIgnoreCase("--genEStackPrint") == 0) { genPrintEStackOnChange = true; } else if (args[i].compareToIgnoreCase("--genAddrPause") == 0) { @@ -691,6 +825,8 @@ public class mjc2wsl{ genPrintEStackOnChange = true; genPrintForEachAddress = true; genPauseAfterEachAddress = true; + } else if (args[i].compareToIgnoreCase("--genPopPush") == 0) { + genPopPush = true; } i++; } @@ -724,7 +860,7 @@ public class mjc2wsl{ long mili = Calendar.getInstance().getTimeInMillis() - now.getTimeInMillis(); System.out.println("conversion time:" + mili + " ms"); - printMessageCounters(); + messages.printMessageCounters(); out.close(); } else System.out.println("file does not exist");