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 2016/07/18 01:30:52 UTC
groovy git commit: GROOVY-7856: Adding CompileStatic via compiler
config script to class with eachWithIndex results in exception in instruction
selection phase
Repository: groovy
Updated Branches:
refs/heads/master 38c2a64c7 -> 55c69b6c1
GROOVY-7856: Adding CompileStatic via compiler config script to class with eachWithIndex results in exception in instruction selection phase
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/55c69b6c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/55c69b6c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/55c69b6c
Branch: refs/heads/master
Commit: 55c69b6c1e0045d822949bccea4f04defd4c222d
Parents: 38c2a64
Author: paulk <pa...@asert.com.au>
Authored: Mon Jul 18 11:30:38 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Mon Jul 18 11:30:38 2016 +1000
----------------------------------------------------------------------
.../codehaus/groovy/runtime/DefaultGroovyMethods.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/55c69b6c/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index ca9dba5..c10aaef 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -1926,7 +1926,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self Iterable
* @since 2.3.0
*/
- public static <T> Iterable<T> eachWithIndex(Iterable<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> Iterable<T> eachWithIndex(Iterable<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
eachWithIndex(self.iterator(), closure);
return self;
}
@@ -1941,7 +1941,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self Iterable
* @since 2.3.0
*/
- public static <T> Iterator<T> eachWithIndex(Iterator<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> Iterator<T> eachWithIndex(Iterator<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
final Object[] args = new Object[2];
int counter = 0;
while (self.hasNext()) {
@@ -1962,7 +1962,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self Collection
* @since 2.4.0
*/
- public static <T> Collection<T> eachWithIndex(Collection<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> Collection<T> eachWithIndex(Collection<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
return (Collection<T>) eachWithIndex((Iterable<T>) self, closure);
}
@@ -1976,7 +1976,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self List
* @since 2.4.0
*/
- public static <T> List<T> eachWithIndex(List<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> List<T> eachWithIndex(List<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
return (List<T>) eachWithIndex((Iterable<T>) self, closure);
}
@@ -1990,7 +1990,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self Set
* @since 2.4.0
*/
- public static <T> Set<T> eachWithIndex(Set<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> Set<T> eachWithIndex(Set<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
return (Set<T>) eachWithIndex((Iterable<T>) self, closure);
}
@@ -2004,7 +2004,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @return the self SortedSet
* @since 2.4.0
*/
- public static <T> SortedSet<T> eachWithIndex(SortedSet<T> self, @ClosureParams(value=FromString.class, options="T,Integer") Closure closure) {
+ public static <T> SortedSet<T> eachWithIndex(SortedSet<T> self, @ClosureParams(value=FromString.class, options="T,java.lang.Integer") Closure closure) {
return (SortedSet<T>) eachWithIndex((Iterable<T>) self, closure);
}