0.52: Small fixes for closer conformance with regular Lua.

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

@@ -262,8 +262,7 @@ public class BaseLib extends LFunction {
 				vm.checkany(2);
 				LValue v = vm.tolnumber(2);
 				vm.resettop();
-				if ( ! v.isNil() )
+				vm.pushlvalue(v);
-					vm.pushlvalue(v);
 			} else {
 				if ( base < 2 || base > 36 )
 					vm.typerror(3, "base out of range");				
@@ -338,7 +337,7 @@ public class BaseLib extends LFunction {
 			break;
 		}
 		case COLLECTGARBAGE: {
-			String s = vm.checkstring(2);
+			String s = vm.optstring(2, "collect");
 			int result = 0;
 			vm.resettop();
 			if ( "collect".equals(s) )

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

@@ -1084,7 +1084,9 @@ public class StringLib extends LFunction {
 				case ')':
 					return end_capture( soffset, poffset + 1 );
 				case L_ESC:
-					switch ( p.luaByte( poffset+1 ) ) {
+					if ( poffset + 1 == p.length() )
+						vm.error("malformed pattern (ends with '%')");
+					switch ( p.luaByte( poffset + 1 ) ) {
 					case 'b':
 						soffset = matchbalance( soffset, poffset + 2 );
 						if ( soffset == -1 ) return -1;

src/test/res/strlib.lua

@@ -152,3 +152,17 @@ for i,letter in ipairs(letters) do
 	end
 end
 --]]
+
+local function fmterr(...)
+	local r, s = pcall(...)
+	if r then
+		return s
+	else
+		s = string.gsub(s, "stdin:%d+:%s*", "")
+		return s
+	end
+end
+
+print(fmterr(string.find, "ab%c)0(", "%"))
+print(fmterr(string.find, "ab%c)0(", "("))
+print(pcall(string.find, "ab%c)0(", ")"))

version.properties

@@ -1 +1 @@
-version: 0.51
+version: 0.52