From c9fa0f27c7fddd809b6e731efba59f202718cd7e Mon Sep 17 00:00:00 2001 From: gamax92 Date: Sun, 11 Aug 2019 11:50:42 +0200 Subject: [PATCH] LuaValue, FuncState: correct error messages to match Lua --- src/core/org/luaj/vm2/LuaValue.java | 4 ++-- src/core/org/luaj/vm2/compiler/FuncState.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/org/luaj/vm2/LuaValue.java b/src/core/org/luaj/vm2/LuaValue.java index 9d3af18d..6f24a265 100644 --- a/src/core/org/luaj/vm2/LuaValue.java +++ b/src/core/org/luaj/vm2/LuaValue.java @@ -1053,7 +1053,7 @@ public class LuaValue extends Varargs { * @param expected String naming the type that was expected * @throws LuaError in all cases */ - protected LuaValue argerror(String expected) { throw new LuaError("bad argument: "+expected+" expected, got "+typename()); } + protected LuaValue argerror(String expected) { throw new LuaError("bad argument ("+expected+" expected, got "+typename()+")"); } /** * Throw a {@link LuaError} indicating an invalid argument was supplied to a function @@ -1061,7 +1061,7 @@ public class LuaValue extends Varargs { * @param msg String providing information about the invalid argument * @throws LuaError in all cases */ - public static LuaValue argerror(int iarg,String msg) { throw new LuaError("bad argument #"+iarg+": "+msg); } + public static LuaValue argerror(int iarg,String msg) { throw new LuaError("bad argument #"+iarg+" ("+msg+")"); } /** * Throw a {@link LuaError} indicating an invalid type was supplied to a function diff --git a/src/core/org/luaj/vm2/compiler/FuncState.java b/src/core/org/luaj/vm2/compiler/FuncState.java index 70e0f885..1803eea0 100644 --- a/src/core/org/luaj/vm2/compiler/FuncState.java +++ b/src/core/org/luaj/vm2/compiler/FuncState.java @@ -97,7 +97,7 @@ public class FuncState extends Constants { for (i = bl.firstlabel; i < ll_n; i++) { if (label.eq_b(ll[i].name)) { String msg = ls.L.pushfstring( - "label '" + label + " already defined on line " + ll[i].line); + "label '" + label + "' already defined on line " + ll[i].line); ls.semerror(msg); } }