Fix return value for table.remove() and table.insert()

src/core/org/luaj/vm2/lib/TableLib.java

@@ -90,18 +90,23 @@ public class TableLib extends TwoArgFunction {
 		}
 	}
 
-	// "insert" (table, [pos,] value) -> prev-ele
-	static class insert extends TableLibFunction {
-		public LuaValue call(LuaValue list) {
-			return argerror(2, "value expected");
-		}
-		public LuaValue call(LuaValue table, LuaValue value) {
-			table.checktable().insert(table.length()+1,value);
-			return NONE;
-		}
-		public LuaValue call(LuaValue table, LuaValue pos, LuaValue value) {
-			table.checktable().insert(pos.checkint(),value);
-			return NONE;
+	// "insert" (table, [pos,] value)
+	static class insert extends VarArgFunction {
+		public Varargs invoke(Varargs args) {
+			switch (args.narg()) {
+			case 0: case 1: {
+				return argerror(2, "value expected");
+			}
+			case 2: {
+				LuaTable table = args.arg1().checktable();
+				table.insert(table.length()+1,args.arg(2));
+				return NONE;
+			}
+			default: {
+				args.arg1().checktable().insert(args.checkint(2),args.arg(3));
+				return NONE;
+			}
+			}
 		}
 	}
 	
@@ -115,23 +120,22 @@ public class TableLib extends TwoArgFunction {
 	}
 
 	// "remove" (table [, pos]) -> removed-ele
-	static class remove extends TableLibFunction {
-		public LuaValue call(LuaValue list) {
-			return list.checktable().remove(0);
-		}
-		public LuaValue call(LuaValue list, LuaValue pos) {
-			return list.checktable().remove(pos.checkint());
+	static class remove extends VarArgFunction {
+		public Varargs invoke(Varargs args) {
+			return args.arg1().checktable().remove(args.optint(2, 0));
 		}
 	}
 
 	// "sort" (table [, comp])
-	static class sort extends TwoArgFunction {
-		public LuaValue call(LuaValue table, LuaValue compare) {
-			table.checktable().sort(compare.isnil()? NIL: compare.checkfunction());
+	static class sort extends VarArgFunction {
+		public Varargs invoke(Varargs args) {
+			args.arg1().checktable().sort(
+					args.arg(2).isnil()? NIL: args.arg(2).checkfunction());
 			return NONE;
 		}
 	}
 
+	
 	// "unpack", // (list [,i [,j]]) -> result1, ...
 	static class unpack extends VarArgFunction {
 		public Varargs invoke(Varargs args) {