diff options
author | Linus Groh <mail@linusgroh.de> | 2023-04-01 20:44:32 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2023-04-02 06:45:37 +0200 |
commit | 3709d112126deb93960aa492d2c5b00e5adc4fc1 (patch) | |
tree | ca975e12d415222d2e9f3fa84b24a6110564262f /Userland/Libraries/LibJS/Tests | |
parent | 85d063705825a92bdb83e4712234a42894c70711 (diff) | |
download | serenity-3709d112126deb93960aa492d2c5b00e5adc4fc1.zip |
LibJS: Parse secondary expressions with the original forbidden token set
Instead of passing the continuously merged initial forbidden token set
(with the new additional forbidden tokens from each parsed secondary
expression) to the next call of parse_secondary_expression(), keep a
copy of the original set and use it as the base for parsing the next
secondary expression.
This bug prevented us from properly parsing the following expression:
```js
0 ?? 0 ? 0 : 0 || 0
```
...due to LogicalExpression with LogicalOp::NullishCoalescing returning
both DoubleAmpersand and DoublePipe in its forbidden token set.
The following correct AST is now generated:
Program
(Children)
ExpressionStatement
ConditionalExpression
(Test)
LogicalExpression
NumericLiteral 0
??
NumericLiteral 0
(Consequent)
NumericLiteral 0
(Alternate)
LogicalExpression
NumericLiteral 0
||
NumericLiteral 0
An alternate solution I explored was only merging the original forbidden
token set with the one of the last parsed secondary expression which is
then passed to match_secondary_expression(); however that led to an
incorrect AST (note the alternate expression):
Program
(Children)
ExpressionStatement
LogicalExpression
ConditionalExpression
(Test)
LogicalExpression
NumericLiteral 0
??
NumericLiteral 0
(Consequent)
NumericLiteral 0
(Alternate)
NumericLiteral 0
||
NumericLiteral 0
Truth be told, I don't know enough about the inner workings of the
parser to fully explain the difference. AFAICT this patch has no
unintended side effects in its current form though.
Fixes #18087.
Diffstat (limited to 'Userland/Libraries/LibJS/Tests')
-rw-r--r-- | Userland/Libraries/LibJS/Tests/syntax/coalesce-logic-expression-mixing.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Tests/syntax/coalesce-logic-expression-mixing.js b/Userland/Libraries/LibJS/Tests/syntax/coalesce-logic-expression-mixing.js index 303e53b85b..bde6fec38c 100644 --- a/Userland/Libraries/LibJS/Tests/syntax/coalesce-logic-expression-mixing.js +++ b/Userland/Libraries/LibJS/Tests/syntax/coalesce-logic-expression-mixing.js @@ -20,6 +20,19 @@ test("mixing coalescing and logical operators with parens", () => { expect("if (0) a || (b * c) ?? d").not.toEval(); }); +test("mixing coalescing and logical operators in ternary expressions", () => { + expect("0 || 0 ? 0 : 0 ?? 0").toEval(); + expect("0 ?? 0 ? 0 : 0 || 0").toEval(); + expect("0 ? 0 || 0 : 0 ?? 0").toEval(); + expect("0 ? 0 ?? 0 : 0 || 0").toEval(); + expect("0 && 0 ? 0 ?? 0 : 0 || 0").toEval(); + expect("0 ?? 0 ? 0 && 0 : 0 || 0").toEval(); + expect("0 ?? 0 ? 0 || 0 : 0 && 0").toEval(); + expect("0 || 0 ? 0 ?? 0 : 0 && 0").toEval(); + expect("0 && 0 ? 0 || 0 : 0 ?? 0").toEval(); + expect("0 || 0 ? 0 && 0 : 0 ?? 0").toEval(); +}); + test("mixing coalescing and logical operators when 'in' isn't allowed", () => { expect("for (a ?? b || c in a; false;);").not.toEval(); expect("for (a ?? b && c in a; false;);").not.toEval(); |