Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ AST.precedence = {};
["==", "!=", "===", "!==", /* '<>', */ "<=>"],
["<", "<=", ">", ">="],
["<<", ">>"],
["instanceof"],
["+", "-", "."],
["*", "/", "%"],
["!"],
["instanceof"],
["!", "u-", "u+", "u~"], // u- etc. are unary variants; higher than * so -20*5 parses as (-20)*5
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how relevant in practice, but according to https://www.php.net/manual/en/language.operators.precedence.php the unary operators have even higher precedence than instanceof. Would it make sense to reflect this here?
Also, tangentially, are we lacking ++ and --?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I changed the precedence of instanceof. Pre and post increment operators, we can tackle in another branch.

["cast", "silent"],
["**"],
// TODO: [ (array)
Expand Down Expand Up @@ -300,7 +300,9 @@ AST.prototype.resolvePrecedence = function (result, parser) {
// https://github.com/glayzzle/php-parser/issues/75
if (result.what && !result.what.parenthesizedExpression) {
if (result.what.kind === "bin") {
lLevel = AST.precedence[result.type];
// use the unary-specific precedence (u-, u+, u~) which is higher than binary - and +
lLevel =
AST.precedence["u" + result.type] || AST.precedence[result.type];
rLevel = AST.precedence[result.what.type];
if (lLevel && rLevel && rLevel < lLevel) {
buffer = result.what;
Expand Down
4 changes: 2 additions & 2 deletions test/precedence.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ describe("Test precedence", function () {
shouldBeSame("5 AND 4 + 3", "5 AND (4 + 3)");
});
it("test unary : !", function () {
shouldBeSame("!$a instanceof $b", "!($a instanceof $b)");
shouldBeSame("!$a + $b instanceof $c", "(!$a) + ($b instanceof $c)");
shouldBeSame("!$a instanceof $b", "(!$a) instanceof $b");
shouldBeSame("!$a + $b instanceof $c", "((!$a) + $b) instanceof $c");
shouldBeSame("6 + !4 + 5", "6 + (!4) + 5");
shouldBeSame("if($a && !$b) {}", "if($a && (!$b)) {}");
});
Expand Down
96 changes: 48 additions & 48 deletions test/snapshot/__snapshots__/attributes.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1591,74 +1591,74 @@ Program {
"attrs": [
Attribute {
"args": [
Unary {
"kind": "unary",
"type": "-",
"what": Bin {
Bin {
"kind": "bin",
"left": Bin {
"kind": "bin",
"left": Bin {
"kind": "bin",
"left": Bin {
"kind": "bin",
"left": Bin {
"kind": "bin",
"left": Number {
"left": Unary {
"kind": "unary",
"type": "-",
"what": Number {
"kind": "number",
"value": "20",
},
"right": Unary {
},
"right": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"parenthesizedExpression": true,
"type": "+",
"what": Bin {
"kind": "bin",
"left": Number {
"kind": "number",
"value": "10",
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "/",
"what": Number {
"kind": "number",
"value": "10",
},
},
"type": "*",
},
"right": Number {
"kind": "number",
"value": "2",
"parenthesizedExpression": true,
"right": Number {
"kind": "number",
"value": "5",
},
"type": "/",
},
"type": "%",
"type": "*",
},
"right": Bin {
"kind": "bin",
"left": Number {
"kind": "number",
"value": "8",
},
"right": Number {
"kind": "number",
"value": "2",
},
"type": "**",
"right": Number {
"kind": "number",
"value": "2",
},
"type": "+",
"type": "%",
},
"right": Unary {
"right": Bin {
"kind": "bin",
"left": Number {
"kind": "number",
"value": "8",
},
"right": Number {
"kind": "number",
"value": "2",
},
"type": "**",
},
"type": "+",
},
"right": Unary {
"kind": "unary",
"type": "+",
"what": Unary {
"kind": "unary",
"type": "+",
"what": Unary {
"kind": "unary",
"type": "-",
"what": Number {
"kind": "number",
"value": "2",
},
"type": "-",
"what": Number {
"kind": "number",
"value": "2",
},
},
"type": "-",
},
"type": "-",
},
],
"kind": "attribute",
Expand Down
148 changes: 148 additions & 0 deletions test/snapshot/__snapshots__/unary.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,154 @@ Program {
}
`;

exports[`Test unary precedence over add 1`] = `
Program {
"children": [
ExpressionStatement {
"expression": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"type": "-",
"what": Number {
"kind": "number",
"value": "20",
},
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "+",
},
"kind": "expressionstatement",
},
],
"errors": [],
"kind": "program",
}
`;

exports[`Test unary precedence over mul 1`] = `
Program {
"children": [
ExpressionStatement {
"expression": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"type": "-",
"what": Number {
"kind": "number",
"value": "20",
},
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "*",
},
"kind": "expressionstatement",
},
],
"errors": [],
"kind": "program",
}
`;

exports[`Test unary precedence over mul and add 1`] = `
Program {
"children": [
ExpressionStatement {
"expression": Bin {
"kind": "bin",
"left": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"type": "-",
"what": Number {
"kind": "number",
"value": "20",
},
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "*",
},
"right": Number {
"kind": "number",
"value": "10",
},
"type": "+",
},
"kind": "expressionstatement",
},
],
"errors": [],
"kind": "program",
}
`;

exports[`Test unary precedence with plus 1`] = `
Program {
"children": [
ExpressionStatement {
"expression": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"type": "+",
"what": Number {
"kind": "number",
"value": "20",
},
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "*",
},
"kind": "expressionstatement",
},
],
"errors": [],
"kind": "program",
}
`;

exports[`Test unary precedence with tilde 1`] = `
Program {
"children": [
ExpressionStatement {
"expression": Bin {
"kind": "bin",
"left": Unary {
"kind": "unary",
"type": "~",
"what": Number {
"kind": "number",
"value": "20",
},
},
"right": Number {
"kind": "number",
"value": "5",
},
"type": "*",
},
"kind": "expressionstatement",
},
],
"errors": [],
"kind": "program",
}
`;

exports[`Test unary simple 1`] = `
Program {
"children": [
Expand Down
5 changes: 5 additions & 0 deletions test/snapshot/unary.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ describe("Test unary", function () {
["parens (8)", "(~$var);"],
["parens (9)", "(-100);"],
["parens (10)", "-(100);"],
["precedence over mul", "-20 * 5;"],
["precedence over add", "-20 + 5;"],
["precedence over mul and add", "-20 * 5 + 10;"],
["precedence with plus", "+20 * 5;"],
["precedence with tilde", "~20 * 5;"],
])("%s", function (_, code) {
expect(parser.parseEval(code)).toMatchSnapshot();
});
Expand Down