nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better way to handle redefinitions of 'localeconv'

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2007-09-14 10:27:04 -03:00
parent 9cb0607f6f
commit 2622ed2528
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
llex.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.25 2007/05/11 17:28:56 roberto Exp roberto $ ** $Id: llex.c,v 2.26 2007/08/09 20:29:15 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -181,11 +181,14 @@ static void buffreplace (LexState *ls, char from, char to) {
} }
#if !defined(getlocaledecpoint)
#define getlocaledecpoint() (localeconv()->decimal_point[0])
#endif
static void trydecpoint (LexState *ls, SemInfo *seminfo) { static void trydecpoint (LexState *ls, SemInfo *seminfo) {
/* format error: try to update decimal point separator */ /* format error: try to update decimal point separator */
struct lconv *cv = localeconv();
char old = ls->decpoint; char old = ls->decpoint;
ls->decpoint = (cv ? cv->decimal_point[0] : '.'); ls->decpoint = getlocaledecpoint();
buffreplace(ls, old, ls->decpoint); /* try updated decimal separator */ buffreplace(ls, old, ls->decpoint); /* try updated decimal separator */
if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) { if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
/* format error with correct decimal point: no more options */ /* format error with correct decimal point: no more options */