lua

commit 0730a56d38241d70f49cc6fe650c4995fe7dcb2c
parent eecc1491f39947d575fea42ec99864d9625d6e87
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Tue,  8 Jan 2013 12:06:30 -0200

detail

Diffstat:
M
lstring.c
 | 
4
++--
M
lvm.h
 | 
5
++---

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lstring.c b/lstring.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.c,v 2.24 2012/05/11 14:14:42 roberto Exp roberto $
+** $Id: lstring.c,v 2.25 2012/10/02 17:41:50 roberto Exp roberto $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -139,7 +139,7 @@ static TString *internshrstr (lua_State *L, const char *str, size_t l) {
        o = gch(o)->next) {
     TString *ts = rawgco2ts(o);
     if (h == ts->tsv.hash &&
-        ts->tsv.len == l &&
+        l == ts->tsv.len &&
         (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
       if (isdead(G(L), o))  /* string is dead (but was not collected yet)? */
         changewhite(o);  /* resurrect it */
diff --git a/lvm.h b/lvm.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h,v 2.16 2011/05/31 18:24:36 roberto Exp roberto $
+** $Id: lvm.h,v 2.17 2011/05/31 18:27:56 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -19,8 +19,7 @@
 
 #define equalobj(L,o1,o2)  (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2))
 
-#define luaV_rawequalobj(t1,t2)  \
-        (ttisequal(t1,t2) && luaV_equalobj_(NULL,t1,t2))
+#define luaV_rawequalobj(o1,o2)		equalobj(NULL,o1,o2)
 
 
 /* not to called directly */