You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2017/06/05 23:34:39 UTC
groovy git commit: Fix type-inference failures
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 0aeb0a773 -> fe20e3741
Fix type-inference failures
Since the target for the 2_6_X branch is JDK 7, generalized
target-type inference is not available.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fe20e374
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fe20e374
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fe20e374
Branch: refs/heads/GROOVY_2_6_X
Commit: fe20e3741315b01e19517e9fbf71311fdde5afe5
Parents: 0aeb0a7
Author: John Wagenleitner <jw...@apache.org>
Authored: Mon Jun 5 16:29:14 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Jun 5 16:29:14 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 2 +-
.../main/java/org/apache/groovy/parser/antlr4/ModifierManager.java | 2 +-
.../java/org/apache/groovy/parser/antlr4/internal/AtnManager.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/fe20e374/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
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 ec1020b..add3e6d 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
@@ -3990,7 +3990,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
}
- private static final Map<ClassNode, Object> TYPE_DEFAULT_VALUE_MAP = Maps.of(
+ private static final Map<ClassNode, Object> TYPE_DEFAULT_VALUE_MAP = Maps.<ClassNode, Object>of(
ClassHelper.int_TYPE, 0,
ClassHelper.long_TYPE, 0L,
ClassHelper.double_TYPE, 0.0D,
http://git-wip-us.apache.org/repos/asf/groovy/blob/fe20e374/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
index 4032938..a1de685 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
@@ -46,7 +46,7 @@ import static org.codehaus.groovy.runtime.DefaultGroovyMethods.asBoolean;
* Created by Daniel.Sun on 2016/08/27.
*/
class ModifierManager {
- private static final Map<Class, List<Integer>> INVALID_MODIFIERS_MAP = Maps.of(
+ private static final Map<Class, List<Integer>> INVALID_MODIFIERS_MAP = Maps.<Class, List<Integer>>of(
ConstructorNode.class, Arrays.asList(STATIC, FINAL, ABSTRACT, NATIVE),
MethodNode.class, Arrays.asList(VOLATILE/*, TRANSIENT*/)
);
http://git-wip-us.apache.org/repos/asf/groovy/blob/fe20e374/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java
index 11dfdb5..b000f5b 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java
@@ -41,7 +41,7 @@ public class AtnManager {
private static final int CACHE_THRESHOLD;
private final Class ownerClass;
private final ATN atn;
- private static final Map<Class, AtnWrapper> ATN_MAP = Maps.of(
+ private static final Map<Class, AtnWrapper> ATN_MAP = Maps.<Class, AtnWrapper>of(
GroovyLangLexer.class, new AtnWrapper(GroovyLangLexer._ATN),
GroovyLangParser.class, new AtnWrapper(GroovyLangParser._ATN)
);