X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=b807bc8d7be03f539ead619073a336d996f9af3d;hp=4a30186c26ffc1c0526f291014591f44b40118d7;hb=8bb607fd38a590c89a42c2aa69ed916a8cbaf4d9;hpb=b253d0a42f133c1c69cb35fcb923b4e0db7b1c2b

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 4a30186..b807bc8 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -185,8 +185,20 @@ public class mjc2wsl{
 	private String getTop() {
 		return cmdFromEStack("tempa");
 	}
+	
+	private String getRelationFor(int opcode) throws Exception {
+			switch (opcode) {
+					case jeq: return "=";
+					case jne: return "<>";
+					case jlt: return "<";
+					case jle: return "<=";
+					case jgt: return ">";
+					case jge: return ">=";
+			}
+			throw new Exception("Wrong opcode for a relation");
+	}
 
-	public void convertStream(InputStream ins){
+	public void convertStream(InputStream ins) throws Exception{
 		mainIn = ins;
 		//skip start TODO make better
 		for (int i = 0; i < 14; i++)
@@ -249,7 +261,8 @@ public class mjc2wsl{
 			case jgt:
 			case jge: {
 				prl(getTopTwo());
-				prl("IF tempb >= tempa THEN CALL a" + (counter + get2())
+				prl("IF tempb "+ getRelationFor(op)
+						+" tempa THEN CALL a" + (counter + get2())
 						+ " FI;");
 				break;
 			}
@@ -260,9 +273,29 @@ public class mjc2wsl{
 				prl(cmdToEStack("tempres"));
 				break;
 			}
+			case sub: {
+				prl(getTopTwo());
+				prl("tempres := tempb - tempa;");
+				prl(cmdToEStack("tempres"));
+				break;
+			}
+			case mul: {
+				prl(getTopTwo());
+				prl("tempres := tempb * tempa;");
+				prl(cmdToEStack("tempres"));
+				break;
+			}
 			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;
 			}