X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=c482ccfeaa9c294df9d3a1dc75485686dc93be14;hp=c269f20ef53852419341bd77ad9fd374c888d976;hb=b7f0a8052e0644d10da8ecba9b3fc413a793d263;hpb=634914843ea9f862bb524d1aad91dffd13c27f15;ds=sidebyside

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index c269f20..c482ccf 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 ">";
@@ -287,23 +307,34 @@ public class mjc2wsl{
 			}
 			case div: {
 				prl(getTopTwo());
-				prl("tempres := tempb / tempa;");
+				prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
+				prl("tempres := tempb DIV tempa;");
+				prl(cmdToEStack("tempres"));
+				break;
+			}
+			case rem: {
+				prl(getTopTwo());
+				prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
+				prl("tempres := tempb MOD tempa;");
 				prl(cmdToEStack("tempres"));
 				break;
 			}
 
 			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;
 			}
 
@@ -321,6 +352,7 @@ public class mjc2wsl{
 			}
 			default:
 				prl(createComment("unknown op error: " + op, C_ERR));
+				message("unknown op error: "+ op, M_ERR);
 				break;
 			}
 
@@ -404,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");