aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-07-05 11:31:20 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-07-05 11:31:20 -0300
commitee1edd5734ba27b9927198a61de5f3f26094263a (patch)
tree03b4bdac3900f3e3b565f01c19ba48fab118180f
parent8efb44b5e046fd1ba671f489b3b996ff97386165 (diff)
downloadlua-ee1edd5734ba27b9927198a61de5f3f26094263a.tar.gz
lua-ee1edd5734ba27b9927198a61de5f3f26094263a.tar.bz2
lua-ee1edd5734ba27b9927198a61de5f3f26094263a.zip
detail
-rw-r--r--lapi.c4
-rw-r--r--lvm.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/lapi.c b/lapi.c
index 60fcf0c6..17873e9b 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.42 2005/05/31 14:25:18 roberto Exp roberto $ 2** $Id: lapi.c,v 2.43 2005/05/31 14:34:02 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*/
@@ -985,7 +985,7 @@ LUA_API void lua_concat (lua_State *L, int n) {
985 985
986 986
987LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) { 987LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
988 *ud = G(L)->ud; 988 if (ud) *ud = G(L)->ud;
989 return G(L)->frealloc; 989 return G(L)->frealloc;
990} 990}
991 991
diff --git a/lvm.c b/lvm.c
index 1c5beb77..adc9019a 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.46 2005/05/31 14:25:18 roberto Exp roberto $ 2** $Id: lvm.c,v 2.47 2005/06/13 14:15:22 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*/
@@ -311,8 +311,8 @@ void luaV_concat (lua_State *L, int total, int last) {
311} 311}
312 312
313 313
314static StkId Arith (lua_State *L, StkId ra, const TValue *rb, 314static void Arith (lua_State *L, StkId ra, const TValue *rb,
315 const TValue *rc, TMS op) { 315 const TValue *rc, TMS op) {
316 TValue tempb, tempc; 316 TValue tempb, tempc;
317 const TValue *b, *c; 317 const TValue *b, *c;
318 if ((b = luaV_tonumber(rb, &tempb)) != NULL && 318 if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
@@ -330,7 +330,6 @@ static StkId Arith (lua_State *L, StkId ra, const TValue *rb,
330 } 330 }
331 else if (!call_binTM(L, rb, rc, ra, op)) 331 else if (!call_binTM(L, rb, rc, ra, op))
332 luaG_aritherror(L, rb, rc); 332 luaG_aritherror(L, rb, rc);
333 return L->base;
334} 333}
335 334
336 335