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

Refactor call stack and its use throughout. CallFrame now does all bytecode processing, and the callframe is reinitialized anytime something might have changed, like a function call.

Browse Source
This commit is contained in:
James Roseborough
2007-06-27 06:43:33 +00:00
parent 93fc4699a9
commit c8e1934916
20 changed files with 548 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/lua/value/LFunction.java
View File

@@ -1,6 +1,7 @@
package lua.value;
import lua.StackState;
import lua.CallFrame;
public class LFunction extends LValue {
@@ -8,21 +9,21 @@ public class LFunction extends LValue {
return "function: "+hashCode();
}
public void luaSetTable(StackState state, int base, LValue table, LValue key, LValue val) {
state.top = base;
state.push( this );
state.push( table );
state.push( key );
state.push( val );
this.luaStackCall(state, base, state.top, 1);
public void luaSetTable(CallFrame call, int base, LValue table, LValue key, LValue val) {
call.top = base;
call.push( this );
call.push( table );
call.push( key );
call.push( val );
this.luaStackCall(call, base, call.top, 1);
}
public void luaGetTable(StackState state, int base, LValue table, LValue key) {
state.top = base;
state.push( this );
state.push( table );
state.push( key );
this.luaStackCall(state, base, state.top, 1);
public void luaGetTable(CallFrame call, int base, LValue table, LValue key) {
call.top = base;
call.push( this );
call.push( table );
call.push( key );
this.luaStackCall(call, base, call.top, 1);
}
}

33
src/main/java/lua/value/LTable.java
View File

@@ -3,7 +3,7 @@ package lua.value;
import java.util.Enumeration;
import java.util.Hashtable;
import lua.StackState;
import lua.CallFrame;
public class LTable extends LValue {
@@ -13,7 +13,7 @@ public class LTable extends LValue {
/** Metatable tag for intercepting table sets */
private static final LString TM_NEWINDEX = new LString("__newindex");
public Hashtable m_hash = new Hashtable();
private Hashtable m_hash = new Hashtable();
private LTable m_metatable;
public LTable() {
@@ -22,12 +22,17 @@ public class LTable extends LValue {
public LTable(int narray, int nhash) {
}
public void luaSetTable(StackState state, int base, LValue table, LValue key, LValue val) {
/** Utility method for putting a value directly, typically for initializing a table */
public void put(String key, LValue value) {
m_hash.put( new LString(key), value );
}
public void luaSetTable(CallFrame call, int base, LValue table, LValue key, LValue val) {
if ( m_metatable != null ) {
if ( ! m_hash.containsKey(key) ) {
LValue event = (LValue) m_metatable.m_hash.get( TM_NEWINDEX );
if ( event != null && event != LNil.NIL ) {
event.luaSetTable( state, base, table, key, val );
event.luaSetTable( call, base, table, key, val );
return;
}
}
@@ -35,19 +40,19 @@ public class LTable extends LValue {
m_hash.put( key, val );
}
public void luaGetTable(StackState state, int base, LValue table, LValue key) {
public void luaGetTable(CallFrame call, int base, LValue table, LValue key) {
LValue val = (LValue) m_hash.get(key);
if ( val == null || val == LNil.NIL ) {
if ( m_metatable != null ) {
LValue event = (LValue) m_metatable.m_hash.get( TM_INDEX );
if ( event != null && event != LNil.NIL ) {
event.luaGetTable( state, base, table, key );
event.luaGetTable( call, base, table, key );
return;
}
}
val = LNil.NIL;
}
state.stack[base] = val;
call.stack[base] = val;
}
public String toString() {
@@ -90,19 +95,19 @@ public class LTable extends LValue {
}
// perform a lua call
public void luaStackCall(StackState state, int base, int top, int nresults) {
public void luaStackCall(CallFrame call, int base, int top, int nresults) {
if ( e.hasMoreElements() ) {
LValue key = (LValue) e.nextElement();
LValue val = (LValue) t.m_hash.get(key);
state.stack[base] = key;
state.stack[base+1] = val;
state.top = base+2;
call.stack[base] = key;
call.stack[base+1] = val;
call.top = base+2;
} else {
state.stack[base] = LNil.NIL;
state.top = base+1;
call.stack[base] = LNil.NIL;
call.top = base+1;
}
if ( nresults >= 0 )
state.adjustTop(base + nresults);
call.adjustTop(base + nresults);
}
}

10
src/main/java/lua/value/LValue.java
View File

@@ -1,7 +1,7 @@
package lua.value;
import lua.CallFrame;
import lua.Lua;
import lua.StackState;
abstract
public class LValue {
@@ -20,7 +20,7 @@ public class LValue {
}
// perform a lua call, return number of results actually produced
public void luaStackCall(StackState state, int base, int top, int nresults) {
public void luaStackCall(CallFrame call, int base, int top, int nresults) {
luaUnsupportedOperation();
}
@@ -72,20 +72,20 @@ public class LValue {
}
/** set a value in a table
* @param state the stack state
* @param call the stack state
* @param base the base of the stack, in case a function is put on the stack
* @param table the table to operate on
* @param the key to set
* @param the value to set
*/
public void luaSetTable(StackState state, int base, LValue table, LValue key, LValue val) {
public void luaSetTable(CallFrame call, int base, LValue table, LValue key, LValue val) {
luaUnsupportedOperation();
}
/** Get a value from a table
* @param base TODO
* @param table TODO*/
public void luaGetTable(StackState state, int base, LValue table, LValue key) {
public void luaGetTable(CallFrame call, int base, LValue table, LValue key) {
luaUnsupportedOperation();
}