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

Reorder statement cases to align with spec text.

Browse Source
This commit is contained in:
Tor Andersson
2014-01-10 11:23:45 +01:00
parent 4eb3349511
commit 228cbca9be
1 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js-parse.c
+67 -67
View File
@@ -557,67 +557,17 @@ static js_Ast *statement(js_State *J)
return block(J);
}
if (accept(J, TK_VAR)) {
a = vardeclist(J, 0);
semicolon(J);
return STM1(VAR, a);
}
/* empty statement */
if (accept(J, ';')) {
return STM0(NOP);
}
if (accept(J, TK_CONTINUE)) {
a = identifieropt(J);
semicolon(J);
return STM1(CONTINUE, a);
}
if (accept(J, TK_BREAK)) {
a = identifieropt(J);
semicolon(J);
return STM1(BREAK, a);
}
if (accept(J, TK_RETURN)) {
if (J->lookahead != ';' && J->lookahead != '}' && J->lookahead != 0)
a = expression(J, 0);
else
a = NULL;
semicolon(J);
return STM1(RETURN, a);
}
if (accept(J, TK_WITH)) {
expect(J, '(');
a = expression(J, 0);
expect(J, ')');
b = statement(J);
return STM2(WITH, a, b);
}
if (accept(J, TK_THROW)) {
a = expression(J, 0);
semicolon(J);
return STM1(THROW, a);
}
if (accept(J, TK_TRY)) {
a = block(J);
b = c = d = NULL;
if (accept(J, TK_CATCH)) {
expect(J, '(');
b = identifier(J);
expect(J, ')');
c = block(J);
}
if (accept(J, TK_FINALLY)) {
d = block(J);
}
if (!b && !d)
jsP_error(J, "unexpected token in try: %s (expected 'catch' or 'finally')", TOKSTR);
return STM4(TRY, a, b, c, d);
}
if (accept(J, TK_DEBUGGER)) {
semicolon(J);
return STM0(DEBUGGER);
}
if (accept(J, TK_IF)) {
expect(J, '(');
a = expression(J, 0);
@@ -648,16 +598,39 @@ static js_Ast *statement(js_State *J)
return STM2(WHILE, a, b);
}
if (accept(J, TK_VAR)) {
a = vardeclist(J, 0);
semicolon(J);
return STM1(VAR, a);
}
if (accept(J, TK_FOR)) {
return forstatement(J);
}
if (accept(J, TK_CONTINUE)) {
a = identifieropt(J);
semicolon(J);
return STM1(CONTINUE, a);
}
if (accept(J, TK_BREAK)) {
a = identifieropt(J);
semicolon(J);
return STM1(BREAK, a);
}
if (accept(J, TK_RETURN)) {
if (J->lookahead != ';' && J->lookahead != '}' && J->lookahead != 0)
a = expression(J, 0);
else
a = NULL;
semicolon(J);
return STM1(RETURN, a);
}
if (accept(J, TK_WITH)) {
expect(J, '(');
a = expression(J, 0);
expect(J, ')');
b = statement(J);
return STM2(WITH, a, b);
}
if (accept(J, TK_SWITCH)) {
expect(J, '(');
a = expression(J, 0);
@@ -668,8 +641,35 @@ static js_Ast *statement(js_State *J)
return STM2(SWITCH, a, b);
}
/* LabelledStatement : Identifier ':' Statement */
/* ExpressionStatement : Expression ';' */
if (accept(J, TK_THROW)) {
a = expression(J, 0);
semicolon(J);
return STM1(THROW, a);
}
if (accept(J, TK_TRY)) {
a = block(J);
b = c = d = NULL;
if (accept(J, TK_CATCH)) {
expect(J, '(');
b = identifier(J);
expect(J, ')');
c = block(J);
}
if (accept(J, TK_FINALLY)) {
d = block(J);
}
if (!b && !d)
jsP_error(J, "unexpected token in try: %s (expected 'catch' or 'finally')", TOKSTR);
return STM4(TRY, a, b, c, d);
}
if (accept(J, TK_DEBUGGER)) {
semicolon(J);
return STM0(DEBUGGER);
}
/* labelled statement or expression statement */
if (J->lookahead == TK_IDENTIFIER) {
a = expression(J, 0);
if (a->type == AST_IDENTIFIER && accept(J, ':')) {
@@ -680,8 +680,8 @@ static js_Ast *statement(js_State *J)
return a;
}
/* ExpressionStatement : [lookahead not 'function' or '{'] Expression ';' */
if (J->lookahead != TK_FUNCTION && J->lookahead != '{') {
/* expression statement */
if (J->lookahead != TK_FUNCTION) {
a = expression(J, 0);
semicolon(J);
return a;