GROOVY-10433

groovy · Dec 30, 2021 · 7e58b8c · 7e58b8c
1 parent df8dc75
commit 7e58b8c
Show file tree

Hide file tree

Showing 5 changed files with 613 additions and 600 deletions.
diff --git a/base/org.codehaus.groovy40/build.bridger b/base/org.codehaus.groovy40/build.bridger
@@ -19,7 +19,7 @@
 
     <target name="weave">
         <resolve-dependencies pathid="classpath.bridger" type="jar,maven-plugin">
-            <dependency org="org.jboss.bridger" name="bridger" rev="1.5.Final">
+            <dependency org="org.jboss.bridger" name="bridger" rev="1.6.Final">
                 <exclude org="org\.apache\.maven.*" matcher="regexp" />
                 <exclude org="org.codehaus.plexus" />
                 <exclude org="org.sonatype.plexus" />

diff --git a/base/org.codehaus.groovy40/src/GroovyParser.g4 b/base/org.codehaus.groovy40/src/GroovyParser.g4
@@ -1213,14 +1213,14 @@ className
 identifier
     :   Identifier
     |   CapitalizedIdentifier
-    |   VAR
-    |   IN
-//  |   DEF
-    |   TRAIT
     |   AS
-    |   YIELD
+    |   IN
     |   PERMITS
     |   RECORD
+    |   SEALED
+    |   TRAIT
+    |   VAR
+    |   YIELD
     ;
 
 builtInType

diff --git a/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/GroovyParser.interp b/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/GroovyParser.interp