Fix unit tests

2021-07-22 20:35:18 +02:00
parent e4431d4d65
commit 1ec564b22d
16 changed files with 962 additions and 1462 deletions
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -1742,8 +1742,6 @@ void PrimaryPattern() #void:
 void TypePattern():
 {}
 {
-  AnnotatedRefType() VariableDeclaratorId()
-  |
  LocalVarModifierList() ReferenceType() VariableDeclaratorId()
 }

@@ -1754,11 +1752,11 @@ void InstanceOfExpression() #void:
    LOOKAHEAD(1)
    ("instanceof"
        (
+              AnnotatedRefType() [ VariableDeclaratorId() #TypePattern(2) ]
+            |
              LOOKAHEAD("final" | "@") PrimaryPattern()
            |
              LOOKAHEAD("(") Pattern()
-            |
-              AnnotatedRefType() [ VariableDeclaratorId() #TypePattern(2) ]
        )
        {
            jjtThis.setOp(BinaryOp.INSTANCEOF);