From f588210641b41860141b01fba15144a9ad5be7d7 Mon Sep 17 00:00:00 2001 From: KaruroChori Date: Sat, 18 May 2024 08:15:34 +0000 Subject: [PATCH] Cherrypick https://github.com/bellard/quickjs/pull/289 (#404) Co-authored-by: karurochari --- quickjs.c | 12 +++++++++--- tests/test_language.js | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/quickjs.c b/quickjs.c index 57e907e..f076d49 100644 --- a/quickjs.c +++ b/quickjs.c @@ -20837,7 +20837,7 @@ static int __exception js_parse_property_name(JSParseState *s, goto fail1; if (s->token.val == ':' || s->token.val == ',' || s->token.val == '}' || s->token.val == '(' || - s->token.val == '=' ) { + s->token.val == '=') { is_non_reserved_ident = TRUE; goto ident_found; } @@ -20853,7 +20853,8 @@ static int __exception js_parse_property_name(JSParseState *s, if (next_token(s)) goto fail1; if (s->token.val == ':' || s->token.val == ',' || - s->token.val == '}' || s->token.val == '(') { + s->token.val == '}' || s->token.val == '(' || + s->token.val == '=') { is_non_reserved_ident = TRUE; goto ident_found; } @@ -21609,7 +21610,12 @@ static __exception int js_parse_class(JSParseState *s, BOOL is_class_expr, goto fail; continue; } - is_static = (s->token.val == TOK_STATIC); + is_static = FALSE; + if (s->token.val == TOK_STATIC) { + int next = peek_token(s, TRUE); + if (!(next == ';' || next == '}' || next == '(' || next == '=')) + is_static = TRUE; + } prop_type = -1; if (is_static) { if (next_token(s)) diff --git a/tests/test_language.js b/tests/test_language.js index 92cd03c..717a7f4 100644 --- a/tests/test_language.js +++ b/tests/test_language.js @@ -343,10 +343,13 @@ function test_class() assert(S.x === 42); assert(S.y === 42); assert(S.z === 42); + class P { - get = () => "123" + get = () => "123"; + static() { return 42; } } assert(new P().get() === "123"); + assert(new P().static() === 42); }; function test_template()