mirrors/quickjs
1
0
Fork 0
mirror of https://github.com/bellard/quickjs.git synced 2024-11-22 13:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplified and fixed arrow function parsing (github issue #226)

Browse Source
This commit is contained in:
Fabrice Bellard 2024-01-27 13:12:54 +01:00
parent 090685a8c2
commit cd666a851f
2 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
quickjs.c
View File

@ -22682,12 +22682,10 @@ static __exception int js_parse_object_literal(JSParseState *s)
#define PF_IN_ACCEPTED (1 << 0) #define PF_IN_ACCEPTED (1 << 0)
/* allow function calls parsing in js_parse_postfix_expr() */ /* allow function calls parsing in js_parse_postfix_expr() */
#define PF_POSTFIX_CALL (1 << 1) #define PF_POSTFIX_CALL (1 << 1)
/* allow arrow functions parsing in js_parse_postfix_expr() */
#define PF_ARROW_FUNC (1 << 2)
/* allow the exponentiation operator in js_parse_unary() */ /* allow the exponentiation operator in js_parse_unary() */
#define PF_POW_ALLOWED (1 << 3) #define PF_POW_ALLOWED (1 << 2)
/* forbid the exponentiation operator in js_parse_unary() */ /* forbid the exponentiation operator in js_parse_unary() */
#define PF_POW_FORBIDDEN (1 << 4) #define PF_POW_FORBIDDEN (1 << 3)
static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags); static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags);
@ -24299,7 +24297,7 @@ static void optional_chain_test(JSParseState *s, int *poptional_chaining_label,
emit_label(s, label_next); emit_label(s, label_next);
} }
/* allowed parse_flags: PF_POSTFIX_CALL, PF_ARROW_FUNC */ /* allowed parse_flags: PF_POSTFIX_CALL */
static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags) static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
{ {
FuncCallType call_type; FuncCallType call_type;
@ -24402,16 +24400,8 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
} }
break; break;
case '(': case '(':
if ((parse_flags & PF_ARROW_FUNC) && if (js_parse_expr_paren(s))
js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) { return -1;
if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_NORMAL, JS_ATOM_NULL,
s->token.ptr, s->token.line_num))
return -1;
} else {
if (js_parse_expr_paren(s))
return -1;
}
break; break;
case TOK_FUNCTION: case TOK_FUNCTION:
if (js_parse_function_decl(s, JS_PARSE_FUNC_EXPR, if (js_parse_function_decl(s, JS_PARSE_FUNC_EXPR,
@ -24451,14 +24441,8 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
if (s->token.u.ident.is_reserved) { if (s->token.u.ident.is_reserved) {
return js_parse_error_reserved_identifier(s); return js_parse_error_reserved_identifier(s);
} }
if ((parse_flags & PF_ARROW_FUNC) && if (token_is_pseudo_keyword(s, JS_ATOM_async) &&
peek_token(s, TRUE) == TOK_ARROW) { peek_token(s, TRUE) != '\n') {
if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_NORMAL, JS_ATOM_NULL,
s->token.ptr, s->token.line_num))
return -1;
} else if (token_is_pseudo_keyword(s, JS_ATOM_async) &&
peek_token(s, TRUE) != '\n') {
const uint8_t *source_ptr; const uint8_t *source_ptr;
int source_line_num; int source_line_num;
@ -24471,15 +24455,6 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
JS_FUNC_ASYNC, JS_ATOM_NULL, JS_FUNC_ASYNC, JS_ATOM_NULL,
source_ptr, source_line_num)) source_ptr, source_line_num))
return -1; return -1;
} else if ((parse_flags & PF_ARROW_FUNC) &&
((s->token.val == '(' &&
js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) ||
(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
peek_token(s, TRUE) == TOK_ARROW))) {
if (js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_ASYNC, JS_ATOM_NULL,
source_ptr, source_line_num))
return -1;
} else { } else {
name = JS_DupAtom(s->ctx, JS_ATOM_async); name = JS_DupAtom(s->ctx, JS_ATOM_async);
goto do_get_var; goto do_get_var;
@ -25083,7 +25058,7 @@ static __exception int js_parse_delete(JSParseState *s)
return 0; return 0;
} }
/* allowed parse_flags: PF_ARROW_FUNC, PF_POW_ALLOWED, PF_POW_FORBIDDEN */ /* allowed parse_flags: PF_POW_ALLOWED, PF_POW_FORBIDDEN */
static __exception int js_parse_unary(JSParseState *s, int parse_flags) static __exception int js_parse_unary(JSParseState *s, int parse_flags)
{ {
int op; int op;
@ -25174,8 +25149,7 @@ static __exception int js_parse_unary(JSParseState *s, int parse_flags)
parse_flags = 0; parse_flags = 0;
break; break;
default: default:
if (js_parse_postfix_expr(s, (parse_flags & PF_ARROW_FUNC) | if (js_parse_postfix_expr(s, PF_POSTFIX_CALL))
PF_POSTFIX_CALL))
return -1; return -1;
if (!s->got_lf && if (!s->got_lf &&
(s->token.val == TOK_DEC || s->token.val == TOK_INC)) { (s->token.val == TOK_DEC || s->token.val == TOK_INC)) {
@ -25232,15 +25206,14 @@ static __exception int js_parse_unary(JSParseState *s, int parse_flags)
return 0; return 0;
} }
/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */ /* allowed parse_flags: PF_IN_ACCEPTED */
static __exception int js_parse_expr_binary(JSParseState *s, int level, static __exception int js_parse_expr_binary(JSParseState *s, int level,
int parse_flags) int parse_flags)
{ {
int op, opcode; int op, opcode;
if (level == 0) { if (level == 0) {
return js_parse_unary(s, (parse_flags & PF_ARROW_FUNC) | return js_parse_unary(s, PF_POW_ALLOWED);
PF_POW_ALLOWED);
} else if (s->token.val == TOK_PRIVATE_NAME && } else if (s->token.val == TOK_PRIVATE_NAME &&
(parse_flags & PF_IN_ACCEPTED) && level == 4 && (parse_flags & PF_IN_ACCEPTED) && level == 4 &&
peek_token(s, FALSE) == TOK_IN) { peek_token(s, FALSE) == TOK_IN) {
@ -25253,7 +25226,7 @@ static __exception int js_parse_expr_binary(JSParseState *s, int level,
goto fail_private_in; goto fail_private_in;
if (next_token(s)) if (next_token(s))
goto fail_private_in; goto fail_private_in;
if (js_parse_expr_binary(s, level - 1, parse_flags & ~PF_ARROW_FUNC)) { if (js_parse_expr_binary(s, level - 1, parse_flags)) {
fail_private_in: fail_private_in:
JS_FreeAtom(s->ctx, atom); JS_FreeAtom(s->ctx, atom);
return -1; return -1;
@ -25395,14 +25368,14 @@ static __exception int js_parse_expr_binary(JSParseState *s, int level,
} }
if (next_token(s)) if (next_token(s))
return -1; return -1;
if (js_parse_expr_binary(s, level - 1, parse_flags & ~PF_ARROW_FUNC)) if (js_parse_expr_binary(s, level - 1, parse_flags))
return -1; return -1;
emit_op(s, opcode); emit_op(s, opcode);
} }
return 0; return 0;
} }
/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */ /* allowed parse_flags: PF_IN_ACCEPTED */
static __exception int js_parse_logical_and_or(JSParseState *s, int op, static __exception int js_parse_logical_and_or(JSParseState *s, int op,
int parse_flags) int parse_flags)
{ {
@ -25426,11 +25399,11 @@ static __exception int js_parse_logical_and_or(JSParseState *s, int op,
emit_op(s, OP_drop); emit_op(s, OP_drop);
if (op == TOK_LAND) { if (op == TOK_LAND) {
if (js_parse_expr_binary(s, 8, parse_flags & ~PF_ARROW_FUNC)) if (js_parse_expr_binary(s, 8, parse_flags))
return -1; return -1;
} else { } else {
if (js_parse_logical_and_or(s, TOK_LAND, if (js_parse_logical_and_or(s, TOK_LAND,
parse_flags & ~PF_ARROW_FUNC)) parse_flags))
return -1; return -1;
} }
if (s->token.val != op) { if (s->token.val != op) {
@ -25462,7 +25435,7 @@ static __exception int js_parse_coalesce_expr(JSParseState *s, int parse_flags)
emit_goto(s, OP_if_false, label1); emit_goto(s, OP_if_false, label1);
emit_op(s, OP_drop); emit_op(s, OP_drop);
if (js_parse_expr_binary(s, 8, parse_flags & ~PF_ARROW_FUNC)) if (js_parse_expr_binary(s, 8, parse_flags))
return -1; return -1;
if (s->token.val != TOK_DOUBLE_QUESTION_MARK) if (s->token.val != TOK_DOUBLE_QUESTION_MARK)
break; break;
@ -25472,7 +25445,7 @@ static __exception int js_parse_coalesce_expr(JSParseState *s, int parse_flags)
return 0; return 0;
} }
/* allowed parse_flags: PF_ARROW_FUNC, PF_IN_ACCEPTED */ /* allowed parse_flags: PF_IN_ACCEPTED */
static __exception int js_parse_cond_expr(JSParseState *s, int parse_flags) static __exception int js_parse_cond_expr(JSParseState *s, int parse_flags)
{ {
int label1, label2; int label1, label2;
@ -25647,12 +25620,50 @@ static __exception int js_parse_assign_expr2(JSParseState *s, int parse_flags)
emit_label(s, label_next); emit_label(s, label_next);
} }
return 0; return 0;
} else if (s->token.val == '(' &&
js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) {
return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_NORMAL, JS_ATOM_NULL,
s->token.ptr, s->token.line_num);
} else if (token_is_pseudo_keyword(s, JS_ATOM_async)) {
const uint8_t *source_ptr;
int source_line_num, tok;
JSParsePos pos;
/* fast test */
tok = peek_token(s, TRUE);
if (tok == TOK_FUNCTION || tok == '\n')
goto next;
source_ptr = s->token.ptr;
source_line_num = s->token.line_num;
js_parse_get_pos(s, &pos);
if (next_token(s))
return -1;
if ((s->token.val == '(' &&
js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) ||
(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
peek_token(s, TRUE) == TOK_ARROW)) {
return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_ASYNC, JS_ATOM_NULL,
source_ptr, source_line_num);
} else {
/* undo the token parsing */
if (js_parse_seek_token(s, &pos))
return -1;
}
} else if (s->token.val == TOK_IDENT &&
peek_token(s, TRUE) == TOK_ARROW) {
return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
JS_FUNC_NORMAL, JS_ATOM_NULL,
s->token.ptr, s->token.line_num);
} }
next:
if (s->token.val == TOK_IDENT) { if (s->token.val == TOK_IDENT) {
/* name0 is used to check for OP_set_name pattern, not duplicated */ /* name0 is used to check for OP_set_name pattern, not duplicated */
name0 = s->token.u.ident.atom; name0 = s->token.u.ident.atom;
} }
if (js_parse_cond_expr(s, parse_flags | PF_ARROW_FUNC)) if (js_parse_cond_expr(s, parse_flags))
return -1; return -1;
op = s->token.val; op = s->token.val;

10
tests/test_language.js
View File

@ -558,6 +558,15 @@ function test_parse_semicolon()
} }
} }
function test_parse_arrow_function()
{
assert(typeof eval("() => {}\n() => {}"), "function");
assert(eval("() => {}\n+1"), 1);
assert(typeof eval("x => {}\n() => {}"), "function");
assert(typeof eval("async () => {}\n() => {}"), "function");
assert(typeof eval("async x => {}\n() => {}"), "function");
}
/* optional chaining tests not present in test262 */ /* optional chaining tests not present in test262 */
function test_optional_chaining() function test_optional_chaining()
{ {
@ -604,3 +613,4 @@ test_argument_scope();
test_function_expr_name(); test_function_expr_name();
test_parse_semicolon(); test_parse_semicolon();
test_optional_chaining(); test_optional_chaining();
test_parse_arrow_function();