rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more robust way to test for decimal point separator

This commit is contained in:
Roberto Ierusalimschy 2005-12-08 13:50:54 -02:00
parent 87024e257d
commit ea6b1b42c7
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.14 2005/12/07 15:32:52 roberto Exp roberto $ ** $Id: llex.c,v 2.15 2005/12/07 15:43:05 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -135,8 +135,7 @@ static void inclinenumber (LexState *ls) {
void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) { void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
struct lconv *cv = localeconv(); ls->decpoint = '.';
ls->decpoint = (cv ? cv->decimal_point[0] : '.');
ls->L = L; ls->L = L;
ls->lookahead.token = TK_EOS; /* no look-ahead token */ ls->lookahead.token = TK_EOS; /* no look-ahead token */
ls->z = z; ls->z = z;
@ -166,7 +165,7 @@ static int check_next (LexState *ls, const char *set) {
} }
static void correctbuff (LexState *ls, char from, char to) { static void buffreplace (LexState *ls, char from, char to) {
int n = luaZ_bufflen(ls->buff); int n = luaZ_bufflen(ls->buff);
char *p = luaZ_buffer(ls->buff); char *p = luaZ_buffer(ls->buff);
while (n--) while (n--)
@ -174,6 +173,20 @@ static void correctbuff (LexState *ls, char from, char to) {
} }
static void trydecpoint (LexState *ls, SemInfo *seminfo) {
/* format error: try to update decimal point separator */
struct lconv *cv = localeconv();
char old = ls->decpoint;
ls->decpoint = (cv ? cv->decimal_point[0] : '.');
buffreplace(ls, old, ls->decpoint); /* try updated decimal separator */
if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
/* format error with correct decimal point: no more options */
buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */
luaX_lexerror(ls, "malformed number", TK_NUMBER);
}
}
/* LUA_NUMBER */ /* LUA_NUMBER */
static void read_numeral (LexState *ls, SemInfo *seminfo) { static void read_numeral (LexState *ls, SemInfo *seminfo) {
lua_assert(isdigit(ls->current)); lua_assert(isdigit(ls->current));
@ -187,11 +200,9 @@ static void read_numeral (LexState *ls, SemInfo *seminfo) {
} }
} }
save(ls, '\0'); save(ls, '\0');
correctbuff(ls, '.', ls->decpoint); /* follow locale for decimal point */ buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */
if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) { if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) /* format error? */
correctbuff(ls, ls->decpoint, '.'); /* undo change */ trydecpoint(ls, seminfo); /* try to update decimal point separator */
luaX_lexerror(ls, "malformed number", TK_NUMBER);
}
} }