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 2020/01/22 17:26:24 UTC
[groovy] 10/15: use trait class
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 36faa1bdd1ea18965718e729b83fd61fbd3b9c4c
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Jan 21 16:57:31 2020 -0600
use trait class
(cherry picked from commit ce7dc4805243b95578fd94cca67982b34e82d70a)
---
src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java | 3 ++-
.../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index ac96d5a..7fcabac 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -22,6 +22,7 @@ import antlr.RecognitionException;
import antlr.TokenStreamException;
import antlr.TokenStreamRecognitionException;
import antlr.collections.AST;
+import groovy.transform.Trait;
import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.antlr.parser.GroovyLexer;
import org.codehaus.groovy.antlr.parser.GroovyRecognizer;
@@ -630,7 +631,7 @@ public class AntlrParserPlugin extends ASTHelper implements ParserPlugin, Groovy
List<AnnotationNode> annotations = new ArrayList<>();
if (isType(TRAIT_DEF, classDef)) {
- annotations.add(new AnnotationNode(ClassHelper.make("groovy.transform.Trait")));
+ annotations.add(new AnnotationNode(ClassHelper.makeCached(Trait.class)));
}
AST node = classDef.getFirstChild();
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 363a75e..05a83dd 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -19,6 +19,7 @@
package org.apache.groovy.parser.antlr4;
import groovy.lang.Tuple2;
+import groovy.transform.Trait;
import org.antlr.v4.runtime.ANTLRErrorListener;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
@@ -1124,7 +1125,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
boolean isInterfaceWithDefaultMethods = (isInterface && this.containsDefaultMethods(ctx));
if (isInterfaceWithDefaultMethods || asBoolean(ctx.TRAIT())) {
- classNode.addAnnotation(new AnnotationNode(ClassHelper.make("groovy.transform.Trait")));
+ classNode.addAnnotation(new AnnotationNode(ClassHelper.makeCached(Trait.class)));
}
classNode.addAnnotations(modifierManager.getAnnotations());