You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/08/06 10:57:16 UTC
groovy git commit: GROOVY-6716: Cannot implement a trait via
anonymous class
Repository: groovy
Updated Branches:
refs/heads/master 17d3c356b -> d40e1c6be
GROOVY-6716: Cannot implement a trait via anonymous class
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d40e1c6b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d40e1c6b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d40e1c6b
Branch: refs/heads/master
Commit: d40e1c6be06eec61007883e135dd71ac2b6c24b8
Parents: 17d3c35
Author: Paul King <pa...@asert.com.au>
Authored: Mon Aug 6 20:57:04 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Mon Aug 6 20:57:04 2018 +1000
----------------------------------------------------------------------
.../groovy/classgen/InnerClassVisitor.java | 3 ++-
.../traitx/TraitASTTransformationTest.groovy | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/d40e1c6b/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitor.java b/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitor.java
index c8a64de..d2d570f 100644
--- a/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitor.java
+++ b/src/main/java/org/codehaus/groovy/classgen/InnerClassVisitor.java
@@ -36,6 +36,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.transform.trait.Traits;
import org.objectweb.asm.Opcodes;
import java.util.ArrayList;
@@ -79,7 +80,7 @@ public class InnerClassVisitor extends InnerClassVisitorHelper implements Opcode
if (node.isEnum() || node.isInterface()) return;
if (innerClass == null) return;
- if (node.getSuperClass().isInterface()) {
+ if (node.getSuperClass().isInterface() || Traits.isAnnotatedWithTrait(node.getSuperClass())) {
node.addInterface(node.getUnresolvedSuperClass());
node.setUnresolvedSuperClass(ClassHelper.OBJECT_TYPE);
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/d40e1c6b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
index ffddb08..97f9655 100644
--- a/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
+++ b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
@@ -2536,4 +2536,21 @@ assert c.b() == 2
'''
}
+ //GROOVY-6716
+ void testAnonymousInnerClassStyleTraitUsage() {
+ assertScript '''
+ interface Foo { def foo() }
+ def f = new Foo() { def foo() { 42 } }
+ assert f.foo() == 42
+
+ abstract class Baz { abstract baz() }
+ def bz = new Baz() { def baz() { 42 } }
+ assert bz.baz() == 42
+
+ trait Bar { def bar() { 42 } }
+ def b = new Bar() {}
+ assert b.bar() == 42
+ '''
+ }
+
}