PHP8.1 Support (DOM&Compiler parser) - #149

* fix readonly as function name
eclipse-pdt · May 3, 2023 · 013bef5 · 013bef5
1 parent 2d22db6
commit 013bef5
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 0 deletions.
diff --git a/plugins/org.eclipse.php.core/Resources/parserTools/parser/php81/php_ast_parser.cup b/plugins/org.eclipse.php.core/Resources/parserTools/parser/php81/php_ast_parser.cup
@@ -3335,6 +3335,12 @@ name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARE
 		new FunctionName(listleft, listright, parser.ast, list), parameters);
 :}
 
+| T_READONLY:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
+{:
+	RESULT = new FunctionInvocation(listleft, eright, parser.ast,
+		new FunctionName(listleft, listright, parser.ast, new NamespaceName(listleft, listright, ast, list, false, false)), parameters);
+:}
+
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM member_name:reflectionName T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
 	RESULT = new StaticMethodInvocation(classNameleft, eright, parser.ast, className,

diff --git a/plugins/org.eclipse.php.core/Resources/parserTools/parser/php81/php_compiler_ast_parser.cup b/plugins/org.eclipse.php.core/Resources/parserTools/parser/php81/php_compiler_ast_parser.cup
@@ -3834,6 +3834,14 @@ name:functionName T_OPEN_PARENTHESE:start function_call_parameter_list:parameter
 	RESULT = new PHPCallExpression(functionNameleft, endright, null, functionName, parameters);
 :}
 
+| T_READONLY:i T_OPEN_PARENTHESE:start function_call_parameter_list:parameters T_CLOSE_PARENTHESE:end
+{:
+	parameters.setStart(startright);
+	parameters.setEnd(endleft);
+	FullyQualifiedReference functionName = new FullyQualifiedReference(ileft, iright, i.value, null, FullyQualifiedReference.T_FUNCTION);
+	RESULT = new PHPCallExpression(ileft, endright, null, functionName, parameters);
+:}
+
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM member_name:functionName T_OPEN_PARENTHESE:start function_call_parameter_list:parameters T_CLOSE_PARENTHESE:end
 {:
 	parameters.setStart(startright);

diff --git a/plugins/org.eclipse.php.core/Resources/parserTools/parser/php82/php_ast_parser.cup b/plugins/org.eclipse.php.core/Resources/parserTools/parser/php82/php_ast_parser.cup
@@ -3389,6 +3389,12 @@ name:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARE
 		new FunctionName(listleft, listright, parser.ast, list), parameters);
 :}
 
+| T_READONLY:list T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
+{:
+	RESULT = new FunctionInvocation(listleft, eright, parser.ast,
+		new FunctionName(listleft, listright, parser.ast, new NamespaceName(listleft, listright, ast, list, false, false)), parameters);
+:}
+
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM member_name:reflectionName T_OPEN_PARENTHESE function_call_parameter_list:parameters T_CLOSE_PARENTHESE:e
 {:
 	RESULT = new StaticMethodInvocation(classNameleft, eright, parser.ast, className,

diff --git a/plugins/org.eclipse.php.core/Resources/parserTools/parser/php82/php_compiler_ast_parser.cup b/plugins/org.eclipse.php.core/Resources/parserTools/parser/php82/php_compiler_ast_parser.cup
@@ -3895,6 +3895,14 @@ name:functionName T_OPEN_PARENTHESE:start function_call_parameter_list:parameter
 	RESULT = new PHPCallExpression(functionNameleft, endright, null, functionName, parameters);
 :}
 
+| T_READONLY:i T_OPEN_PARENTHESE:start function_call_parameter_list:parameters T_CLOSE_PARENTHESE:end
+{:
+	parameters.setStart(startright);
+	parameters.setEnd(endleft);
+	FullyQualifiedReference functionName = new FullyQualifiedReference(ileft, iright, i.value, null, FullyQualifiedReference.T_FUNCTION);
+	RESULT = new PHPCallExpression(ileft, endright, null, functionName, parameters);
+:}
+
 | class_name:className T_PAAMAYIM_NEKUDOTAYIM member_name:functionName T_OPEN_PARENTHESE:start function_call_parameter_list:parameters T_CLOSE_PARENTHESE:end
 {:
 	parameters.setStart(startright);

diff --git a/tests/org.eclipse.php.core.tests/workspace/compiler_parser/php81/testReadonlyFunction.pdtt b/tests/org.eclipse.php.core.tests/workspace/compiler_parser/php81/testReadonlyFunction.pdtt
@@ -0,0 +1,24 @@
+--TEST--
+PHP 8.1
+--FILE--
+<?php
+function readonly() {}
+
+readonly();
+
+?>
+--EXPECT--
+<ModuleDeclaration start="0" end="46">
+	<PHPMethodDeclaration start="6" end="28" modifiers="" name="readonly">
+	</PHPMethodDeclaration>
+	<ExpressionStatement start="30" end="41">
+		<PHPCallExpression start="30" end="40">
+			<FullyQualifiedReference start="30" end="38" name="readonly">
+			</FullyQualifiedReference>
+			<PHPCallArgumentsList start="39" end="39">
+			</PHPCallArgumentsList>
+		</PHPCallExpression>
+	</ExpressionStatement>
+	<EmptyStatement start="43" end="45">
+	</EmptyStatement>
+</ModuleDeclaration>
diff --git a/tests/org.eclipse.php.core.tests/workspace/dom_parser/php81/testReadonlyFunction.pdtt b/tests/org.eclipse.php.core.tests/workspace/dom_parser/php81/testReadonlyFunction.pdtt
@@ -0,0 +1,39 @@
+--TEST--
+PHP 8.1
+--FILE--
+<?php
+function readonly() {}
+
+readonly();
+
+?>
+--EXPECT--
+<Program start='0' length='45'>
+	<Statements>
+		<FunctionDeclaration start='6' length='22' isReference='false'>
+			<FunctionName>
+				<Identifier start='15' length='8' name='readonly'/>
+			</FunctionName>
+			<FormalParameters>
+			</FormalParameters>
+			<FunctionBody>
+				<Block start='26' length='2' isCurly='true'>
+				</Block>
+			</FunctionBody>
+		</FunctionDeclaration>
+		<ExpressionStatement start='30' length='11'>
+			<FunctionInvocation start='30' length='10'>
+				<FunctionName start='30' length='8'>
+					<NamespaceName start='30' length='8' global='false' current='false'>
+						<Identifier start='30' length='8' name='readonly'/>
+					</NamespaceName>
+				</FunctionName>
+				<Parameters>
+				</Parameters>
+			</FunctionInvocation>
+		</ExpressionStatement>
+		<EmptyStatement start='43' length='2'/>
+	</Statements>
+	<Comments>
+	</Comments>
+</Program>