You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/11/12 20:23:04 UTC

[groovy] branch master updated: Tweak record compact constructor grammar

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new b2f8b92  Tweak record compact constructor grammar
b2f8b92 is described below

commit b2f8b92f88feddf66393703c2054f40d87370ee3
Author: Daniel Sun <su...@apache.org>
AuthorDate: Wed Nov 10 23:55:16 2021 +0800

    Tweak record compact constructor grammar
---
 src/antlr/GroovyParser.g4                          |  7 ++---
 .../apache/groovy/parser/antlr4/AstBuilder.java    |  7 +++--
 .../core/RecordDeclaration_13x.groovy              | 30 ++++++++++++++++++++++
 .../groovy/parser/antlr4/GroovyParserTest.groovy   |  1 +
 .../groovy/antlr/EnumSourceParsingTest.java        |  7 ++---
 5 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4
index 061d26d..6f2b8f9 100644
--- a/src/antlr/GroovyParser.g4
+++ b/src/antlr/GroovyParser.g4
@@ -263,8 +263,9 @@ classBodyDeclaration[int t]
 memberDeclaration[int t]
     :   methodDeclaration[0, $t]
     |   fieldDeclaration
-    |   modifiersOpt classDeclaration
-    |   compactConstructorDeclaration
+    |   modifiersOpt (  classDeclaration
+                     |  compactConstructorDeclaration
+                     )
     ;
 
 /**
@@ -285,7 +286,7 @@ methodDeclaration[int t, int ct]
     ;
 
 compactConstructorDeclaration
-    :   modifiers methodName nls methodBody
+    :   methodName nls methodBody
     ;
 
 methodName
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 1cfb080..1e21774 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -362,7 +362,6 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.assignX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.cloneParams;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.closureX;
-import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.declS;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.listX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.localVarX;
@@ -1844,6 +1843,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
             ctx.fieldDeclaration().putNodeMetaData(CLASS_DECLARATION_CLASS_NODE, classNode);
             this.visitFieldDeclaration(ctx.fieldDeclaration());
         } else if (asBoolean(ctx.compactConstructorDeclaration())) {
+            ctx.compactConstructorDeclaration().putNodeMetaData(COMPACT_CONSTRUCTOR_DECLARATION_MODIFIERS, this.visitModifiersOpt(ctx.modifiersOpt()));
             ctx.compactConstructorDeclaration().putNodeMetaData(CLASS_DECLARATION_CLASS_NODE, classNode);
             this.visitCompactConstructorDeclaration(ctx.compactConstructorDeclaration());
         } else if (asBoolean(ctx.classDeclaration())) {
@@ -1948,7 +1948,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
             createParsingFailedException("Only `record` can have compact constructor", ctx);
         }
 
-        ModifierManager modifierManager = new ModifierManager(this, this.visitModifiers(ctx.modifiers()));
+        List<ModifierNode> modifierNodeList = ctx.getNodeMetaData(COMPACT_CONSTRUCTOR_DECLARATION_MODIFIERS);
+        Objects.requireNonNull(modifierNodeList, "modifierNodeList should not be null");
+        ModifierManager modifierManager = new ModifierManager(this, modifierNodeList);
 
         if (modifierManager.containsAny(VAR)) {
             throw createParsingFailedException("var cannot be used for compact constructor declaration", ctx);
@@ -5207,6 +5209,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
     private static final String PATH_EXPRESSION_BASE_EXPR_SAFE_CHAIN = "_PATH_EXPRESSION_BASE_EXPR_SAFE_CHAIN";
     private static final String CMD_EXPRESSION_BASE_EXPR = "_CMD_EXPRESSION_BASE_EXPR";
     private static final String TYPE_DECLARATION_MODIFIERS = "_TYPE_DECLARATION_MODIFIERS";
+    private static final String COMPACT_CONSTRUCTOR_DECLARATION_MODIFIERS = "_COMPACT_CONSTRUCTOR_DECLARATION_MODIFIERS";
     private static final String CLASS_DECLARATION_CLASS_NODE = "_CLASS_DECLARATION_CLASS_NODE";
     private static final String VARIABLE_DECLARATION_VARIABLE_TYPE = "_VARIABLE_DECLARATION_VARIABLE_TYPE";
     private static final String ANONYMOUS_INNER_CLASS_SUPER_CLASS = "_ANONYMOUS_INNER_CLASS_SUPER_CLASS";
diff --git a/src/test-resources/core/RecordDeclaration_13x.groovy b/src/test-resources/core/RecordDeclaration_13x.groovy
new file mode 100644
index 0000000..a7bb1cf
--- /dev/null
+++ b/src/test-resources/core/RecordDeclaration_13x.groovy
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package core
+
+record Fruit(String name, double price) {
+    Fruit {
+        name = name.toUpperCase()
+        price = price * 1.2
+    }
+}
+def apple = new Fruit('Apple', 11.6)
+assert 'APPLE' == apple.name()
+assert 13.92 == apple.price()
+
diff --git a/src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy b/src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
index de1e3d4..b13c92f 100644
--- a/src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
+++ b/src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
@@ -370,6 +370,7 @@ final class GroovyParserTest extends GroovyTestCase {
         doRunAndTestAntlr4('core/RecordDeclaration_10x.groovy')
         doRunAndTestAntlr4('core/RecordDeclaration_11x.groovy')
         doRunAndTestAntlr4('core/RecordDeclaration_12x.groovy')
+        doRunAndTestAntlr4('core/RecordDeclaration_13x.groovy')
     }
 
     void "test groovy core - AnnotationDeclaration"() {
diff --git a/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java b/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
index 076b8dd..067a52e 100644
--- a/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
+++ b/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
@@ -328,7 +328,7 @@ public final class EnumSourceParsingTest extends GroovyTestCase {
         ));
     }
 
-    public void _FIXME_testParseEnumWithInnerClass4() {
+    public void testParseEnumWithInnerClass4() {
         parse(getMethodName(), new StringReader(
                 "enum E {\n" +
                         "    X, Y, Z\n" +
@@ -337,7 +337,7 @@ public final class EnumSourceParsingTest extends GroovyTestCase {
         ));
     }
 
-    public void _FIXME_testParseEnumWithInnerClass4a() {
+    public void testParseEnumWithInnerClass4a() {
         parse(getMethodName(), new StringReader(
                 "enum E {\n" +
                         "    X, Y, Z,\n" + // trailing comma
@@ -356,7 +356,8 @@ public final class EnumSourceParsingTest extends GroovyTestCase {
     }
 
     // GROOVY-8507
-    public void testParseEnumWithInnerClass5a() {
+    // `trait` can be both keyword and identifier, so `trait` could be parsed as enum constant too
+    public void _FIXME_testParseEnumWithInnerClass5a() {
         parse(getMethodName(), new StringReader(
                 "enum E {\n" +
                         "    X, Y, Z,\n" + // trailing comma