Mirrors_Framework/mujs
1
0
Fork 0
mirror of https://github.com/ccxvii/mujs.git synced 2026-09-20 22:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add token string lookup table for better error messages.

Browse Source
This commit is contained in:
Tor Andersson
2014-01-09 17:24:21 +01:00
parent c3a035d6f9
commit 2cfaefee4b
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js-parse.c
+48 -5
View File
@@ -27,6 +27,49 @@ static js_Ast *assignment(js_State *J, int notin);
static js_Ast *memberexp(js_State *J);
static js_Ast *block(js_State *J);
static const char *tokenstring[] = {
"(end-of-file)",
"'\\x01'", "'\\x02'", "'\\x03'", "'\\x04'", "'\\x05'", "'\\x06'", "'\\x07'",
"'\\x08'", "'\\x09'", "'\\x0A'", "'\\x0B'", "'\\x0C'", "'\\x0D'", "'\\x0E'", "'\\x0F'",
"'\\x10'", "'\\x11'", "'\\x12'", "'\\x13'", "'\\x14'", "'\\x15'", "'\\x16'", "'\\x17'",
"'\\x18'", "'\\x19'", "'\\x1A'", "'\\x1B'", "'\\x1C'", "'\\x1D'", "'\\x1E'", "'\\x1F'",
"' '", "'!'", "'\"'", "'#'", "'$'", "'%'", "'&'", "'\\''",
"'('", "')'", "'*'", "'+'", "','", "'-'", "'.'", "'/'",
"'0'", "'1'", "'2'", "'3'", "'4'", "'5'", "'6'", "'7'",
"'8'", "'9'", "':'", "';'", "'<'", "'='", "'>'", "'?'",
"'@'", "'A'", "'B'", "'C'", "'D'", "'E'", "'F'", "'G'",
"'H'", "'I'", "'J'", "'K'", "'L'", "'M'", "'N'", "'O'",
"'P'", "'Q'", "'R'", "'S'", "'T'", "'U'", "'V'", "'W'",
"'X'", "'Y'", "'Z'", "'['", "'\'", "']'", "'^'", "'_'",
"'`'", "'a'", "'b'", "'c'", "'d'", "'e'", "'f'", "'g'",
"'h'", "'i'", "'j'", "'k'", "'l'", "'m'", "'n'", "'o'",
"'p'", "'q'", "'r'", "'s'", "'t'", "'u'", "'v'", "'w'",
"'x'", "'y'", "'z'", "'{'", "'|'", "'}'", "'~'", "'\\x7F'",
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
"(identifier)", "(number)", "(string)", "(regexp)",
"'<='", "'>='", "'=='", "'!='", "'==='", "'!=='",
"'<<'", "'>>'", "'>>>'", "'&&'", "'||'",
"'+='", "'-='", "'*='", "'/='", "'%='",
"'<<='", "'>>='", "'>>>='", "'&='", "'|='", "'^='",
"'++'", "'--'",
"'break'", "'case'", "'catch'", "'continue'", "'debugger'",
"'default'", "'delete'", "'do'", "'else'", "'false'", "'finally'", "'for'",
"'function'", "'if'", "'in'", "'instanceof'", "'new'", "'null'", "'return'",
"'switch'", "'this'", "'throw'", "'true'", "'try'", "'typeof'", "'var'",
"'void'", "'while'", "'with'",
};
static void next(js_State *J)
{
J->lookahead = jsP_lex(J);
@@ -45,7 +88,7 @@ static void expect(js_State *J, int t)
{
if (accept(J, t))
return;
jsP_error(J, "unexpected token %d (expected %d)", J->lookahead, t);
jsP_error(J, "unexpected token: %s (expected %s)", tokenstring[J->lookahead], tokenstring[t]);
}
static void semicolon(js_State *J)
@@ -56,7 +99,7 @@ static void semicolon(js_State *J)
}
if (J->newline || J->lookahead == '}' || J->lookahead == 0)
return;
jsP_error(J, "unexpected token %d (expected semicolon)", J->lookahead);
jsP_error(J, "unexpected token: %s (expected ';')", tokenstring[J->lookahead]);
}
static js_Ast *identifier(js_State *J)
@@ -66,7 +109,7 @@ static js_Ast *identifier(js_State *J)
next(J);
return a;
}
jsP_error(J, "unexpected token %d (expected identifier)", J->lookahead);
jsP_error(J, "unexpected token: %s (expected identifier)", tokenstring[J->lookahead]);
return NULL;
}
@@ -77,7 +120,7 @@ static js_Ast *identifiername(js_State *J)
next(J);
return a;
}
jsP_error(J, "unexpected token %d (expected identifier or keyword)", J->lookahead);
jsP_error(J, "unexpected token: %s (expected identifier or keyword)", tokenstring[J->lookahead]);
return NULL;
}
@@ -207,7 +250,7 @@ static js_Ast *primary(js_State *J)
if (accept(J, '{')) { a = EXP1(OBJECT, objectliteral(J)); expect(J, '}'); return a; }
if (accept(J, '[')) { a = EXP1(ARRAY, arrayliteral(J)); expect(J, ']'); return a; }
if (accept(J, '(')) { a = expression(J, 0); expect(J, ')'); return a; }
jsP_error(J, "unexpected token in primary expression: %d", J->lookahead);
jsP_error(J, "unexpected token in expression: %s", tokenstring[J->lookahead]);
return NULL;
}
js-parse.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define js_parse_h
enum {
TK_IDENTIFIER = 257,
TK_IDENTIFIER = 256,
TK_NUMBER,
TK_STRING,
TK_REGEXP,