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

Improve bytecode generation.

Browse Source
This commit is contained in:
James Roseborough
2010-08-02 18:28:40 +00:00
parent ddd0385f65
commit b20d7a2213
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/jse/org/luaj/vm2/luajc/Slots.java
View File

@@ -125,7 +125,7 @@ public class Slots {
case Lua.OP_LOADNIL: /* A B R(A):= ...:= R(B):= nil */ case Lua.OP_LOADNIL: /* A B R(A):= ...:= R(B):= nil */
while ( a<=b ) while ( a<=b )
s[a++] |= BIT_ASSIGN; s[a++] |= BIT_ASSIGN | BIT_NIL;
break; break;
case Lua.OP_GETTABLE: /* A B C R(A):= R(B)[RK(C)] */ case Lua.OP_GETTABLE: /* A B C R(A):= R(B)[RK(C)] */
@@ -445,9 +445,13 @@ public class Slots {
} }
private int prevUndefined(int index, int j) { private int prevUndefined(int index, int j) {
for ( ; index>=0; --index ) for ( ; index>=0; --index ) {
if ( ((slots[index][j] & BIT_INVALID) != 0) ) int s = slots[index][j];
if ( ((s & BIT_INVALID) != 0) )
return index; return index;
else if ( ((s & BIT_NIL) != 0) )
return index-1;
}
return index; return index;
} }

11
test/junit/org/luaj/vm2/FragmentsTest.java
View File

@@ -407,5 +407,16 @@ public class FragmentsTest extends TestSuite {
"end\n"+ "end\n"+
"return state\n" ); "return state\n" );
} }
public void testLoadedNilUpvalue() {
runFragment( LuaValue.NIL,
"local a = print()\n"+
"local b = c and { d = e }\n"+
"local f\n"+
"local function g()\n"+
" return f\n"+
"end\n" +
"return g()\n" );
}
} }
} }