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 2016/08/23 02:56:13 UTC
[1/5] groovy git commit: GROOVY-7834: Calculating hashcode of
IntRange by pairing function (closes #388)
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X e15002555 -> 481d4e5e9
GROOVY-7834: Calculating hashcode of IntRange by pairing function (closes #388)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e5cc59e3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e5cc59e3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e5cc59e3
Branch: refs/heads/GROOVY_2_4_X
Commit: e5cc59e35b886a3ec4866a8c3f4d780f5a9a7a62
Parents: 0a6789d
Author: Anand upadhyay <an...@nielsen.com>
Authored: Fri Aug 19 17:13:08 2016 +0530
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:17:21 2016 -0700
----------------------------------------------------------------------
src/main/groovy/lang/IntRange.java | 10 ++++++++++
src/test/groovy/lang/IntRangeTest.groovy | 11 +++++++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e5cc59e3/src/main/groovy/lang/IntRange.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/IntRange.java b/src/main/groovy/lang/IntRange.java
index 60a4c14..867a9f8 100644
--- a/src/main/groovy/lang/IntRange.java
+++ b/src/main/groovy/lang/IntRange.java
@@ -401,4 +401,14 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer> {
step(step, adapter);
return adapter.asList();
}
+
+ @Override
+ public int hashCode(){
+ int hashCode;
+ final int from = this.getFrom();
+ final int to = this.getTo();
+
+ hashCode = new Integer(((from+to+1)*(from+to))/2).intValue()+to;
+ return hashCode;
+ }
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e5cc59e3/src/test/groovy/lang/IntRangeTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/lang/IntRangeTest.groovy b/src/test/groovy/lang/IntRangeTest.groovy
index 73c5a5e..c1afa76 100644
--- a/src/test/groovy/lang/IntRangeTest.groovy
+++ b/src/test/groovy/lang/IntRangeTest.groovy
@@ -138,4 +138,15 @@ class IntRangeTest extends GroovyTestCase {
assert bs[-1..<-7].toString() == '{0, 5}'
assert bs[20..<-8].toString() == '{2, 3}'
}
+
+ void testHashCode(){
+ def maxRange = new IntRange(1,Integer.MAX_VALUE)
+ def rangeWithName = [:]
+ rangeWithName.put(maxRange, "maxRange")
+ def dupRange = new IntRange(1,Integer.MAX_VALUE)
+ assertEquals(rangeWithName.get(dupRange), "maxRange")
+ }
+
+
+
}
[2/5] groovy git commit: findbugs: un-callable method in anonymous
class (closes #389)
Posted by jw...@apache.org.
findbugs: un-callable method in anonymous class (closes #389)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0a6789d0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0a6789d0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0a6789d0
Branch: refs/heads/GROOVY_2_4_X
Commit: 0a6789d06cc6451fcfee174ba638c0494f2827ef
Parents: 2551510
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Aug 21 16:14:55 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:17:21 2016 -0700
----------------------------------------------------------------------
src/main/groovy/lang/MetaClassImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/0a6789d0/src/main/groovy/lang/MetaClassImpl.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java
index 3c49a33..b2c7a0c 100644
--- a/src/main/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/lang/MetaClassImpl.java
@@ -497,10 +497,13 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
class MOPIter extends MethodIndexAction {
boolean useThis;
- public boolean skipClass(CachedClass clazz) {
- return !useThis && clazz == theCachedClass;
+
+ @Override
+ public boolean skipClass(Class clazz) {
+ return !useThis && clazz == theClass;
}
+ @Override
public void methodNameAction(Class clazz, MetaMethodIndex.Entry e) {
if (useThis) {
if (e.methods == null)
[5/5] groovy git commit: Removed uncessery Integer Object creation
Posted by jw...@apache.org.
Removed uncessery Integer Object creation
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/481d4e5e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/481d4e5e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/481d4e5e
Branch: refs/heads/GROOVY_2_4_X
Commit: 481d4e5e972dcb3b8a87eb550fd19f52df69cb85
Parents: e5cc59e
Author: Anand upadhyay <an...@nielsen.com>
Authored: Fri Aug 19 21:38:35 2016 +0530
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:17:22 2016 -0700
----------------------------------------------------------------------
src/main/groovy/lang/IntRange.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/481d4e5e/src/main/groovy/lang/IntRange.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/IntRange.java b/src/main/groovy/lang/IntRange.java
index 867a9f8..154658b 100644
--- a/src/main/groovy/lang/IntRange.java
+++ b/src/main/groovy/lang/IntRange.java
@@ -408,7 +408,7 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer> {
final int from = this.getFrom();
final int to = this.getTo();
- hashCode = new Integer(((from+to+1)*(from+to))/2).intValue()+to;
+ hashCode = ((from+to+1)*(from+to))/2+to;
return hashCode;
}
}
[4/5] groovy git commit: findbugs: impossible cast
Posted by jw...@apache.org.
findbugs: impossible cast
removed cast that would always fail and added some basic tests.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/25515104
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/25515104
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/25515104
Branch: refs/heads/GROOVY_2_4_X
Commit: 25515104e949b99a2aa3809a33f1af844841cebb
Parents: 2a8153b
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Aug 21 15:25:41 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:17:21 2016 -0700
----------------------------------------------------------------------
.../runtime/typehandling/ShortTypeHandling.java | 1 -
.../typehandling/ShortTypeHandlingTest.groovy | 64 ++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/25515104/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java b/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
index 44c0276..f45ca0c 100644
--- a/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
+++ b/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
@@ -41,7 +41,6 @@ public class ShortTypeHandling {
public static String castToString(Object object) {
if (object==null) return null;
- if (object instanceof Class) return (String) object;
return object.toString();
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/25515104/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy b/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
new file mode 100644
index 0000000..6eba4fa
--- /dev/null
+++ b/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.codehaus.groovy.runtime.typehandling
+
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToClass
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToString
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToChar
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToEnum
+
+class ShortTypeHandlingTest extends GroovyTestCase {
+
+ void testCastToClass() {
+ assert castToClass(null) == null
+ assert castToClass(Integer.class) == Integer.class
+ assert castToClass('java.lang.String') == String.class
+ shouldFail(GroovyCastException) {
+ castToClass(Collections.emptyList())
+ }
+ }
+
+ void testCastToString() {
+ assert castToString(null) == null
+ assert castToString(String.class) == 'class java.lang.String'
+ assert castToString(List.class) == 'interface java.util.List'
+ }
+
+ void testCastToCharacter() {
+ assert castToChar(null) == null
+ char c = (char)'c'
+ assert castToChar((Object)c) == c
+ assert castToChar(Integer.valueOf(99)) == c
+ assert castToChar("${c}") == c
+ assert castToChar('c') == c
+ shouldFail(GroovyCastException) {
+ castToChar(new Date())
+ }
+ }
+
+ void testCastToEnum() {
+ assert castToEnum(null, TestStages) == null
+ assert castToEnum((Object)TestStages.AFTER_CLASS, TestStages) == TestStages.AFTER_CLASS
+ assert castToEnum("BEFORE_TEST", TestStages) == TestStages.BEFORE_TEST
+ }
+
+ enum TestStages {
+ BEFORE_CLASS, BEFORE_TEST, TEST, AFTER_TEST, AFTER_CLASS
+ }
+}
[3/5] groovy git commit: findbugs: impossible instanceof
Posted by jw...@apache.org.
findbugs: impossible instanceof
loop.getBooleanExpression() can't return a ConstantExpression and the if branch never executed.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2a8153b5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2a8153b5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2a8153b5
Branch: refs/heads/GROOVY_2_4_X
Commit: 2a8153b571ad738f193be1118e253cf8dfdc7354
Parents: e150025
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Aug 21 14:46:58 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:17:21 2016 -0700
----------------------------------------------------------------------
.../org/codehaus/groovy/classgen/asm/StatementWriter.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/2a8153b5/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
index fb755da..471ace4 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
@@ -25,6 +25,7 @@ import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.BooleanExpression;
import org.codehaus.groovy.ast.expr.ClosureListExpression;
import org.codehaus.groovy.ast.expr.ConstantExpression;
import org.codehaus.groovy.ast.expr.EmptyExpression;
@@ -228,10 +229,10 @@ public class StatementWriter {
Label breakLabel = controller.getCompileStack().getBreakLabel();
mv.visitLabel(continueLabel);
- Expression bool = loop.getBooleanExpression();
+ BooleanExpression bool = loop.getBooleanExpression();
boolean boolHandled = false;
- if (bool instanceof ConstantExpression) {
- ConstantExpression constant = (ConstantExpression) bool;
+ if (bool.getExpression() instanceof ConstantExpression) {
+ ConstantExpression constant = (ConstantExpression) bool.getExpression();
if (constant.getValue()==Boolean.TRUE) {
boolHandled = true;
// do nothing