aboutsummaryrefslogtreecommitdiff
path: root/lvm.c
diff options
context:
space:
mode:
Diffstat (limited to 'lvm.c')
-rw-r--r--lvm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lvm.c b/lvm.c
index 12c68023..2a5689f9 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.186 2014/02/05 19:14:53 roberto Exp roberto $ 2** $Id: lvm.c,v 2.187 2014/03/06 16:15:18 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -222,7 +222,7 @@ int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2) {
222 else { /* two numbers with different variants */ 222 else { /* two numbers with different variants */
223 lua_Number n1, n2; 223 lua_Number n1, n2;
224 lua_assert(ttisnumber(t1) && ttisnumber(t2)); 224 lua_assert(ttisnumber(t1) && ttisnumber(t2));
225 (void)tonumber(t1, &n1); (void)tonumber(t2, &n2); 225 cast_void(tonumber(t1, &n1)); cast_void(tonumber(t2, &n2));
226 return luai_numeq(n1, n2); 226 return luai_numeq(n1, n2);
227 } 227 }
228 } 228 }
@@ -265,7 +265,7 @@ void luaV_concat (lua_State *L, int total) {
265 if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) 265 if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1))
266 luaT_trybinTM(L, top-2, top-1, top-2, TM_CONCAT); 266 luaT_trybinTM(L, top-2, top-1, top-2, TM_CONCAT);
267 else if (tsvalue(top-1)->len == 0) /* second operand is empty? */ 267 else if (tsvalue(top-1)->len == 0) /* second operand is empty? */
268 (void)tostring(L, top - 2); /* result is first operand */ 268 cast_void(tostring(L, top - 2)); /* result is first operand */
269 else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) { 269 else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) {
270 setobjs2s(L, top - 2, top - 1); /* result is second op. */ 270 setobjs2s(L, top - 2, top - 1); /* result is second op. */
271 } 271 }