commit 5388aa9fc0185b5d7a852e679484e26ba53e5d4d
parent b123a88673fcf37ebfcc8ea866a3d27da6cdf82e
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Wed, 30 Apr 2014 13:48:19 -0300
'luaO_str2d' + 'luaO_str2int' replaced by 'luaO_str2num' (which converts
to float or integer according to the string syntax)
Diffstat:
| M | lapi.c | | | 17 | ++++++----------- |
| M | llex.c | | | 52 | +++++++++++++++++++++++++--------------------------- |
| M | lobject.c | | | 20 | +++++++++++++++++--- |
| M | lobject.h | | | 5 | ++--- |
4 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/lapi.c b/lapi.c
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.205 2014/04/15 16:32:49 roberto Exp roberto $
+** $Id: lapi.c,v 2.206 2014/04/29 18:14:16 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -334,17 +334,12 @@ LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
LUA_API int lua_strtonum (lua_State *L, const char *s, size_t len) {
- lua_Integer i; lua_Number n;
- if (luaO_str2int(s, len, &i)) { /* try as an integer */
- setivalue(L->top, i);
- }
- else if (luaO_str2d(s, len, &n)) { /* else try as a float */
- setfltvalue(L->top, n);
- }
- else
+ if (!luaO_str2num(s, len, L->top))
return 0; /* conversion failed */
- api_incr_top(L);
- return 1;
+ else {
+ api_incr_top(L);
+ return 1;
+ }
}
diff --git a/llex.c b/llex.c
@@ -1,5 +1,5 @@
/*
-** $Id: llex.c,v 2.73 2014/02/06 15:59:24 roberto Exp roberto $
+** $Id: llex.c,v 2.74 2014/02/14 15:23:51 roberto Exp roberto $
** Lexical Analyzer
** See Copyright Notice in lua.h
*/
@@ -196,10 +196,12 @@ static int check_next (LexState *ls, const char *set) {
** change all characters 'from' in buffer to 'to'
*/
static void buffreplace (LexState *ls, char from, char to) {
- size_t n = luaZ_bufflen(ls->buff);
- char *p = luaZ_buffer(ls->buff);
- while (n--)
- if (p[n] == from) p[n] = to;
+ if (from != to) {
+ size_t n = luaZ_bufflen(ls->buff);
+ char *p = luaZ_buffer(ls->buff);
+ while (n--)
+ if (p[n] == from) p[n] = to;
+ }
}
@@ -208,17 +210,17 @@ static void buffreplace (LexState *ls, char from, char to) {
#endif
-#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
+#define buff2num(b,o) luaO_str2num(luaZ_buffer(b), luaZ_bufflen(b) - 1, o)
/*
** in case of format error, try to change decimal point separator to
** the one defined in the current locale and check again
*/
-static void trydecpoint (LexState *ls, SemInfo *seminfo) {
+static void trydecpoint (LexState *ls, TValue *o) {
char old = ls->decpoint;
ls->decpoint = getlocaledecpoint();
buffreplace(ls, old, ls->decpoint); /* try new decimal separator */
- if (!buff2d(ls->buff, &seminfo->r)) {
+ if (!buff2num(ls->buff, o)) {
/* format error with correct decimal point: no more options */
buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */
lexerror(ls, "malformed number", TK_FLT);
@@ -228,11 +230,11 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
/* LUA_NUMBER */
/*
-** this function is quite liberal in what it accepts, as 'luaO_str2d'
-** will reject ill-formed numerals. 'isf' means the numeral is not
-** an integer (it has a dot or an exponent).
+** this function is quite liberal in what it accepts, as 'luaO_str2num'
+** will reject ill-formed numerals.
*/
-static int read_numeral (LexState *ls, SemInfo *seminfo, int isf) {
+static int read_numeral (LexState *ls, SemInfo *seminfo) {
+ TValue obj;
const char *expo = "Ee";
int first = ls->current;
lua_assert(lisdigit(ls->current));
@@ -240,29 +242,25 @@ static int read_numeral (LexState *ls, SemInfo *seminfo, int isf) {
if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */
expo = "Pp";
for (;;) {
- if (check_next(ls, expo)) { /* exponent part? */
+ if (check_next(ls, expo)) /* exponent part? */
check_next(ls, "+-"); /* optional exponent sign */
- isf = 1;
- }
if (lisxdigit(ls->current))
save_and_next(ls);
- else if (ls->current == '.') {
+ else if (ls->current == '.')
save_and_next(ls);
- isf = 1;
- }
else break;
}
save(ls, '\0');
- if (!isf) {
- if (!luaO_str2int(luaZ_buffer(ls->buff), luaZ_bufflen(ls->buff) - 1,
- &seminfo->i))
- lexerror(ls, "malformed number", TK_INT);
+ buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
+ if (!buff2num(ls->buff, &obj)) /* format error? */
+ trydecpoint(ls, &obj); /* try to update decimal point separator */
+ if (ttisinteger(&obj)) {
+ seminfo->i = ivalue(&obj);
return TK_INT;
}
else {
- buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
- if (!buff2d(ls->buff, &seminfo->r)) /* format error? */
- trydecpoint(ls, seminfo); /* try to update decimal point separator */
+ lua_assert(ttisfloat(&obj));
+ seminfo->r = fltvalue(&obj);
return TK_FLT;
}
}
@@ -530,11 +528,11 @@ static int llex (LexState *ls, SemInfo *seminfo) {
else return TK_CONCAT; /* '..' */
}
else if (!lisdigit(ls->current)) return '.';
- else return read_numeral(ls, seminfo, 1);
+ else return read_numeral(ls, seminfo);
}
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': {
- return read_numeral(ls, seminfo, 0);
+ return read_numeral(ls, seminfo);
}
case EOZ: {
return TK_EOS;
diff --git a/lobject.c b/lobject.c
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.c,v 2.81 2014/04/27 14:41:11 roberto Exp roberto $
+** $Id: lobject.c,v 2.82 2014/04/29 18:14:16 roberto Exp roberto $
** Some generic functions over Lua objects
** See Copyright Notice in lua.h
*/
@@ -254,7 +254,7 @@ static lua_Number lua_strx2number (const char *s, char **endptr) {
/* }====================================================== */
-int luaO_str2d (const char *s, size_t len, lua_Number *result) {
+static int l_str2d (const char *s, size_t len, lua_Number *result) {
char *endptr;
if (strpbrk(s, "nN")) /* reject 'inf' and 'nan' */
return 0;
@@ -268,7 +268,7 @@ int luaO_str2d (const char *s, size_t len, lua_Number *result) {
}
-int luaO_str2int (const char *s, size_t len, lua_Integer *result) {
+static int l_str2int (const char *s, size_t len, lua_Integer *result) {
const char *ends = s + len;
lua_Unsigned a = 0;
int empty = 1;
@@ -298,6 +298,20 @@ int luaO_str2int (const char *s, size_t len, lua_Integer *result) {
}
+int luaO_str2num (const char *s, size_t len, TValue *o) {
+ lua_Integer i; lua_Number n;
+ if (l_str2int(s, len, &i)) { /* try as an integer */
+ setivalue(o, i);
+ }
+ else if (l_str2d(s, len, &n)) { /* else try as a float */
+ setfltvalue(o, n);
+ }
+ else
+ return 0; /* conversion failed */
+ return 1; /* success */
+}
+
+
int luaO_utf8esc (char *buff, unsigned int x) {
int n = 1; /* number of bytes put in buffer (backwards) */
if (x < 0x80) /* ascii? */
diff --git a/lobject.h b/lobject.h
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.h,v 2.86 2014/02/19 13:52:42 roberto Exp roberto $
+** $Id: lobject.h,v 2.87 2014/04/29 18:14:16 roberto Exp roberto $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
@@ -500,8 +500,7 @@ LUAI_FUNC int luaO_utf8esc (char *buff, unsigned int x);
LUAI_FUNC int luaO_ceillog2 (unsigned int x);
LUAI_FUNC void luaO_arith (lua_State *L, int op, const TValue *p1,
const TValue *p2, TValue *res);
-LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result);
-LUAI_FUNC int luaO_str2int (const char *s, size_t len, lua_Integer *result);
+LUAI_FUNC int luaO_str2num (const char *s, size_t len, TValue *o);
LUAI_FUNC int luaO_hexavalue (int c);
LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
va_list argp);
