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

Fix top handling for table module

Browse Source
This commit is contained in:
James Roseborough
2007-11-05 19:42:31 +00:00
parent ec5068a96e
commit 484a758b3c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/addon/java/lua/addon/luacompat/LuaCompat.java
View File

@@ -405,7 +405,7 @@ public class LuaCompat extends LFunction {
return input; return input;
} else if ( input instanceof LString ) { } else if ( input instanceof LString ) {
int base = 10; int base = 10;
if ( vm.gettop()>2 ) { if ( vm.gettop()>=3 ) {
base = vm.tointeger(3); base = vm.tointeger(3);
} }
return ( (LString) input ).luaToNumber( base ); return ( (LString) input ).luaToNumber( base );
@@ -663,7 +663,7 @@ public class LuaCompat extends LFunction {
private void concat(VM vm) { private void concat(VM vm) {
int n = vm.gettop(); int n = vm.gettop();
LTable table = vm.totable(2); LTable table = vm.totable(2);
LString sep = (n>2? vm.tolstring(3): null); LString sep = (n>=3? vm.tolstring(3): null);
int i = vm.tointeger(4); int i = vm.tointeger(4);
int j = vm.tointeger(5); int j = vm.tointeger(5);
int len = table.luaLength(); int len = table.luaLength();
@@ -695,7 +695,7 @@ public class LuaCompat extends LFunction {
private void insert(VM vm) { private void insert(VM vm) {
int n = vm.gettop(); int n = vm.gettop();
LTable table = vm.totable(2); LTable table = vm.totable(2);
int pos = (n>3? vm.tointeger(3): 0); int pos = (n>=4? vm.tointeger(3): 0);
LValue value = vm.topointer(-1); LValue value = vm.topointer(-1);
table.luaInsertPos( pos, value ); table.luaInsertPos( pos, value );
} }
@@ -722,7 +722,7 @@ public class LuaCompat extends LFunction {
private void remove(VM vm) { private void remove(VM vm) {
int n = vm.gettop(); int n = vm.gettop();
LTable table = vm.totable(2); LTable table = vm.totable(2);
int pos = (n>1? vm.tointeger(3): 0); int pos = (n>=3? vm.tointeger(3): 0);
table.luaRemovePos( pos ); table.luaRemovePos( pos );
} }