aboutsummaryrefslogtreecommitdiff
path: root/lapi.c
diff options
context:
space:
mode:
Diffstat (limited to 'lapi.c')
-rw-r--r--lapi.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lapi.c b/lapi.c
index c26935c0..61a80085 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.151 2011/08/17 20:26:47 roberto Exp roberto $ 2** $Id: lapi.c,v 2.152 2011/09/26 20:17:27 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -306,17 +306,17 @@ LUA_API void lua_arith (lua_State *L, int op) {
306 306
307LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) { 307LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
308 StkId o1, o2; 308 StkId o1, o2;
309 int i; 309 int i = 0;
310 lua_lock(L); /* may call tag method */ 310 lua_lock(L); /* may call tag method */
311 o1 = index2addr(L, index1); 311 o1 = index2addr(L, index1);
312 o2 = index2addr(L, index2); 312 o2 = index2addr(L, index2);
313 if (!isvalid(o1) || !isvalid(o2)) 313 if (isvalid(o1) && isvalid(o2)) {
314 i = 0; 314 switch (op) {
315 else switch (op) { 315 case LUA_OPEQ: i = equalobj(L, o1, o2); break;
316 case LUA_OPEQ: i = equalobj(L, o1, o2); break; 316 case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
317 case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break; 317 case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
318 case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break; 318 default: api_check(L, 0, "invalid option");
319 default: api_check(L, 0, "invalid option"); i = 0; 319 }
320 } 320 }
321 lua_unlock(L); 321 lua_unlock(L);
322 return i; 322 return i;