瀏覽代碼

'lua_strtonum' -> 'lua_stringtonum'

Roberto Ierusalimschy 10 年之前
父節點
當前提交
89602bf747
共有 4 個文件被更改,包括 9 次插入9 次删除
  1. 2 2
      lapi.c
  2. 2 2
      lbaselib.c
  3. 3 3
      liolib.c
  4. 2 2
      lua.h

+ 2 - 2
lapi.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.235 2014/08/27 14:59:33 roberto Exp roberto $
+** $Id: lapi.c,v 2.236 2014/10/07 18:29:13 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -332,7 +332,7 @@ LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
 }
 
 
-LUA_API size_t lua_strtonum (lua_State *L, const char *s) {
+LUA_API size_t lua_stringtonum (lua_State *L, const char *s) {
   size_t sz = luaO_str2num(s, L->top);
   if (sz != 0)
     api_incr_top(L);

+ 2 - 2
lbaselib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.299 2014/10/01 11:54:56 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.300 2014/10/07 18:29:13 roberto Exp roberto $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -78,7 +78,7 @@ static int luaB_tonumber (lua_State *L) {
     else {
       size_t l;
       const char *s = lua_tolstring(L, 1, &l);
-      if (s != NULL && lua_strtonum(L, s) == l + 1)
+      if (s != NULL && lua_stringtonum(L, s) == l + 1)
         return 1;  /* successful conversion to number */
       /* else not a number */
     }

+ 3 - 3
liolib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: liolib.c,v 2.130 2014/10/01 16:05:06 roberto Exp roberto $
+** $Id: liolib.c,v 2.131 2014/10/03 12:54:57 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
@@ -425,7 +425,7 @@ static int readdigits (RN *rn, int hex) {
 
 /*
 ** Read a number: first reads a valid prefix of a numeral into a buffer.
-** Then it calls 'lua_strtonum' to check whether the format is correct
+** Then it calls 'lua_stringtonum' to check whether the format is correct
 ** and to convert it to a Lua number
 */
 static int read_number (lua_State *L, FILE *f) {
@@ -452,7 +452,7 @@ static int read_number (lua_State *L, FILE *f) {
   ungetc(rn.c, rn.f);  /* unread look-ahead char */
   l_unlockfile(rn.f);
   rn.buff[rn.n] = '\0';  /* finish string */
-  if (lua_strtonum(L, rn.buff))  /* is this a valid number? */
+  if (lua_stringtonum(L, rn.buff))  /* is this a valid number? */
     return 1;  /* ok */
   else {  /* invalid format */
    lua_pushnil(L);  /* "result" to be removed */

+ 2 - 2
lua.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.316 2014/10/04 22:57:36 roberto Exp roberto $
+** $Id: lua.h,v 1.317 2014/10/07 18:29:13 roberto Exp roberto $
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -321,7 +321,7 @@ LUA_API int   (lua_next) (lua_State *L, int idx);
 LUA_API void  (lua_concat) (lua_State *L, int n);
 LUA_API void  (lua_len)    (lua_State *L, int idx);
 
-LUA_API size_t   (lua_strtonum) (lua_State *L, const char *s);
+LUA_API size_t   (lua_stringtonum) (lua_State *L, const char *s);
 
 LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
 LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);