GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-14 05:43:00 +08:00
Code Issues Projects Releases Wiki Activity

"exp" changed to "exp0" to avoid problems with math.h.

Browse Source
This commit is contained in:
Roberto Ierusalimschy 1998-07-06 19:07:51 -03:00
parent 1788501eed
commit dcb1a08906
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lparser.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lparser.c,v 1.1 1998/05/27 13:08:34 roberto Exp roberto $ ** $Id: lparser.c,v 1.2 1998/06/24 14:48:15 roberto Exp roberto $
** LL(1) Parser and code generator for Lua ** LL(1) Parser and code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -112,7 +112,7 @@ static void body (LexState *ls, int needself, int line);
static void chunk (LexState *ls); static void chunk (LexState *ls);
static void constructor (LexState *ls); static void constructor (LexState *ls);
static void decinit (LexState *ls, listdesc *d); static void decinit (LexState *ls, listdesc *d);
static void exp (LexState *ls, vardesc *v); static void exp0 (LexState *ls, vardesc *v);
static void exp1 (LexState *ls); static void exp1 (LexState *ls);
static void exp2 (LexState *ls, vardesc *v); static void exp2 (LexState *ls, vardesc *v);
static void explist (LexState *ls, listdesc *e); static void explist (LexState *ls, listdesc *e);
@ -889,14 +889,14 @@ typedef struct {
static void exp1 (LexState *ls) { static void exp1 (LexState *ls) {
vardesc v; vardesc v;
exp(ls, &v); exp0(ls, &v);
lua_pushvar(ls, &v); lua_pushvar(ls, &v);
if (is_in(ls->token, expfollow) < 0) if (is_in(ls->token, expfollow) < 0)
luaX_error(ls, "ill formed expression"); luaX_error(ls, "ill formed expression");
} }
static void exp (LexState *ls, vardesc *v) { static void exp0 (LexState *ls, vardesc *v) {
exp2(ls, v); exp2(ls, v);
while (ls->token == AND || ls->token == OR) { while (ls->token == AND || ls->token == OR) {
int is_and = (ls->token == AND); int is_and = (ls->token == AND);
@ -960,9 +960,9 @@ static void exp2 (LexState *ls, vardesc *v) {
static void simpleexp (LexState *ls, vardesc *v) { static void simpleexp (LexState *ls, vardesc *v) {
check_debugline(ls); check_debugline(ls);
switch (ls->token) { switch (ls->token) {
case '(': /* simpleexp -> '(' exp ')' */ case '(': /* simpleexp -> '(' exp0 ')' */
next(ls); next(ls);
exp(ls, v); exp0(ls, v);
check(ls, ')'); check(ls, ')');
break; break;
@ -1104,13 +1104,13 @@ static void explist (LexState *ls, listdesc *d) {
static void explist1 (LexState *ls, listdesc *d) { static void explist1 (LexState *ls, listdesc *d) {
vardesc v; vardesc v;
exp(ls, &v); exp0(ls, &v);
d->n = 1; d->n = 1;
while (ls->token == ',') { while (ls->token == ',') {
d->n++; d->n++;
lua_pushvar(ls, &v); lua_pushvar(ls, &v);
next(ls); next(ls);
exp(ls, &v); exp0(ls, &v);
} }
if (v.k == VEXP) if (v.k == VEXP)
d->pc = v.info; d->pc = v.info;
@ -1241,7 +1241,7 @@ static void part (LexState *ls, constdesc *cd) {
case NAME: { case NAME: {
vardesc v; vardesc v;
exp(ls, &v); exp0(ls, &v);
if (ls->token == '=') { if (ls->token == '=') {
switch (v.k) { switch (v.k) {
case VGLOBAL: case VGLOBAL: