X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=ecf634a502dc11c26bb8d77db48af32170ec497f;hp=86177134f1bd3cc9d6656c6afa286bd50c501b45;hb=f9832be443cd63b92bd3efd96d3809c640961118;hpb=1df11af4aa88816abcb609d38793129e11ad983d

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 8617713..ecf634a 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -12,6 +12,26 @@ import java.util.*;
 public class mjc2wsl{
 	public static String versionN = "0.1.2";
 
+	public static final int M_ERR = 2, M_WAR = 1;
+	
+	private int printLevel = 0;
+	
+	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]);
+	}
+	
 	/** Constant used for marking a regular comment from the original file */
 	public static final char C_REG = ' ';
 	/**
@@ -189,7 +209,7 @@ public class mjc2wsl{
 	private String getRelationFor(int opcode) throws Exception {
 			switch (opcode) {
 					case jeq: return "=";
-					case jne: return "#";
+					case jne: return "<>";
 					case jlt: return "<";
 					case jle: return "<=";
 					case jgt: return ">";
@@ -302,16 +322,19 @@ public class mjc2wsl{
 
 			case enter: {
 				prl(createComment("enter not fully procesed yet"));
+				message("enter not fully procesed yet", M_WAR);
 				get();
 				get();
 				break;
 			}
 			case return_: {
 				prl(createComment("return not fully procesed yet"));
+				message("return not fully procesed yet", M_WAR);
 				break;
 			}
 			case exit: {
 				prl(createComment("exit not fully procesed yet"));
+				message("exit not fully procesed yet", M_WAR);
 				break;
 			}
 
@@ -329,6 +352,7 @@ public class mjc2wsl{
 			}
 			default:
 				prl(createComment("unknown op error: " + op, C_ERR));
+				message("unknown op error: "+ op, M_ERR);
 				break;
 			}
 
@@ -354,7 +378,7 @@ public class mjc2wsl{
 				+ ", by Doni Pracner");
 		System.out.println("usage:\n\t {options} mjc2wsl  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-o --oc[+-] include original code in comments");
 	}
 	
 	public String makeDefaultOutName(String inname){
@@ -412,10 +436,12 @@ public class mjc2wsl{
 			}
 			if (f.exists()) {
 				Calendar now = Calendar.getInstance();
+				printLevel=10;
 				convertFile(f);
 				long mili = Calendar.getInstance().getTimeInMillis()
 						- now.getTimeInMillis();
 				System.out.println("conversion time:" + mili + " ms");
+				printMessageCounters();
 				out.close();
 			} else
 				System.out.println("file does not exist");