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

Add __unm and __len metatags.

Browse Source
This commit is contained in:
James Roseborough
2010-08-18 21:14:13 +00:00
parent 7958ee7109
commit 4d4517dd58
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/org/luaj/vm2/LuaClosure.java
View File

@@ -26,8 +26,6 @@ import org.luaj.vm2.lib.DebugLib;
public class LuaClosure extends LuaFunction {
private static final UpValue[] NOUPVALUES = new UpValue[0];
public LuaValue s_metatable;
public final Prototype p;
public final UpValue[] upValues;

2
src/core/org/luaj/vm2/LuaString.java
View File

@@ -109,7 +109,7 @@ public class LuaString extends LuaValue {
}
// unary operators
public LuaValue neg() { return valueOf(-checkarith()); }
public LuaValue neg() { double d = scannumber(10); return Double.isNaN(d)? super.neg(): valueOf(-d); }
// basic binary arithmetic
public LuaValue add( LuaValue rhs ) { double d = scannumber(10); return Double.isNaN(d)? arithmt(ADD,rhs): rhs.add(d); }

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

@@ -64,14 +64,16 @@ public class LuaValue extends Varargs {
public static final LuaString INDEX = valueOf("__index");
public static final LuaString NEWINDEX = valueOf("__newindex");
public static final LuaString CALL = valueOf("__call");
public static final LuaString MODE = valueOf("__mode");
public static final LuaString MODE = valueOf("__mode");
public static final LuaString METATABLE = valueOf("__metatable");
public static final LuaString ADD = valueOf("__add");
public static final LuaString SUB = valueOf("__sub");
public static final LuaString DIV = valueOf("__div");
public static final LuaString MUL = valueOf("__mul");
public static final LuaString POW = valueOf("__pow");
public static final LuaString MOD = valueOf("__mod");
public static final LuaString ADD = valueOf("__add");
public static final LuaString SUB = valueOf("__sub");
public static final LuaString DIV = valueOf("__div");
public static final LuaString MUL = valueOf("__mul");
public static final LuaString POW = valueOf("__pow");
public static final LuaString MOD = valueOf("__mod");
public static final LuaString UNM = valueOf("__unm");
public static final LuaString LEN = valueOf("__len");
public static final LuaString EMPTYSTRING = valueOf("");
private static int MAXSTACK = 250;
@@ -247,9 +249,9 @@ public class LuaValue extends Varargs {
// unary operators
public LuaValue not() { return FALSE; }
public LuaValue neg() { return aritherror("neg"); }
public LuaValue len() { return lenerror(); }
public int length() { error("attempt to get length of "+typename()); return 0; }
public LuaValue neg() { return checkmetatag(UNM, "attempt to perform arithmetic on ").call(this); }
public LuaValue len() { return checkmetatag(LEN, "attempt to get length of ").call(this); }
public int length() { return len().toint(); }
public LuaValue getn() { return typerror("getn"); }
// object equality, used for key comparison