diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2004-12-03 18:44:19 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2004-12-03 18:44:19 -0200 |
| commit | 8b239eeba13877955b976ccd119ada038b67fa59 (patch) | |
| tree | 24a7f88eb90c57a3ca6b2566e0854dbde0a0e9f9 | |
| parent | a5330b77f33725ce63d90f6ae664b651bb362042 (diff) | |
| download | lua-8b239eeba13877955b976ccd119ada038b67fa59.tar.gz lua-8b239eeba13877955b976ccd119ada038b67fa59.tar.bz2 lua-8b239eeba13877955b976ccd119ada038b67fa59.zip | |
details
| -rw-r--r-- | llex.c | 6 | ||||
| -rw-r--r-- | lparser.c | 4 |
2 files changed, 5 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: llex.c,v 2.6 2004/12/01 15:46:18 roberto Exp roberto $ | 2 | ** $Id: llex.c,v 2.7 2004/12/02 12:59:10 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 | */ |
| @@ -36,9 +36,9 @@ const char *const luaX_tokens [] = { | |||
| 36 | "and", "break", "do", "else", "elseif", | 36 | "and", "break", "do", "else", "elseif", |
| 37 | "end", "false", "for", "function", "if", | 37 | "end", "false", "for", "function", "if", |
| 38 | "in", "local", "nil", "not", "or", "repeat", | 38 | "in", "local", "nil", "not", "or", "repeat", |
| 39 | "return", "then", "true", "until", "while", "*name", | 39 | "return", "then", "true", "until", "while", "<name>", |
| 40 | "..", "...", "==", ">=", "<=", "~=", | 40 | "..", "...", "==", ">=", "<=", "~=", |
| 41 | "*number", "*string", "<eof>", | 41 | "<number>", "<string>", "<eof>", |
| 42 | NULL | 42 | NULL |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lparser.c,v 2.7 2004/11/19 16:59:08 roberto Exp roberto $ | 2 | ** $Id: lparser.c,v 2.8 2004/12/03 20:35:33 roberto Exp roberto $ |
| 3 | ** Lua Parser | 3 | ** Lua Parser |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -133,7 +133,7 @@ static void check_match (LexState *ls, int what, int who, int where) { | |||
| 133 | 133 | ||
| 134 | static TString *str_checkname (LexState *ls) { | 134 | static TString *str_checkname (LexState *ls) { |
| 135 | TString *ts; | 135 | TString *ts; |
| 136 | check_condition(ls, (ls->t.token == TK_NAME), "<name> expected"); | 136 | if (ls->t.token != TK_NAME) error_expected(ls, TK_NAME); |
| 137 | ts = ls->t.seminfo.ts; | 137 | ts = ls->t.seminfo.ts; |
| 138 | next(ls); | 138 | next(ls); |
| 139 | return ts; | 139 | return ts; |