diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-15 11:27:40 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-10-15 11:27:40 -0300 |
commit | 89602bf7476c6ecf04cc0e0125b9664dc15ebb08 (patch) | |
tree | 1daf1062ad89a23286dca8278b323f54fddcff17 | |
parent | 56d45378796b881b638671655164a16bb8ad8a57 (diff) | |
download | lua-89602bf7476c6ecf04cc0e0125b9664dc15ebb08.tar.gz lua-89602bf7476c6ecf04cc0e0125b9664dc15ebb08.tar.bz2 lua-89602bf7476c6ecf04cc0e0125b9664dc15ebb08.zip |
'lua_strtonum' -> 'lua_stringtonum'
-rw-r--r-- | lapi.c | 4 | ||||
-rw-r--r-- | lbaselib.c | 4 | ||||
-rw-r--r-- | liolib.c | 6 | ||||
-rw-r--r-- | lua.h | 4 |
4 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lapi.c,v 2.235 2014/08/27 14:59:33 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 2.236 2014/10/07 18:29:13 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 | */ |
@@ -332,7 +332,7 @@ LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) { | |||
332 | } | 332 | } |
333 | 333 | ||
334 | 334 | ||
335 | LUA_API size_t lua_strtonum (lua_State *L, const char *s) { | 335 | LUA_API size_t lua_stringtonum (lua_State *L, const char *s) { |
336 | size_t sz = luaO_str2num(s, L->top); | 336 | size_t sz = luaO_str2num(s, L->top); |
337 | if (sz != 0) | 337 | if (sz != 0) |
338 | api_incr_top(L); | 338 | api_incr_top(L); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lbaselib.c,v 1.299 2014/10/01 11:54:56 roberto Exp roberto $ | 2 | ** $Id: lbaselib.c,v 1.300 2014/10/07 18:29:13 roberto Exp roberto $ |
3 | ** Basic library | 3 | ** Basic library |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -78,7 +78,7 @@ static int luaB_tonumber (lua_State *L) { | |||
78 | else { | 78 | else { |
79 | size_t l; | 79 | size_t l; |
80 | const char *s = lua_tolstring(L, 1, &l); | 80 | const char *s = lua_tolstring(L, 1, &l); |
81 | if (s != NULL && lua_strtonum(L, s) == l + 1) | 81 | if (s != NULL && lua_stringtonum(L, s) == l + 1) |
82 | return 1; /* successful conversion to number */ | 82 | return 1; /* successful conversion to number */ |
83 | /* else not a number */ | 83 | /* else not a number */ |
84 | } | 84 | } |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: liolib.c,v 2.130 2014/10/01 16:05:06 roberto Exp roberto $ | 2 | ** $Id: liolib.c,v 2.131 2014/10/03 12:54:57 roberto Exp roberto $ |
3 | ** Standard I/O (and system) library | 3 | ** Standard I/O (and system) library |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -425,7 +425,7 @@ static int readdigits (RN *rn, int hex) { | |||
425 | 425 | ||
426 | /* | 426 | /* |
427 | ** Read a number: first reads a valid prefix of a numeral into a buffer. | 427 | ** Read a number: first reads a valid prefix of a numeral into a buffer. |
428 | ** Then it calls 'lua_strtonum' to check whether the format is correct | 428 | ** Then it calls 'lua_stringtonum' to check whether the format is correct |
429 | ** and to convert it to a Lua number | 429 | ** and to convert it to a Lua number |
430 | */ | 430 | */ |
431 | static int read_number (lua_State *L, FILE *f) { | 431 | static int read_number (lua_State *L, FILE *f) { |
@@ -452,7 +452,7 @@ static int read_number (lua_State *L, FILE *f) { | |||
452 | ungetc(rn.c, rn.f); /* unread look-ahead char */ | 452 | ungetc(rn.c, rn.f); /* unread look-ahead char */ |
453 | l_unlockfile(rn.f); | 453 | l_unlockfile(rn.f); |
454 | rn.buff[rn.n] = '\0'; /* finish string */ | 454 | rn.buff[rn.n] = '\0'; /* finish string */ |
455 | if (lua_strtonum(L, rn.buff)) /* is this a valid number? */ | 455 | if (lua_stringtonum(L, rn.buff)) /* is this a valid number? */ |
456 | return 1; /* ok */ | 456 | return 1; /* ok */ |
457 | else { /* invalid format */ | 457 | else { /* invalid format */ |
458 | lua_pushnil(L); /* "result" to be removed */ | 458 | lua_pushnil(L); /* "result" to be removed */ |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lua.h,v 1.316 2014/10/04 22:57:36 roberto Exp roberto $ | 2 | ** $Id: lua.h,v 1.317 2014/10/07 18:29:13 roberto Exp roberto $ |
3 | ** Lua - A Scripting Language | 3 | ** Lua - A Scripting Language |
4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) | 4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) |
5 | ** See Copyright Notice at the end of this file | 5 | ** See Copyright Notice at the end of this file |
@@ -321,7 +321,7 @@ LUA_API int (lua_next) (lua_State *L, int idx); | |||
321 | LUA_API void (lua_concat) (lua_State *L, int n); | 321 | LUA_API void (lua_concat) (lua_State *L, int n); |
322 | LUA_API void (lua_len) (lua_State *L, int idx); | 322 | LUA_API void (lua_len) (lua_State *L, int idx); |
323 | 323 | ||
324 | LUA_API size_t (lua_strtonum) (lua_State *L, const char *s); | 324 | LUA_API size_t (lua_stringtonum) (lua_State *L, const char *s); |
325 | 325 | ||
326 | LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud); | 326 | LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud); |
327 | LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud); | 327 | LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud); |