[php] Fix #4196 -- fix alt labels, clean up code. (#4198)

* Fix #4196. Remove Python/ directory because there is no such thing as target "Python", only "Python3". Renamed alts to conform better to spec at https://github.com/php/php-langspec/blob/master/spec/19-grammar.md. * Remove magicMethod because it is not used. * Make inputs tests explicit.
antlr · Aug 16, 2024 · 97cbc39 · 97cbc39
1 parent 6c4f827
commit 97cbc39
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 213 deletions.
diff --git a/php/PhpParser.g4 b/php/PhpParser.g4
@@ -501,30 +501,30 @@ expression
     | Exit ( '(' ')' | parentheses)?                              # SpecialWordExpression
     | lambdaFunctionExpr                                          # LambdaFunctionExpression
     | matchExpr                                                   # MatchExpression
-    | <assoc = right> expression op = '**' expression             # ArithmeticExpression
+    | <assoc = right> expression op = '**' expression             # ExponentiationExpression
     | expression InstanceOf typeRef                               # InstanceOfExpression
-    | expression op = ('*' | Divide | '%') expression             # ArithmeticExpression
-    | expression op = ('+' | '-' | '.') expression                # ArithmeticExpression
-    | expression op = ('<<' | '>>') expression                    # ComparisonExpression
-    | expression op = (Less | '<=' | Greater | '>=') expression   # ComparisonExpression
-    | expression op = ('===' | '!==' | '==' | IsNotEq) expression # ComparisonExpression
-    | expression op = '&' expression                              # BitwiseExpression
-    | expression op = '^' expression                              # BitwiseExpression
-    | expression op = '|' expression                              # BitwiseExpression
-    | expression op = '&&' expression                             # BitwiseExpression
-    | expression op = '||' expression                             # BitwiseExpression
+    | expression op = ('*' | Divide | '%') expression             # MultiplicativeExpression
+    | expression op = ('+' | '-' | '.') expression                # AdditiveExpression
+    | expression op = ('<<' | '>>') expression                    # ShiftExpression
+    | expression op = (Less | '<=' | Greater | '>=') expression   # RelationalExpression
+    | expression op = ('===' | '!==' | '==' | IsNotEq) expression # EqualityExpression
+    | expression op = '&' expression                              # BitwiseAndExpression
+    | expression op = '^' expression                              # BitwiseExcOrExpression
+    | expression op = '|' expression                              # BitwiseIncOrExpression
+    | expression op = '&&' expression                             # LogicalAndExpression
+    | expression op = '||' expression                             # LogicalIncOrExpression
     | expression op = QuestionMark expression? ':' expression     # ConditionalExpression
-    | expression op = '??' expression                             # NullCoalescingExpression
+    | expression op = '??' expression                             # CoalesceExpression
     | expression op = '<=>' expression                            # SpaceshipExpression
     | (Include | IncludeOnce) expression                          # IncludeExpression
     | (Require | RequireOnce) expression                          # RequireExpression
     | Throw expression                                            # SpecialWordExpression
     | arrayDestructuring Eq expression                            # ArrayDestructExpression
     | assignable assignmentOperator attributes? expression        # AssignmentExpression
     | assignable Eq attributes? '&' (chain | newExpr)             # AssignmentExpression
-    | expression op = LogicalAnd expression                       # LogicalExpression
-    | expression op = LogicalXor expression                       # LogicalExpression
-    | expression op = LogicalOr expression                        # LogicalExpression
+    | expression op = LogicalAnd expression                       # LogicalAndExpression
+    | expression op = LogicalXor expression                       # LogicalExcOrExpression
+    | expression op = LogicalOr expression                        # LogicalIncOrExpression
     ;
 
 assignable
@@ -930,25 +930,6 @@ magicConstant
     | Dir__
     ;
 
-magicMethod
-    : Get
-    | Set
-    | Call
-    | CallStatic
-    | Constructor
-    | Destruct
-    | Wakeup
-    | Sleep
-    | Autoload
-    | IsSet__
-    | Unset__
-    | ToString__
-    | Invoke
-    | SetState
-    | Clone__
-    | DebugInfo
-    ;
-
 primitiveType
     : BoolType
     | IntType

diff --git a/php/Python/PhpLexerBase.py b/php/Python/PhpLexerBase.py
diff --git a/php/Python/README.md b/php/Python/README.md
diff --git a/php/Python/transformGrammar.py b/php/Python/transformGrammar.py
diff --git a/php/desc.xml b/php/desc.xml
@@ -2,4 +2,5 @@
 <desc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../_scripts/desc.xsd">
    <antlr-version>^4.10</antlr-version>
    <targets>CSharp;Java;Python3;Antlr4ng</targets>
+   <inputs>examples/**/*.php</inputs>
 </desc>