Fixes to rawset, rawget, collectgarbage

src/core/org/luaj/lib/BaseLib.java

@@ -110,6 +110,20 @@ public class BaseLib extends LFunction {
 		vm.pushstring( message );
 	}
 	
+	private void checkargexists(LuaState vm, int index, int type) {
+		if ( vm.gettop() < index )
+			vm.error("bad argument #"+(index-1)+" to '?' ("+
+					(type == Lua.LUA_TVALUE? 
+						"value expected)":
+						Lua.TYPE_NAMES[type]+" expected, got no value)") );
+	}
+
+	private void checkargtype(LuaState vm, int index, int type) {		
+		checkargexists( vm, index, type );
+		if ( vm.type(index) != type )
+			vm.error("bad argument #"+(index-1)+" to '?' ("+Lua.TYPE_NAMES[type]+" expected, got "+vm.typename(index)+")");		
+	}
+
 	public boolean luaStackCall(LuaState vm) {
 		switch ( id ) {
 		case PRINT: {
@@ -208,23 +222,23 @@ public class BaseLib extends LFunction {
 			break;
 		}
 		case RAWGET: {
-			LValue t = vm.topointer(2);
+			checkargtype(vm,2,Lua.LUA_TTABLE);
+			checkargexists(vm,3,Lua.LUA_TVALUE);
+			LTable t = vm.totable(2);
 			LValue k = vm.topointer(3);
 			vm.resettop();
-			if ( t instanceof LTable ) {
+			vm.pushlvalue( t.get( k ) );
-				vm.pushlvalue(( (LTable) t ).get( k ));
-			}
 		}	break;
 		case RAWSET: {
-			LValue t = vm.topointer(2);
+			checkargtype(vm,2,Lua.LUA_TTABLE);
+			checkargexists(vm,3,Lua.LUA_TVALUE);
+			checkargexists(vm,4,Lua.LUA_TVALUE);
+			LTable t = vm.totable(2);
 			LValue k = vm.topointer(3);
 			LValue v = vm.topointer(4);
+			t.put( k, v );
 			vm.resettop();
-			if ( t instanceof LTable ) {
+			vm.pushlvalue(t);
-				( (LTable) t ).put( k, v );
-			} else {
-				vm.error( "expected table" );
-			}
 		}	break;
 		case GETFENV: {
 			if ( vm.gettop() <= 1 ) {
@@ -258,13 +272,44 @@ public class BaseLib extends LFunction {
 			}
 			break;
 		}
-		case SELECT:
+		case SELECT: {
-			select( vm );
+			int n = vm.gettop();
-			break;
+			if ( n < 2 )  
-		case COLLECTGARBAGE:
+				vm.error( "bad argument #1 to '?' (number expected, got no value)" );
-			System.gc();
+			if ( vm.isnumber(2) ) {
+				int index = vm.tointeger(2);
+				if ( index < 0 )
+					index += n-1;
+				if ( index <= 0 )
+					vm.error( "bad argument #1 to '?' (index out of range)" );
+				if ( index >= n )
 					vm.resettop();
+				else {
+					for ( int i=0; i<=index; i++ )
+						vm.remove(1);
+				}					
+			} else if ( vm.tostring(2).equals( "#" ) ) {
+				vm.resettop();
+				vm.pushnumber( n - 2 );
+			} else {
+				vm.error( "bad argument #1 to '?' (number expected, got "+vm.typename(2)+")" );
+			}
 			break;
+		}
+		case COLLECTGARBAGE: {
+			String s = vm.tostring(2);
+			int result = 0;
+			vm.resettop();
+			if ( "collect".equals(s) )
+				System.gc();
+			else {
+				Runtime rt = Runtime.getRuntime();
+				long used = rt.totalMemory() - rt.freeMemory();
+				result = (int) (used >> 10);
+			}
+			vm.pushnumber(result);
+			break;
+		}
 		case DOFILE:
 			dofile(vm);
 			break;
@@ -319,19 +364,6 @@ public class BaseLib extends LFunction {
 		stdout = System.out;
 	}
 
-	private void select( LuaState vm ) {
-		LValue arg = vm.topointer(2);
-		if ( arg instanceof LNumber ) {
-			final int start = Math.min(arg.toJavaInt(),vm.gettop());
-			for ( int i=0; i<=start; i++ )
-				vm.remove(1);
-			return;
-		} else if ( arg.toJavaString().equals( "#" ) ) {
-			setResult( vm, LInteger.valueOf( vm.gettop() - 2 ) );
-		}
-	}
-	
-
 	// closes the input stream, provided its not null or System.in
 	private static void closeSafely(InputStream is) {
 		try {

src/core/org/luaj/vm/Lua.java

@@ -336,6 +336,7 @@ public class Lua {
 	public static final int LUA_TFUNCTION		= 6;
 	public static final int LUA_TUSERDATA		= 7;
 	public static final int LUA_TTHREAD			= 8;
+	public static final int LUA_TVALUE          = 9;
 
 	public static final String[] TYPE_NAMES = {
 		"nil", 
@@ -347,6 +348,7 @@ public class Lua {
 		"function",
 		"userdata",
 		"thread",
+		"value",
 	};
 
 }