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/04/12 13:48:12 UTC
[1/3] groovy git commit: formatting
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 61284355f -> d862bdbdc
formatting
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2c9197fa
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2c9197fa
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2c9197fa
Branch: refs/heads/GROOVY_2_6_X
Commit: 2c9197fa2fa57c4cfc46e55d97ebb8b876b559c8
Parents: 6128435
Author: Paul King <pa...@asert.com.au>
Authored: Thu Apr 12 18:50:39 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Apr 12 23:42:01 2018 +1000
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/control/GenericsVisitor.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/2c9197fa/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
index 36ef5ea..53885cf 100644
--- a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
/**
* class used to verify correct usage of generics in
* class header (class and superclass declaration)
- *
- * @author Jochen Theodorou
*/
public class GenericsVisitor extends ClassCodeVisitorSupport {
private final SourceUnit source;
@@ -48,7 +46,7 @@ public class GenericsVisitor extends ClassCodeVisitorSupport {
public void visitClass(ClassNode node) {
boolean error = checkWildcard(node);
if (error) return;
- boolean isAnon = node instanceof InnerClassNode && ((InnerClassNode)node).isAnonymous();
+ boolean isAnon = node instanceof InnerClassNode && ((InnerClassNode) node).isAnonymous();
checkGenericsUsage(node.getUnresolvedSuperClass(false), node.getSuperClass(), isAnon ? true : null);
ClassNode[] interfaces = node.getInterfaces();
for (ClassNode anInterface : interfaces) {
@@ -67,7 +65,7 @@ public class GenericsVisitor extends ClassCodeVisitorSupport {
@Override
public void visitConstructorCallExpression(ConstructorCallExpression call) {
ClassNode type = call.getType();
- boolean isAnon = type instanceof InnerClassNode && ((InnerClassNode)type).isAnonymous();
+ boolean isAnon = type instanceof InnerClassNode && ((InnerClassNode) type).isAnonymous();
checkGenericsUsage(type, type.redirect(), isAnon);
}
[2/3] groovy git commit: GROOVY-8211: part one - also show nested
type parameter arity mismatches
Posted by pa...@apache.org.
GROOVY-8211: part one - also show nested type parameter arity mismatches
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8ee3bd96
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8ee3bd96
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8ee3bd96
Branch: refs/heads/GROOVY_2_6_X
Commit: 8ee3bd96155663e93f8220c8a271de5a008d57ef
Parents: 2c9197f
Author: Paul King <pa...@asert.com.au>
Authored: Thu Apr 12 20:06:22 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Apr 12 23:42:02 2018 +1000
----------------------------------------------------------------------
.../org/codehaus/groovy/control/GenericsVisitor.java | 13 ++++++++++---
src/test/gls/generics/GenericsTest.groovy | 12 ++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/8ee3bd96/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
index 53885cf..b4f3854 100644
--- a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
@@ -28,8 +28,13 @@ import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
/**
- * class used to verify correct usage of generics in
- * class header (class and superclass declaration)
+ * Verify correct usage of generics.
+ * This includes:
+ * <ul>
+ * <li>class header (class and superclass declaration)</li>
+ * <li>arity of type parameters for fields, parameters, local variables</li>
+ * <li>invalid diamond &;t;> usage</li>
+ * </ul>
*/
public class GenericsVisitor extends ClassCodeVisitorSupport {
private final SourceUnit source;
@@ -135,10 +140,12 @@ public class GenericsVisitor extends ClassCodeVisitorSupport {
addError(message, n);
return;
}
- // check bounds
for (int i = 0; i < nTypes.length; i++) {
ClassNode nType = nTypes[i].getType();
ClassNode cnType = cnTypes[i].getType();
+ // check nested type parameters
+ checkGenericsUsage(nType, nType.redirect());
+ // check bounds
if (!nType.isDerivedFrom(cnType)) {
if (cnType.isInterface() && nType.implementsInterface(cnType)) continue;
addError("The type " + nTypes[i].getName() +
http://git-wip-us.apache.org/repos/asf/groovy/blob/8ee3bd96/src/test/gls/generics/GenericsTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/gls/generics/GenericsTest.groovy b/src/test/gls/generics/GenericsTest.groovy
index a7865cd..5512738 100644
--- a/src/test/gls/generics/GenericsTest.groovy
+++ b/src/test/gls/generics/GenericsTest.groovy
@@ -564,6 +564,18 @@ import java.util.concurrent.atomic.AtomicInteger
shouldFailCompilationWithMessages '''
def now = new Date<Calendar>()
''', ['supplied with 1 type parameter', 'which takes no parameters']
+ shouldFailCompilationWithMessages '''
+ def method(Map<String> map) { map.toString() }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
+ shouldFailCompilationWithMessages '''
+ def method(Map<String, Map<String>> map) { map.toString() }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
+ shouldFailCompilationWithMessages '''
+ class MyClass { Map<String> map }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
+ shouldFailCompilationWithMessages '''
+ class MyClass { Map<String, Map<String>> map }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
assertScript '''
List<String> ss = new LinkedList<>()
'''
[3/3] groovy git commit: GROOVY-8211: part two - check declaration
expressions
Posted by pa...@apache.org.
GROOVY-8211: part two - check declaration expressions
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d862bdbd
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d862bdbd
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d862bdbd
Branch: refs/heads/GROOVY_2_6_X
Commit: d862bdbdc0439479ed3162a1b2e89517cfc3c98c
Parents: 8ee3bd9
Author: Paul King <pa...@asert.com.au>
Authored: Thu Apr 12 23:38:37 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Apr 12 23:47:55 2018 +1000
----------------------------------------------------------------------
.../codehaus/groovy/control/GenericsVisitor.java | 18 ++++++++++++++++++
src/test/gls/generics/GenericsTest.groovy | 6 ++++++
src/test/groovy/bugs/Groovy4190Bug.groovy | 4 ++--
.../org/codehaus/groovy/ast/LineColumnCheck.txt | 2 +-
.../groovy/ast/LineColumnCheck_antlr2.txt | 6 +++---
.../groovy/ast/LineColumnCheck_antlr4.txt | 6 +++---
6 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
index b4f3854..e623b18 100644
--- a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java
@@ -26,6 +26,9 @@ import org.codehaus.groovy.ast.InnerClassNode;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
+import org.codehaus.groovy.ast.expr.DeclarationExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.TupleExpression;
/**
* Verify correct usage of generics.
@@ -86,6 +89,21 @@ public class GenericsVisitor extends ClassCodeVisitorSupport {
super.visitMethod(node);
}
+ @Override
+ public void visitDeclarationExpression(DeclarationExpression expression) {
+ if (expression.isMultipleAssignmentDeclaration()) {
+ TupleExpression tExpr = expression.getTupleExpression();
+ for (Expression nextExpr : tExpr.getExpressions()) {
+ ClassNode declType = nextExpr.getType();
+ checkGenericsUsage(declType, declType.redirect());
+ }
+ } else {
+ ClassNode declType = expression.getVariableExpression().getType();
+ checkGenericsUsage(declType, declType.redirect());
+ }
+ super.visitDeclarationExpression(expression);
+ }
+
private boolean checkWildcard(ClassNode cn) {
ClassNode sn = cn.getUnresolvedSuperClass(false);
if (sn == null) return false;
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/test/gls/generics/GenericsTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/gls/generics/GenericsTest.groovy b/src/test/gls/generics/GenericsTest.groovy
index 5512738..2ff0c10 100644
--- a/src/test/gls/generics/GenericsTest.groovy
+++ b/src/test/gls/generics/GenericsTest.groovy
@@ -576,6 +576,12 @@ import java.util.concurrent.atomic.AtomicInteger
shouldFailCompilationWithMessages '''
class MyClass { Map<String, Map<String>> map }
''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
+ shouldFailCompilationWithMessages '''
+ def method() { Map<String> map }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
+ shouldFailCompilationWithMessages '''
+ def method() { Map<String, Map<String>> map }
+ ''', ['(supplied with 1 type parameter)', 'which takes 2 parameters']
assertScript '''
List<String> ss = new LinkedList<>()
'''
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/test/groovy/bugs/Groovy4190Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy4190Bug.groovy b/src/test/groovy/bugs/Groovy4190Bug.groovy
index 1250a69..8e06158 100644
--- a/src/test/groovy/bugs/Groovy4190Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4190Bug.groovy
@@ -41,11 +41,11 @@ class Groovy4190Bug extends CompilableTestSupport {
void testGenericsUsageInMethodCall2() {
shouldCompile """
- class Test4190V2<E> {
+ class Test4190V2<K,V> {
public static void main(String[] args) {
Test4190V2<Integer, String> t = Test4190V2.<Integer, String>create();
}
}
"""
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt b/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
index 825bb63..a40cb62 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
@@ -256,7 +256,7 @@ class Bean {
public value
}
def bean = new Bean(value:42)
-def vlaue = bean.@value
+def value = bean.@value
:::[AttributeExpression,(5:13),(5:24)][VariableExpression,(5:13),(5:17)][ConstantExpression,(5:19),(5:24)]
###AttributeExpression2:::
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
index 54e707d..15ab366 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
@@ -192,9 +192,9 @@ Collection<? super File> c
[ClassNode,(1:20),(1:24)]
###typeArgumentsLowerAndUpperBound:::
-Collection<? extends String,? super File> c
-:::[ClassNode,(1:1),(1:11)][GenericsType,(1:12),(1:28)][ClassNode,(-1:-1),(-1:-1)][ClassNode,(1:22),(1:28)];
-[GenericsType,(1:29),(1:41)][ClassNode,(-1:-1),(-1:-1)][ClassNode,(1:37),(1:41)]
+Map<? extends String,? super File> m
+:::[ClassNode,(1:1),(1:4)][GenericsType,(1:5),(1:21)][ClassNode,(-1:-1),(-1:-1)][ClassNode,(1:15),(1:21)];
+[GenericsType,(1:22),(1:34)][ClassNode,(-1:-1),(-1:-1)][ClassNode,(1:30),(1:34)]
###typeArgumentNested:::
class C<Y,T extends Map<String,Map<Y,Integer>>> {}
http://git-wip-us.apache.org/repos/asf/groovy/blob/d862bdbd/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
index 4eb0cb8..d7dec5b 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
@@ -192,9 +192,9 @@ Collection<? super File> c
[ClassNode,(1:20),(1:24)]
###typeArgumentsLowerAndUpperBound:::
-Collection<? extends String,? super File> c
-:::[ClassNode,(1:1),(1:42)][GenericsType,(1:12),(1:28)][ClassNode,(1:12),(1:13)][ClassNode,(1:22),(1:28)];
-[GenericsType,(1:29),(1:41)][ClassNode,(1:29),(1:30)][ClassNode,(1:37),(1:41)]
+Map<? extends String,? super File> m
+:::[ClassNode,(1:1),(1:35)][GenericsType,(1:5),(1:21)][ClassNode,(1:5),(1:6)][ClassNode,(1:15),(1:21)];
+[GenericsType,(1:22),(1:34)][ClassNode,(1:22),(1:23)][ClassNode,(1:30),(1:34)]
###typeArgumentNested:::
class C<Y,T extends Map<String,Map<Y,Integer>>> {}