open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[NOTHING CHANGED] Assorted fixes #48

Closed
asiekierka wants to merge 61 commits from asiekierka/master into master
pull from: asiekierka/master
merge into: open-autonomous-connection:master
Conversation 3 Commits 61 Files Changed 413 +3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9fa0f27c7 - Show all commits

4
src/core/org/luaj/vm2/LuaValue.java
View File

@@ -1053,7 +1053,7 @@ public class LuaValue extends Varargs {
* @param expected String naming the type that was expected * @param expected String naming the type that was expected
* @throws LuaError in all cases * @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 * 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 * @param msg String providing information about the invalid argument
* @throws LuaError in all cases * @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 * Throw a {@link LuaError} indicating an invalid type was supplied to a function

2
src/core/org/luaj/vm2/compiler/FuncState.java
View File

@@ -97,7 +97,7 @@ public class FuncState extends Constants {
for (i = bl.firstlabel; i < ll_n; i++) { for (i = bl.firstlabel; i < ll_n; i++) {
if (label.eq_b(ll[i].name)) { if (label.eq_b(ll[i].name)) {
String msg = ls.L.pushfstring( 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); ls.semerror(msg);
} }
} }