aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2002-09-03 08:57:38 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2002-09-03 08:57:38 -0300
commitb2bc3b44b6bdf5efd783a50c28e108ac3bcba9fd (patch)
tree978fe5aac4410c564d28fc0eaa0625c24a73fee0
parent7c0ccdfd61f1611ff0f5f6899a7679916686fc65 (diff)
downloadlua-b2bc3b44b6bdf5efd783a50c28e108ac3bcba9fd.tar.gz
lua-b2bc3b44b6bdf5efd783a50c28e108ac3bcba9fd.tar.bz2
lua-b2bc3b44b6bdf5efd783a50c28e108ac3bcba9fd.zip
no more reserved word "global"
-rw-r--r--llex.c4
-rw-r--r--llex.h4
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 @@
1/* 1/*
2** $Id: llex.c,v 1.108 2002/07/10 20:43:53 roberto Exp roberto $ 2** $Id: llex.c,v 1.109 2002/08/16 14:45:55 roberto Exp roberto $
3** Lexical Analyzer 3** Lexical Analyzer
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -27,7 +27,7 @@
27/* ORDER RESERVED */ 27/* ORDER RESERVED */
28static const char *const token2string [] = { 28static const char *const token2string [] = {
29 "and", "break", "do", "else", "elseif", 29 "and", "break", "do", "else", "elseif",
30 "end", "false", "for", "function", "global", "if", 30 "end", "false", "for", "function", "if",
31 "in", "local", "nil", "not", "or", "repeat", 31 "in", "local", "nil", "not", "or", "repeat",
32 "return", "then", "true", "until", "while", "*name", 32 "return", "then", "true", "until", "while", "*name",
33 "..", "...", "==", ">=", "<=", "~=", 33 "..", "...", "==", ">=", "<=", "~=",
diff --git a/llex.h b/llex.h
index ed53e2a3..514d5bbc 100644
--- a/llex.h
+++ b/llex.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: llex.h,v 1.42 2002/02/08 22:42:41 roberto Exp roberto $ 2** $Id: llex.h,v 1.43 2002/05/07 17:36:56 roberto Exp roberto $
3** Lexical Analyzer 3** Lexical Analyzer
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -25,7 +25,7 @@ enum RESERVED {
25 /* terminal symbols denoted by reserved words */ 25 /* terminal symbols denoted by reserved words */
26 TK_AND = FIRST_RESERVED, TK_BREAK, 26 TK_AND = FIRST_RESERVED, TK_BREAK,
27 TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION, 27 TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
28 TK_GLOBAL, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, 28 TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
29 TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE, 29 TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
30 /* other terminal symbols */ 30 /* other terminal symbols */
31 TK_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER, 31 TK_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,