X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=65b6348cf19b08e6e239f10510daf14464b3a69a;hp=2f6aa8d944212439f6405405c04435bb7343c502;hb=9a00b56dbb4af4b59c426387e4a2156c5757b0c4;hpb=1b7d6ae9ea605e75294f59d4fbe86968d93bacd9

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 2f6aa8d..65b6348 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -114,7 +114,7 @@ public class mjc2wsl{
 
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
 		for (int i = 0; i <= 3; i++)
-			ret.append("mjvm_loc" + i + " := 0, ");
+			ret.append(loc(i) + " := 0, ");
 		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < >, "); 
 		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
 		ret.append("\n	t_e_m_p := 0 > :");
@@ -419,7 +419,7 @@ public class mjc2wsl{
 				
 				get();
 				for (int i = parameters-1; i >= 0; i--)
-						prl(cmdFromEStack("mjvm_loc" + i));
+						prl(cmdFromEStack(loc(i)));
 				break;
 			}
 			case exit: {
@@ -449,10 +449,7 @@ public class mjc2wsl{
 			}
 
 			case trap: {
-				// TODO finish trap
-				prl(createComment("trap not fully procesed yet"));
-				message("trap not fully procesed yet", M_WAR);
-				get();
+				prl("ERROR(\"Runtime error: trap("+get()+")\");");
 				break;
 			}