diff options
-rw-r--r-- | lobject.c | 6 | ||||
-rw-r--r-- | lobject.h | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lobject.c,v 1.13 1998/06/19 16:14:09 roberto Exp $ | 2 | ** $Id: lobject.c,v 1.14 1998/12/27 20:25:20 roberto Exp roberto $ |
3 | ** Some generic functions over Lua objects | 3 | ** Some generic functions over Lua objects |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -40,9 +40,7 @@ int luaO_redimension (int oldsize) | |||
40 | } | 40 | } |
41 | 41 | ||
42 | 42 | ||
43 | int luaO_equalObj (TObject *t1, TObject *t2) | 43 | int luaO_equalval (TObject *t1, TObject *t2) { |
44 | { | ||
45 | if (ttype(t1) != ttype(t2)) return 0; | ||
46 | switch (ttype(t1)) { | 44 | switch (ttype(t1)) { |
47 | case LUA_T_NIL: return 1; | 45 | case LUA_T_NIL: return 1; |
48 | case LUA_T_NUMBER: return nvalue(t1) == nvalue(t2); | 46 | case LUA_T_NUMBER: return nvalue(t1) == nvalue(t2); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lobject.h,v 1.23 1998/12/01 19:09:47 roberto Exp $ | 2 | ** $Id: lobject.h,v 1.24 1998/12/27 20:25:20 roberto Exp roberto $ |
3 | ** Type definitions for Lua objects | 3 | ** Type definitions for Lua objects |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -193,7 +193,9 @@ extern char *luaO_typenames[]; | |||
193 | 193 | ||
194 | extern TObject luaO_nilobject; | 194 | extern TObject luaO_nilobject; |
195 | 195 | ||
196 | int luaO_equalObj (TObject *t1, TObject *t2); | 196 | #define luaO_equalObj(t1,t2) ((ttype(t1) != ttype(t2)) ? 0 \ |
197 | : luaO_equalval(t1,t2)) | ||
198 | int luaO_equalval (TObject *t1, TObject *t2); | ||
197 | int luaO_redimension (int oldsize); | 199 | int luaO_redimension (int oldsize); |
198 | void luaO_insertlist (GCnode *root, GCnode *node); | 200 | void luaO_insertlist (GCnode *root, GCnode *node); |
199 | double luaO_str2d (char *s); | 201 | double luaO_str2d (char *s); |