From c9fb6990bef94b9181a0cadb141924cd8349811c Mon Sep 17 00:00:00 2001
From: Tyson Andre <tysonandre775@hotmail.com>
Date: Sat, 15 Feb 2020 18:45:26 -0500
Subject: [PATCH] Support parsing `new (call_function())()`

And add tests for arbitrary parenthesized expressions in `new` and
`instanceof`
---
 src/Parser.php                                |  22 +++-
 tests/cases/parser/instanceofExpression.php   |   3 +
 .../parser/instanceofExpression.php.diag      |   1 +
 .../parser/instanceofExpression.php.tree      | 100 ++++++++++++++
 .../parser/objectCreationExpression19.php     |   2 +
 .../objectCreationExpression19.php.diag       |   1 +
 .../objectCreationExpression19.php.tree       | 103 +++++++++++++++
 .../parser/objectCreationExpression20.php     |   2 +
 .../objectCreationExpression20.php.diag       |   1 +
 .../objectCreationExpression20.php.tree       | 124 ++++++++++++++++++
 10 files changed, 357 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/parser/instanceofExpression.php
 create mode 100644 tests/cases/parser/instanceofExpression.php.diag
 create mode 100644 tests/cases/parser/instanceofExpression.php.tree
 create mode 100644 tests/cases/parser/objectCreationExpression19.php
 create mode 100644 tests/cases/parser/objectCreationExpression19.php.diag
 create mode 100644 tests/cases/parser/objectCreationExpression19.php.tree
 create mode 100644 tests/cases/parser/objectCreationExpression20.php
 create mode 100644 tests/cases/parser/objectCreationExpression20.php.diag
 create mode 100644 tests/cases/parser/objectCreationExpression20.php.tree

diff --git a/src/Parser.php b/src/Parser.php
index 5d29b7cb..722c447e 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2678,7 +2678,7 @@ private function parsePostfixExpressionRest($expression, $allowUpdateExpression
             return $this->parsePostfixExpressionRest($expression);
         }
 
-        if ($tokenKind === TokenKind::OpenParenToken && !$this->isParsingObjectCreationExpression) {
+        if ($tokenKind === TokenKind::OpenParenToken && !$this->isParsingUnparenthesizedObjectCreationExpression($expression)) {
             $expression = $this->parseCallExpressionRest($expression);
 
             if (!$this->checkToken(TokenKind::OpenParenToken)) {
@@ -2822,6 +2822,23 @@ private function parseScopedPropertyAccessExpression($expression, $fallbackParen
         return $scopedPropertyAccessExpression;
     }
 
+    public function isParsingUnparenthesizedObjectCreationExpression($expression) {
+        if (!$this->isParsingObjectCreationExpression) {
+            return false;
+        }
+        if ($expression instanceof Token) {
+            return true;
+        }
+        while ($expression->parent) {
+            $expression = $expression->parent;
+            if ($expression instanceof ObjectCreationExpression) {
+                return true;
+            } elseif ($expression instanceof ParenthesizedExpression) {
+                return false;
+            }
+        }
+    }
+
     private $isParsingObjectCreationExpression = false;
 
     private function parseObjectCreationExpression($parentNode) {
@@ -2829,12 +2846,13 @@ private function parseObjectCreationExpression($parentNode) {
         $objectCreationExpression->parent = $parentNode;
         $objectCreationExpression->newKeword = $this->eat1(TokenKind::NewKeyword);
         // TODO - add tests for this scenario
+        $oldIsParsingObjectCreationExpression = $this->isParsingObjectCreationExpression;
         $this->isParsingObjectCreationExpression = true;
         $objectCreationExpression->classTypeDesignator =
             $this->eatOptional1(TokenKind::ClassKeyword) ??
             $this->parseExpression($objectCreationExpression);
 
-        $this->isParsingObjectCreationExpression = false;
+        $this->isParsingObjectCreationExpression = $oldIsParsingObjectCreationExpression;
 
         $objectCreationExpression->openParen = $this->eatOptional1(TokenKind::OpenParenToken);
         if ($objectCreationExpression->openParen !== null) {
diff --git a/tests/cases/parser/instanceofExpression.php b/tests/cases/parser/instanceofExpression.php
new file mode 100644
index 00000000..c8e370b9
--- /dev/null
+++ b/tests/cases/parser/instanceofExpression.php
@@ -0,0 +1,3 @@
+<?php
+// php 8.0 instanceof
+$x = $y instanceof (function_call());
diff --git a/tests/cases/parser/instanceofExpression.php.diag b/tests/cases/parser/instanceofExpression.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser/instanceofExpression.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser/instanceofExpression.php.tree b/tests/cases/parser/instanceofExpression.php.tree
new file mode 100644
index 00000000..479d496a
--- /dev/null
+++ b/tests/cases/parser/instanceofExpression.php.tree
@@ -0,0 +1,100 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ExpressionStatement": {
+                    "expression": {
+                        "AssignmentExpression": {
+                            "leftOperand": {
+                                "Variable": {
+                                    "dollar": null,
+                                    "name": {
+                                        "kind": "VariableName",
+                                        "textLength": 2
+                                    }
+                                }
+                            },
+                            "operator": {
+                                "kind": "EqualsToken",
+                                "textLength": 1
+                            },
+                            "byRef": null,
+                            "rightOperand": {
+                                "BinaryExpression": {
+                                    "leftOperand": {
+                                        "Variable": {
+                                            "dollar": null,
+                                            "name": {
+                                                "kind": "VariableName",
+                                                "textLength": 2
+                                            }
+                                        }
+                                    },
+                                    "operator": {
+                                        "kind": "InstanceOfKeyword",
+                                        "textLength": 10
+                                    },
+                                    "rightOperand": {
+                                        "ParenthesizedExpression": {
+                                            "openParen": {
+                                                "kind": "OpenParenToken",
+                                                "textLength": 1
+                                            },
+                                            "expression": {
+                                                "CallExpression": {
+                                                    "callableExpression": {
+                                                        "QualifiedName": {
+                                                            "globalSpecifier": null,
+                                                            "relativeSpecifier": null,
+                                                            "nameParts": [
+                                                                {
+                                                                    "kind": "Name",
+                                                                    "textLength": 13
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    "openParen": {
+                                                        "kind": "OpenParenToken",
+                                                        "textLength": 1
+                                                    },
+                                                    "argumentExpressionList": null,
+                                                    "closeParen": {
+                                                        "kind": "CloseParenToken",
+                                                        "textLength": 1
+                                                    }
+                                                }
+                                            },
+                                            "closeParen": {
+                                                "kind": "CloseParenToken",
+                                                "textLength": 1
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "semicolon": {
+                        "kind": "SemicolonToken",
+                        "textLength": 1
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression19.php b/tests/cases/parser/objectCreationExpression19.php
new file mode 100644
index 00000000..42b86b17
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression19.php
@@ -0,0 +1,2 @@
+<?php
+$x = new (function_call())();
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression19.php.diag b/tests/cases/parser/objectCreationExpression19.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression19.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression19.php.tree b/tests/cases/parser/objectCreationExpression19.php.tree
new file mode 100644
index 00000000..479d36fa
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression19.php.tree
@@ -0,0 +1,103 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ExpressionStatement": {
+                    "expression": {
+                        "AssignmentExpression": {
+                            "leftOperand": {
+                                "Variable": {
+                                    "dollar": null,
+                                    "name": {
+                                        "kind": "VariableName",
+                                        "textLength": 2
+                                    }
+                                }
+                            },
+                            "operator": {
+                                "kind": "EqualsToken",
+                                "textLength": 1
+                            },
+                            "byRef": null,
+                            "rightOperand": {
+                                "ObjectCreationExpression": {
+                                    "newKeword": {
+                                        "kind": "NewKeyword",
+                                        "textLength": 3
+                                    },
+                                    "classTypeDesignator": {
+                                        "ParenthesizedExpression": {
+                                            "openParen": {
+                                                "kind": "OpenParenToken",
+                                                "textLength": 1
+                                            },
+                                            "expression": {
+                                                "CallExpression": {
+                                                    "callableExpression": {
+                                                        "QualifiedName": {
+                                                            "globalSpecifier": null,
+                                                            "relativeSpecifier": null,
+                                                            "nameParts": [
+                                                                {
+                                                                    "kind": "Name",
+                                                                    "textLength": 13
+                                                                }
+                                                            ]
+                                                        }
+                                                    },
+                                                    "openParen": {
+                                                        "kind": "OpenParenToken",
+                                                        "textLength": 1
+                                                    },
+                                                    "argumentExpressionList": null,
+                                                    "closeParen": {
+                                                        "kind": "CloseParenToken",
+                                                        "textLength": 1
+                                                    }
+                                                }
+                                            },
+                                            "closeParen": {
+                                                "kind": "CloseParenToken",
+                                                "textLength": 1
+                                            }
+                                        }
+                                    },
+                                    "openParen": {
+                                        "kind": "OpenParenToken",
+                                        "textLength": 1
+                                    },
+                                    "argumentExpressionList": null,
+                                    "closeParen": {
+                                        "kind": "CloseParenToken",
+                                        "textLength": 1
+                                    },
+                                    "classBaseClause": null,
+                                    "classInterfaceClause": null,
+                                    "classMembers": null
+                                }
+                            }
+                        }
+                    },
+                    "semicolon": {
+                        "kind": "SemicolonToken",
+                        "textLength": 1
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression20.php b/tests/cases/parser/objectCreationExpression20.php
new file mode 100644
index 00000000..5e2208a8
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression20.php
@@ -0,0 +1,2 @@
+<?php
+new (new (new york())())();
diff --git a/tests/cases/parser/objectCreationExpression20.php.diag b/tests/cases/parser/objectCreationExpression20.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression20.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression20.php.tree b/tests/cases/parser/objectCreationExpression20.php.tree
new file mode 100644
index 00000000..c8a1d73c
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression20.php.tree
@@ -0,0 +1,124 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ExpressionStatement": {
+                    "expression": {
+                        "ObjectCreationExpression": {
+                            "newKeword": {
+                                "kind": "NewKeyword",
+                                "textLength": 3
+                            },
+                            "classTypeDesignator": {
+                                "ParenthesizedExpression": {
+                                    "openParen": {
+                                        "kind": "OpenParenToken",
+                                        "textLength": 1
+                                    },
+                                    "expression": {
+                                        "ObjectCreationExpression": {
+                                            "newKeword": {
+                                                "kind": "NewKeyword",
+                                                "textLength": 3
+                                            },
+                                            "classTypeDesignator": {
+                                                "ParenthesizedExpression": {
+                                                    "openParen": {
+                                                        "kind": "OpenParenToken",
+                                                        "textLength": 1
+                                                    },
+                                                    "expression": {
+                                                        "ObjectCreationExpression": {
+                                                            "newKeword": {
+                                                                "kind": "NewKeyword",
+                                                                "textLength": 3
+                                                            },
+                                                            "classTypeDesignator": {
+                                                                "QualifiedName": {
+                                                                    "globalSpecifier": null,
+                                                                    "relativeSpecifier": null,
+                                                                    "nameParts": [
+                                                                        {
+                                                                            "kind": "Name",
+                                                                            "textLength": 4
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            },
+                                                            "openParen": {
+                                                                "kind": "OpenParenToken",
+                                                                "textLength": 1
+                                                            },
+                                                            "argumentExpressionList": null,
+                                                            "closeParen": {
+                                                                "kind": "CloseParenToken",
+                                                                "textLength": 1
+                                                            },
+                                                            "classBaseClause": null,
+                                                            "classInterfaceClause": null,
+                                                            "classMembers": null
+                                                        }
+                                                    },
+                                                    "closeParen": {
+                                                        "kind": "CloseParenToken",
+                                                        "textLength": 1
+                                                    }
+                                                }
+                                            },
+                                            "openParen": {
+                                                "kind": "OpenParenToken",
+                                                "textLength": 1
+                                            },
+                                            "argumentExpressionList": null,
+                                            "closeParen": {
+                                                "kind": "CloseParenToken",
+                                                "textLength": 1
+                                            },
+                                            "classBaseClause": null,
+                                            "classInterfaceClause": null,
+                                            "classMembers": null
+                                        }
+                                    },
+                                    "closeParen": {
+                                        "kind": "CloseParenToken",
+                                        "textLength": 1
+                                    }
+                                }
+                            },
+                            "openParen": {
+                                "kind": "OpenParenToken",
+                                "textLength": 1
+                            },
+                            "argumentExpressionList": null,
+                            "closeParen": {
+                                "kind": "CloseParenToken",
+                                "textLength": 1
+                            },
+                            "classBaseClause": null,
+                            "classInterfaceClause": null,
+                            "classMembers": null
+                        }
+                    },
+                    "semicolon": {
+                        "kind": "SemicolonToken",
+                        "textLength": 1
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file