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

parser must work with C locale, but external locale must be preserved

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2011-06-18 14:08:58 -03:00
parent fdede85419
commit cb4950a6d8
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ldo.c
View File

@@ -1,10 +1,11 @@
/* /*
** $Id: ldo.c,v 2.94 2011/05/30 16:36:38 roberto Exp roberto $ ** $Id: ldo.c,v 2.95 2011/06/02 19:31:40 roberto Exp roberto $
** Stack and Call structure of Lua ** Stack and Call structure of Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
#include <locale.h>
#include <setjmp.h> #include <setjmp.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -612,8 +613,22 @@ struct SParser { /* data to `f_parser' */
Mbuffer buff; /* dynamic structure used by the scanner */ Mbuffer buff; /* dynamic structure used by the scanner */
Dyndata dyd; /* dynamic structures used by the parser */ Dyndata dyd; /* dynamic structures used by the parser */
const char *name; const char *name;
TString *savedlocale;
}; };
/*
** save current locale and set locale to "C" for calling the parser
*/
static Proto *callparser (lua_State *L, struct SParser *p, int c) {
const char *oldloc = setlocale(LC_ALL, NULL); /* get current locale */
p->savedlocale = luaS_new(L, oldloc); /* make a copy */
setsvalue2s(L, L->top - 1, p->savedlocale); /* anchor it */
setlocale(LC_ALL, "C"); /* standard locale for parsing Lua files */
return luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
}
static void f_parser (lua_State *L, void *ud) { static void f_parser (lua_State *L, void *ud) {
int i; int i;
Proto *tf; Proto *tf;
@@ -621,8 +636,7 @@ static void f_parser (lua_State *L, void *ud) {
struct SParser *p = cast(struct SParser *, ud); struct SParser *p = cast(struct SParser *, ud);
int c = zgetc(p->z); /* read first character */ int c = zgetc(p->z); /* read first character */
tf = (c == LUA_SIGNATURE[0]) tf = (c == LUA_SIGNATURE[0])
? luaU_undump(L, p->z, &p->buff, p->name) ? luaU_undump(L, p->z, &p->buff, p->name) : callparser(L, p, c);
: luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
setptvalue2s(L, L->top, tf); setptvalue2s(L, L->top, tf);
incr_top(L); incr_top(L);
cl = luaF_newLclosure(L, tf); cl = luaF_newLclosure(L, tf);
@@ -635,8 +649,9 @@ static void f_parser (lua_State *L, void *ud) {
int luaD_protectedparser (lua_State *L, ZIO *z, const char *name) { int luaD_protectedparser (lua_State *L, ZIO *z, const char *name) {
struct SParser p; struct SParser p;
int status; int status;
setnilvalue(L->top++); /* reserve space for anchoring locale */
L->nny++; /* cannot yield during parsing */ L->nny++; /* cannot yield during parsing */
p.z = z; p.name = name; p.z = z; p.name = name; p.savedlocale = NULL;
p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0; p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
p.dyd.gt.arr = NULL; p.dyd.gt.size = 0; p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
p.dyd.label.arr = NULL; p.dyd.label.size = 0; p.dyd.label.arr = NULL; p.dyd.label.size = 0;
@@ -647,6 +662,10 @@ int luaD_protectedparser (lua_State *L, ZIO *z, const char *name) {
luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size); luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size); luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
L->nny--; L->nny--;
if (p.savedlocale) /* locale was changed? */
setlocale(LC_ALL, getstr(p.savedlocale)); /* restore old locale */
setobjs2s(L, L->top - 2, L->top - 1); /* remove reserved space */
--L->top;
return status; return status;
} }