From b2bc3b44b6bdf5efd783a50c28e108ac3bcba9fd Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Tue, 3 Sep 2002 08:57:38 -0300 Subject: [PATCH] no more reserved word "global" --- llex.c | 4 ++-- llex.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llex.c b/llex.c index 339b92a1..0dc47fd2 100644 --- a/llex.c +++ b/llex.c @@ -1,5 +1,5 @@ /* -** $Id: llex.c,v 1.108 2002/07/10 20:43:53 roberto Exp roberto $ +** $Id: llex.c,v 1.109 2002/08/16 14:45:55 roberto Exp roberto $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ @@ -27,7 +27,7 @@ /* ORDER RESERVED */ static const char *const token2string [] = { "and", "break", "do", "else", "elseif", - "end", "false", "for", "function", "global", "if", + "end", "false", "for", "function", "if", "in", "local", "nil", "not", "or", "repeat", "return", "then", "true", "until", "while", "*name", "..", "...", "==", ">=", "<=", "~=", diff --git a/llex.h b/llex.h index ed53e2a3..514d5bbc 100644 --- a/llex.h +++ b/llex.h @@ -1,5 +1,5 @@ /* -** $Id: llex.h,v 1.42 2002/02/08 22:42:41 roberto Exp roberto $ +** $Id: llex.h,v 1.43 2002/05/07 17:36:56 roberto Exp roberto $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ @@ -25,7 +25,7 @@ enum RESERVED { /* terminal symbols denoted by reserved words */ TK_AND = FIRST_RESERVED, TK_BREAK, TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION, - TK_GLOBAL, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, + TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE, /* other terminal symbols */ TK_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,