X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=274bb7e448cd0d90f883ecab19e0093b868ac04a;hp=3a9727031b389fd4833b5ee2f8026e5be3a9f0ea;hb=9ed768a76bf830a6db379cdc7b91afd73a924361;hpb=a2b31532a5ab77cf13fc50ddc28c303949ad1207

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 3a97270..274bb7e 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -121,6 +121,7 @@ public class mjc2wsl{
 		ret.append("mjvm_locals := ARRAY(1,0), ");
 		ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
 		ret.append("\n\tmjvm_arrays := < >, ");
+		ret.append("\n\tmjvm_objects := < >, ");
 		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < >, "); 
 		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
 		ret.append("\n	t_e_m_p := 0 > :");
@@ -224,6 +225,10 @@ public class mjc2wsl{
 			return "mjvm_arrays["+ i+"]";
 	}
 	
+	private String genObject(String i){
+			return "mjvm_objects["+ i+"]";
+	}
+	
 	/**
 	 * Creates a WSL comment with care to quote chars.
 	 */
@@ -362,12 +367,20 @@ public class mjc2wsl{
 				prl(cmdFromEStack(genStatic(get2())));
 				break;
 			}
-			//TODO getfield, putfield
-			case getfield:
+
+			case getfield:{
+					int f = get2();
+					prl(getTop());
+					prl(cmdToEStack(genObject("tempa")+"["+(f+1)+"]"));
+					break;
+			}
 			case putfield:{
-					prl(createComment("fields are not processed properly", C_ERR));
-					message("fields are not processed properly", M_ERR);
-					get2();
+					int f = get2();
+					//we need to use a temparray as a pointer, WSL
+					//otherwise tries to access it as a list of lists and fails
+					prl(getTopTwo());
+					prl("VAR < tempArray := "+genObject("tempb")+" > :");
+					prl("tempArray["+(f+1)+"]:=tempa ENDVAR;");				
 					break;
 			}
 			
@@ -431,11 +444,12 @@ public class mjc2wsl{
 				prl(loc(b1)+" := " +loc(b1)+" + "+b2+";");
 				break;
 			}
-			//TODO new_ newarray
+
 			case new_ :{
-					prl(createComment("memory allocation not processed properly", C_ERR));
-					message("memory allocation  not processed properly", M_ERR);
-					get2();
+					int size = get2();
+					//TODO maybe objects and arrays should be in the same list?
+					prl("mjvm_objects := mjvm_objects ++ < ARRAY("+size+",0) >;");
+					prl(cmdToEStack("LENGTH(mjvm_objects)"));
 					break;
 			}
 			case newarray :{
@@ -463,8 +477,30 @@ public class mjc2wsl{
 				prl("tempArray[tempa+1]:=tempres ENDVAR;");
 				break;
 			}
-			//TODO arraylength
-			//TODO dup, dup2
+			case arraylength :{
+				prl(getTop());
+				//TODO make an array length function of some sort!
+				prl(createComment("array length not known - LENGTH not aplicable to arrays",C_ERR));
+				message("array length not known - LENGTH not aplicable to arrays",M_ERR);
+				prl(createComment("put 1 on the stack for consistency",C_SPEC));
+				prl(cmdToEStack(1));
+				break;
+			}
+			
+			case dup : {
+					prl(getTop());
+					prl(cmdToEStack("tempa"));
+					prl(cmdToEStack("tempa"));
+					break;					
+			}
+			case dup2 : {
+					prl(getTopTwo());
+					prl(cmdToEStack("tempb"));
+					prl(cmdToEStack("tempa"));
+					prl(cmdToEStack("tempb"));
+					prl(cmdToEStack("tempa"));
+					break;					
+			}
 			
 			case pop : {
 					prl(cmdPopEStack());
@@ -496,9 +532,9 @@ public class mjc2wsl{
 			}
 
 			case return_: {
-				prl("IF EMPTY?(mjvm_mstack) THEN CALL Z FI");
-				//else we let things return		
-				prl("END b"+counter+" ==");
+				//we let the actions return
+				// there is nothing to clean up
+				prl("SKIP END b"+counter+" ==");
 				break;
 			}
 			case enter: {