From ec5068a96e7f5d5fc3f1e432a120cd8771ad69f3 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Mon, 5 Nov 2007 19:16:08 +0000 Subject: [PATCH] Fix select for "#" argument --- .../java/lua/addon/luacompat/LuaCompat.java | 1 - src/test/res/select.lua | 3 +++ src/test/res/select.luac | Bin 664 -> 815 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/addon/java/lua/addon/luacompat/LuaCompat.java b/src/addon/java/lua/addon/luacompat/LuaCompat.java index abaa3a66..99084b14 100644 --- a/src/addon/java/lua/addon/luacompat/LuaCompat.java +++ b/src/addon/java/lua/addon/luacompat/LuaCompat.java @@ -374,7 +374,6 @@ public class LuaCompat extends LFunction { } else if ( arg.toJavaString().equals( "#" ) ) { setResult( vm, LInteger.valueOf( vm.gettop() - 2 ) ); } - vm.settop(0); } private LValue abs( final LValue v ) { diff --git a/src/test/res/select.lua b/src/test/res/select.lua index 8df53041..86c0abe6 100644 --- a/src/test/res/select.lua +++ b/src/test/res/select.lua @@ -24,5 +24,8 @@ print( select(3, "a", "b", "c")) print((select(4, "a", "b", "c"))) print( select(4, "a", "b", "c")) +print( select("#") ) +print( select("#", "a") ) +print( select("#", "a", "b") ) -- f("hello", "world") -- g(1, 2, 3, 4, 5, 6, 7) diff --git a/src/test/res/select.luac b/src/test/res/select.luac index 43da08700d7abb37ae70beccbbc0d392466fbf2e..4e2463309bf14238dfdc272e67038b2d16f2b5ad 100644 GIT binary patch delta 198 zcmbQix}I%<24nC>O=iZ4Ih-yIObjs$42&`k3=FIc3=FP7x)CUL@Bjl)yaB5?BO@b7 z4--g_976*G*JMM+U>+7Gpmt>-W?%@OJdsg)@&ZPV$!i!Ngh&HL(6J0q3>%gOisQpT HX)pi)jwKdj delta 53 zcmZ3_HiLD72BYIfO=d<`Ife!X&dHUG!K@5G;5hjKqx9tWj2x4HGd|#v1PMU_09ObL AD*ylh