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 1de3de03..fbc7c45a 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.146 2011/11/29 15:54:38 roberto Exp roberto $ 2** $Id: lvm.c,v 2.147 2011/12/07 14:43:55 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*/
@@ -258,7 +258,7 @@ int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) {
258 case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */ 258 case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */
259 case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2); 259 case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
260 case LUA_TLCF: return fvalue(t1) == fvalue(t2); 260 case LUA_TLCF: return fvalue(t1) == fvalue(t2);
261 case LUA_TSTRING: return eqstr(rawtsvalue(t1), rawtsvalue(t2)); 261 case LUA_TSTRING: return luaS_eqstr(rawtsvalue(t1), rawtsvalue(t2));
262 case LUA_TUSERDATA: { 262 case LUA_TUSERDATA: {
263 if (uvalue(t1) == uvalue(t2)) return 1; 263 if (uvalue(t1) == uvalue(t2)) return 1;
264 else if (L == NULL) return 0; 264 else if (L == NULL) return 0;
@@ -293,7 +293,7 @@ void luaV_concat (lua_State *L, int total) {
293 else if (tsvalue(top-1)->len == 0) /* second operand is empty? */ 293 else if (tsvalue(top-1)->len == 0) /* second operand is empty? */
294 (void)tostring(L, top - 2); /* result is first operand */ 294 (void)tostring(L, top - 2); /* result is first operand */
295 else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) { 295 else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) {
296 setsvalue2s(L, top-2, rawtsvalue(top-1)); /* result is second op. */ 296 setobjs2s(L, top - 2, top - 1); /* result is second op. */
297 } 297 }
298 else { 298 else {
299 /* at least two non-empty string values; get as many as possible */ 299 /* at least two non-empty string values; get as many as possible */