diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-08-01 14:24:02 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-08-01 14:24:02 -0300 |
| commit | f5c690b684b8503dce9fe9f9e1a956cabd1c8699 (patch) | |
| tree | d62e88764baf72f53864d933b657ee9f79d404a6 | |
| parent | 61fa462535a5c16b46e5b19ee28c0d998ab6c39e (diff) | |
| download | lua-f5c690b684b8503dce9fe9f9e1a956cabd1c8699.tar.gz lua-f5c690b684b8503dce9fe9f9e1a956cabd1c8699.tar.bz2 lua-f5c690b684b8503dce9fe9f9e1a956cabd1c8699.zip | |
details in comments
| -rw-r--r-- | lobject.c | 4 | ||||
| -rw-r--r-- | ltable.c | 4 | ||||
| -rw-r--r-- | lvm.h | 6 |
3 files changed, 7 insertions, 7 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lobject.c,v 2.87 2014/06/30 19:48:08 roberto Exp roberto $ | 2 | ** $Id: lobject.c,v 2.88 2014/07/30 14:00:14 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 | */ |
| @@ -359,7 +359,7 @@ static void pushstr (lua_State *L, const char *str, size_t l) { | |||
| 359 | 359 | ||
| 360 | 360 | ||
| 361 | /* this function handles only '%d', '%c', '%f', '%p', and '%s' | 361 | /* this function handles only '%d', '%c', '%f', '%p', and '%s' |
| 362 | conventional formats, plus Lua-specific '%L' and '%U' */ | 362 | conventional formats, plus Lua-specific '%I' and '%U' */ |
| 363 | const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { | 363 | const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { |
| 364 | int n = 0; | 364 | int n = 0; |
| 365 | for (;;) { | 365 | for (;;) { |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ltable.c,v 2.92 2014/07/18 13:36:14 roberto Exp roberto $ | 2 | ** $Id: ltable.c,v 2.93 2014/07/29 16:22:24 roberto Exp roberto $ |
| 3 | ** Lua tables (hash) | 3 | ** Lua tables (hash) |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -440,7 +440,7 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) { | |||
| 440 | Node *f = getfreepos(t); /* get a free place */ | 440 | Node *f = getfreepos(t); /* get a free place */ |
| 441 | if (f == NULL) { /* cannot find a free place? */ | 441 | if (f == NULL) { /* cannot find a free place? */ |
| 442 | rehash(L, t, key); /* grow table */ | 442 | rehash(L, t, key); /* grow table */ |
| 443 | /* whatever called 'newkey' take care of TM cache and GC barrier */ | 443 | /* whatever called 'newkey' takes care of TM cache and GC barrier */ |
| 444 | return luaH_set(L, t, key); /* insert key into grown table */ | 444 | return luaH_set(L, t, key); /* insert key into grown table */ |
| 445 | } | 445 | } |
| 446 | lua_assert(!isdummy(f)); | 446 | lua_assert(!isdummy(f)); |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lvm.h,v 2.32 2014/07/30 14:00:14 roberto Exp roberto $ | 2 | ** $Id: lvm.h,v 2.33 2014/07/30 14:42:44 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 | */ |
| @@ -16,14 +16,14 @@ | |||
| 16 | #if !defined(LUA_NOCVTN2S) | 16 | #if !defined(LUA_NOCVTN2S) |
| 17 | #define cvt2str(o) ttisnumber(o) | 17 | #define cvt2str(o) ttisnumber(o) |
| 18 | #else | 18 | #else |
| 19 | #define cvt2str(o) 0 /* no convertion from numbers to strings */ | 19 | #define cvt2str(o) 0 /* no conversion from numbers to strings */ |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | #if !defined(LUA_NOCVTS2N) | 23 | #if !defined(LUA_NOCVTS2N) |
| 24 | #define cvt2num(o) ttisstring(o) | 24 | #define cvt2num(o) ttisstring(o) |
| 25 | #else | 25 | #else |
| 26 | #define cvt2num(o) 0 /* no convertion from strings to numbers */ | 26 | #define cvt2num(o) 0 /* no conversion from strings to numbers */ |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | 29 | ||
