From f81bc1e1741534b6c29cd8d173989c010673bc61 Mon Sep 17 00:00:00 2001 From: Enrico Horn Date: Fri, 9 Jul 2021 22:04:36 +0200 Subject: [PATCH] Make some errors compatible with native lua --- luaj-core/src/main/java/org/luaj/vm2/LuaValue.java | 6 +++--- .../test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/luaj-core/src/main/java/org/luaj/vm2/LuaValue.java b/luaj-core/src/main/java/org/luaj/vm2/LuaValue.java index 9e31cb84..0912a3ef 100644 --- a/luaj-core/src/main/java/org/luaj/vm2/LuaValue.java +++ b/luaj-core/src/main/java/org/luaj/vm2/LuaValue.java @@ -839,7 +839,7 @@ abstract public class LuaValue extends Varargs { * @see #toString() * @see #TSTRING */ - public String optjstring(String defval) { argerror("String"); return null; } + public String optjstring(String defval) { argerror("string"); return null; } /** * Check that optional argument is a string or number and return as @@ -1018,7 +1018,7 @@ abstract public class LuaValue extends Varargs { * @see #optint(int) * @see #TNUMBER */ - public int checkint() { argerror("int"); return 0; } + public int checkint() { argerror("number"); return 0; } /** * Check that the value is numeric, and convert and cast value to int, or @@ -3434,7 +3434,7 @@ abstract public class LuaValue extends Varargs { return h.call(this, op1); if (LuaValue.LE.raweq(tag) && (!(h = metatag(LT)).isnil() || !(h = op1.metatag(LT)).isnil())) return h.call(op1, this).not(); - return error("attempt to compare " + tag + " on " + typename() + " and " + op1.typename()); + return error("bad argument: attempt to compare " + tag + " on " + typename() + " and " + op1.typename()); } /** diff --git a/luaj-core/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java b/luaj-core/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java index 2ed1ce4e..70e609b3 100644 --- a/luaj-core/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java +++ b/luaj-core/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java @@ -1050,7 +1050,7 @@ class UnaryBinaryOperatorsTest { LuaValue.class.getMethod(op, new Class[] { LuaValue.class }).invoke(a, new Object[] { b }); } catch (InvocationTargetException ite) { String actual = ite.getTargetException().getMessage(); - if ((!actual.startsWith("attempt to compare")) || actual.indexOf(type) < 0) + if ((!actual.contains("attempt to compare")) || actual.indexOf(type) < 0) fail("(" + a.typename() + "," + op + "," + b.typename() + ") reported '" + actual + "'"); } catch (Exception e) { fail("(" + a.typename() + "," + op + "," + b.typename() + ") threw " + e);