X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fcom%2Fquemaster%2Ftransformations%2Fmjc2wsl%2FMjc2wsl.java;h=93adc5e4576db45dab7cf6c0a624cf5fbc387bdd;hp=6c3836ee58839aa53d1448c1a8fa1f555cc4dada;hb=refs%2Fheads%2Fwork;hpb=2fa0619f7c0629bb2432877bb9dcef2b27d8cb00

diff --git a/src/com/quemaster/transformations/mjc2wsl/Mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/Mjc2wsl.java
index 6c3836e..93adc5e 100644
--- 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,2015, 2016, 2018  Doni Pracner
+   Copyright (C) 2014,2015, 2016, 2018, 2019  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 = "v0.2.x";
+	private static String versionN = "v1.1.x";
 
 	private String versionFile = "version.properties";
 	
@@ -50,7 +50,7 @@ public class Mjc2wsl{
 		genPrintForEachAddress = false,
 		genPrintEStackOnChange = false;
 		
-	private boolean genPopPush=false;
+	private boolean genPopPush = true;
 	
 	private boolean genInlinePrint = false;
 	
@@ -183,10 +183,10 @@ public class Mjc2wsl{
 			+"    using mjc2wsl "+getVersion()+"\n");
 
 		ret.append("   -options:");
-		ret.append("\n    localsAsArrays:"+genLocalsAsArray);
-		ret.append("\n    localVarBlocks:"+genLocalVars);
-		ret.append("\n    popPush:"+genPopPush);
-		ret.append("\n    inlinePrint:"+genInlinePrint);
+		ret.append("\n    popPush        (pp/ht):"+genPopPush);
+		ret.append("\n    localVarBlocks (lo/gl):"+genLocalVars);
+		ret.append("\n    localsAsArrays (ar/sp):"+genLocalsAsArray);
+		ret.append("\n    inlinePrint:           "+genInlinePrint);
 		ret.append("\n\";\n");
 
 		ret.append("\nBEGIN");
@@ -374,6 +374,7 @@ public class Mjc2wsl{
 
 		int op = mjInput.get();
 		while (op >= 0) {
+			messages.message("Processing "+mjInput.describeOpCode(op)+ " at " + mjInput.getCounter(), TransMessages.M_DEB);
 			prl(" a" + mjInput.getCounter() + " ==");
 			if (originalInComments)
 				prl(createComment(mjInput.describeOpCode(op), C_OC));
@@ -796,9 +797,9 @@ public class Mjc2wsl{
 	public void printHelpDirectives(){
 		System.out.println("Alternatives for code generation (* are the defaults):");
 		System.out.print(genPopPush?'*':' ');
-		System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD");
+		System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD (pp)");
 		System.out.print(!genPopPush?'*':' ');
-		System.out.println(" --genHeadTail generate TAIL/HEAD instead of POP/PUSH ");
+		System.out.println(" --genHeadTail generate TAIL/HEAD instead of POP/PUSH (ht)");
 		System.out.println();
 		System.out.print(genInlinePrint?'*':' ');
 		System.out.println(" --genInlinePrint generate prints directly instead of procedure calls");
@@ -806,14 +807,14 @@ public class Mjc2wsl{
 		System.out.println(" --genProcedurePrint generate prints as custom procedure calls");
 		System.out.println();
 		System.out.print(genLocalVars?'*':' ');
-		System.out.println(" --genLocalVars generate local VAR block for temp variables");
+		System.out.println(" --genLocalVars generate local VAR block for temp variables (lo)");
 		System.out.print(!genLocalVars?'*':' ');
-		System.out.println(" --genGlobalVars do NOT generate local VAR block for temp variables");
+		System.out.println(" --genGlobalVars do NOT generate local VAR block for temp variables (gl)");
 		System.out.println();
 		System.out.print(genLocalsAsArray?'*':' ');
-		System.out.println(" --genLocalsAsArray generate local variables as an array");
+		System.out.println(" --genLocalsAsArray generate local variables as an array (ar)");
 		System.out.print(!genLocalsAsArray?'*':' ');
-		System.out.println(" --genLocalsSeparate generate local variables as separate entities");
+		System.out.println(" --genLocalsSeparate generate local variables as separate entities (sp)");
 	}
 
 	public void printHelpHelp() {
@@ -925,6 +926,9 @@ public class Mjc2wsl{
 					System.err.println("error in opening out file:");
 					e.printStackTrace();
 				}
+				if (i + 2 < args.length) {
+					messages.message("additional parameters ignored, starting from:'"+args[i+2]+"'", TransMessages.M_ERR);
+				}
 			}
 			if (out == null) {
 				// if not set to screen, or a file, make a default filename
@@ -944,7 +948,7 @@ public class Mjc2wsl{
 			}
 			long mili = Calendar.getInstance().getTimeInMillis()
 					- now.getTimeInMillis();
-			System.out.println("conversion time:" + mili + " ms");
+			messages.message("conversion time:" + mili + " ms");
 			messages.printMessageCounters();
 			out.close();
 		}
@@ -955,4 +959,4 @@ public class Mjc2wsl{
 	}
 
 
-}
\ No newline at end of file
+}