groovy git commit: Minor refactor `StaticTypesLambdaWriter` and remove useless code
Repository: groovy
Updated Branches:
refs/heads/master ec52f9425 -> ea0418c72
Minor refactor `StaticTypesLambdaWriter` and remove useless code
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ea0418c7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ea0418c7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ea0418c7
Branch: refs/heads/master
Commit: ea0418c72f8b13ae99e231dcd6f8c9756f4b1f22
Parents: ec52f94
Author: Daniel Sun
Authored: Tue Dec 4 23:41:29 2018 +0800
Committer: Daniel Sun
Committed: Tue Dec 4 23:41:29 2018 +0800
--
.../asm/sc/StaticTypesLambdaWriter.java | 69
1 file changed, 12 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/ea0418c7/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
--
diff --git
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
index 381262f..523c011 100644
---
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
+++
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
@@ -76,20 +76,16 @@ public class StaticTypesLambdaWriter extends LambdaWriter {
private static final String LAMBDA_THIS = "__lambda_this";
private static final String INIT = "";
private static final String IS_GENERATED_CONSTRUCTOR =
"__IS_GENERATED_CONSTRUCTOR";
-private StaticTypesClosureWriter staticTypesClosureWriter;
-private WriterController controller;
-private WriterControllerFactory factory;
+private final StaticTypesClosureWriter staticTypesClosureWriter;
+private final WriterController controller;
+private final WriterControllerFactory factory;
private final Map lambdaClassMap = new HashMap<>();
public StaticTypesLambdaWriter(WriterController wc) {
super(wc);
this.staticTypesClosureWriter = new StaticTypesClosureWriter(wc);
this.controller = wc;
-this.factory = new WriterControllerFactory() {
-public WriterController makeController(final WriterController
normalController) {
-return controller;
-}
-};
+this.factory = normalController -> controller;
}
@Override
@@ -126,47 +122,6 @@ public class StaticTypesLambdaWriter extends LambdaWriter {
createBootstrapMethodArguments(abstractMethodDesc,
lambdaWrapperClassNode, syntheticLambdaMethodNode)
);
operandStack.replace(redirect, 2);
-
-if (null != expression.getNodeMetaData(INFERRED_LAMBDA_TYPE)) {
-// FIXME declaring variable whose initial value is a lambda, e.g.
`Function f = (Integer e) -> 'a' + e`
-// Groovy will `POP` automatically, use `DUP` to duplicate
the element of operand stack:
-/*
-INVOKEDYNAMIC
apply(LTest1$_p_lambda1;LTest1;)Ljava/util/function/Function; [
- // handle kind 0x6 : INVOKESTATIC
-
java/lang/invoke/LambdaMetafactory.metafactory(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;
- // arguments:
- (Ljava/lang/Object;)Ljava/lang/Object;,
- // handle kind 0x5 : INVOKEVIRTUAL
-
Test1$_p_lambda1.doCall(LTest1;Ljava/lang/Integer;)Ljava/lang/String;,
- (Ljava/lang/Integer;)Ljava/lang/String;
-]
-DUP <-- FIXME ADDED ON PURPOSE, WE
SHOULD REMOVE IT AFTER FIND BETTER SOLUTION
-ASTORE 0
- L2
-ALOAD 0
-POP <-- Since operand stack is not
empty, the `POP`s are issued by `controller.getOperandStack().popDownTo(mark);`
in the method
`org.codehaus.groovy.classgen.asm.StatementWriter.writeExpressionStatement`,
but when we try to `operandStack.pop();` instead of `mv.visitInsn(DUP);`, we
will get AIOOBE...
-POP
-*/
-
-mv.visitInsn(DUP);
-
-/*
-
org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
-General error during class generation: size==0
-
-java.lang.ArrayIndexOutOfBoundsException: size==0
-at
org.codehaus.groovy.classgen.asm.OperandStack.getTopOperand(OperandStack.java:693)
-at
org.codehaus.groovy.classgen.asm.BinaryExpressionHelper.evaluateEqual(Bina
groovy git commit: minor refactor: make exclude more robust against packaging changes
Repository: groovy
Updated Branches:
refs/heads/master 186bf012a -> bac665c68
minor refactor: make exclude more robust against packaging changes
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/bac665c6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/bac665c6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/bac665c6
Branch: refs/heads/master
Commit: bac665c68d0c95edb737df73f7dbaca661be9a1a
Parents: 186bf01
Author: Paul King
Authored: Mon Sep 24 13:59:50 2018 +1000
Committer: Paul King
Committed: Mon Sep 24 13:59:50 2018 +1000
--
subprojects/groovy-nio/build.gradle | 2 +-
subprojects/groovy-templates/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/bac665c6/subprojects/groovy-nio/build.gradle
--
diff --git a/subprojects/groovy-nio/build.gradle
b/subprojects/groovy-nio/build.gradle
index 26109dc..903310e 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -20,7 +20,7 @@ dependencies {
compile rootProject
testCompile project(':groovy-test')
testCompile ("org.spockframework:spock-core:$spockVersion") {
-exclude module: 'groovy-all'
+exclude group: 'org.codehaus.groovy'
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/bac665c6/subprojects/groovy-templates/build.gradle
--
diff --git a/subprojects/groovy-templates/build.gradle
b/subprojects/groovy-templates/build.gradle
index 4805b1c..72c120e 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -22,7 +22,7 @@ dependencies {
testCompile rootProject.sourceSets.test.runtimeClasspath
testCompile project(':groovy-test')
testCompile("org.spockframework:spock-core:$spockVersion") {
-exclude module: 'groovy-all'
+exclude group: 'org.codehaus.groovy'
}
}
[2/2] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4b4a286e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4b4a286e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4b4a286e
Branch: refs/heads/GROOVY_2_5_X
Commit: 4b4a286e0305de3e88cfbe86f796aa3ca5a1a621
Parents: 50256d8
Author: Paul King
Authored: Fri Aug 17 17:39:10 2018 +1000
Committer: Paul King
Committed: Sun Aug 19 17:01:36 2018 +1000
--
gradle/pomconfigurer.gradle | 3 +++
src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java | 4
2 files changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/4b4a286e/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 68670f1..681b012 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -636,6 +636,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Shruti Gupta'
}
+contributor {
+name 'Ben Yu'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/4b4a286e/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
--
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
index dfc7ea0..84a627f 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
@@ -25,10 +25,6 @@ import java.lang.reflect.Method;
/**
* This class is a general adapter to adapt a closure to any Java interface.
- *
- * @author Ben Yu
- * @author mailto:blackd...@gmx.org";>Jochen Theodorou
- * Jul 27, 2006 3:50:51 PM
*/
public class ConvertedClosure extends ConversionHandler implements
Serializable {
private final String methodName;
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 223366702 -> 85f574318
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/85f57431
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/85f57431
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/85f57431
Branch: refs/heads/master
Commit: 85f57431859bc84bc7a6f4d54c3365557b7cbc05
Parents: 2233667
Author: Paul King
Authored: Fri Aug 17 17:39:10 2018 +1000
Committer: Paul King
Committed: Fri Aug 17 17:39:10 2018 +1000
--
gradle/pomconfigurer.gradle | 3 +++
src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java | 3 ---
src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java | 4
3 files changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/85f57431/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 487b06f..77039ea 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -639,6 +639,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Shruti Gupta'
}
+contributor {
+name 'Ben Yu'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/85f57431/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
--
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
index db8b919..328b503 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java
@@ -37,9 +37,6 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* This class is a general adapter to map a call to a Java interface
* to a given delegate.
- *
- * @author Ben Yu
- * @author mailto:blackd...@gmx.org";>Jochen Theodorou
*/
public abstract class ConversionHandler implements InvocationHandler,
Serializable {
private final Object delegate;
http://git-wip-us.apache.org/repos/asf/groovy/blob/85f57431/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
--
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
index dfc7ea0..84a627f 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
@@ -25,10 +25,6 @@ import java.lang.reflect.Method;
/**
* This class is a general adapter to adapt a closure to any Java interface.
- *
- * @author Ben Yu
- * @author mailto:blackd...@gmx.org";>Jochen Theodorou
- * Jul 27, 2006 3:50:51 PM
*/
public class ConvertedClosure extends ConversionHandler implements
Serializable {
private final String methodName;
[1/2] groovy git commit: minor refactor: slight decoupling of module dependencies
Repository: groovy
Updated Branches:
refs/heads/master 040e8a04c -> 0a6e76dd2
minor refactor: slight decoupling of module dependencies
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0a6e76dd
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0a6e76dd
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0a6e76dd
Branch: refs/heads/master
Commit: 0a6e76dd2f816eef4ce83e94a97c156ad6b2d2cc
Parents: 26cacfc
Author: Paul King
Authored: Mon Jul 9 16:28:15 2018 +1000
Committer: Paul King
Committed: Mon Jul 9 16:31:04 2018 +1000
--
build.gradle| 1 +
subprojects/groovy-ant/build.gradle | 5 -
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/0a6e76dd/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 8e0c92c..7fd5ee7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -241,6 +241,7 @@ dependencies {
antlr2 "org.apache.ant:ant-antlr:$antVersion"
testCompile project(':groovy-ant')
+testCompile project(':groovy-xml')
testCompile project(':groovy-dateutil')
testCompile project(':groovy-test')
testCompile project(':groovy-macro')
http://git-wip-us.apache.org/repos/asf/groovy/blob/0a6e76dd/subprojects/groovy-ant/build.gradle
--
diff --git a/subprojects/groovy-ant/build.gradle
b/subprojects/groovy-ant/build.gradle
index 6fb5ba4..045cf4b 100644
--- a/subprojects/groovy-ant/build.gradle
+++ b/subprojects/groovy-ant/build.gradle
@@ -25,8 +25,11 @@ dependencies {
runtime "org.apache.ant:ant-launcher:$antVersion"
runtime "org.apache.ant:ant-antlr:$antVersion"
// for groovydoc ant command
-compile project(':groovy-groovydoc')
+compile project(':groovy-groovydoc'), {
+transitive = false
+}
testCompile project(':groovy-test')
+testCompile project(':groovy-xml')
}
apply from: "${rootProject.projectDir}/gradle/jacoco/jacocofix.gradle"
\ No newline at end of file
[2/2] groovy git commit: minor refactor: move some tests into their respective modules
minor refactor: move some tests into their respective modules
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/26cacfc7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/26cacfc7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/26cacfc7
Branch: refs/heads/master
Commit: 26cacfc79882e081d079e9aea2165cf9ef6d0af2
Parents: 040e8a0
Author: Paul King
Authored: Mon Jul 9 15:22:21 2018 +1000
Committer: Paul King
Committed: Mon Jul 9 16:31:04 2018 +1000
--
.../groovy/bugs/groovy4585/groovy4585.xml | 32 -
.../groovy/bugs/groovy4585/Groovy4585Bug.groovy | 31 -
src/test/groovy/tree/NavigationNodeTest.groovy | 58 ++
src/test/groovy/tree/NavigationTest.groovy | 116 ---
.../groovy/util/DelegatingScriptTest.groovy | 58 +-
.../groovy/bugs/groovy4585/Groovy4585Bug.groovy | 31 +
.../resources/bugs/groovy4585/groovy4585.xml| 32 +
.../groovy/groovy/tree/NavigationXmlTest.groovy | 86 ++
8 files changed, 237 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/26cacfc7/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
--
diff --git a/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
b/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
deleted file mode 100644
index 6dcf2bb..000
--- a/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-<%for (int i = 0; i < names.size(); i++) {%>
-
-
-
-<%}%>
-
-
http://git-wip-us.apache.org/repos/asf/groovy/blob/26cacfc7/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
--
diff --git a/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
b/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
deleted file mode 100644
index 0dc274c..000
--- a/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 groovy.bugs.groovy4585
-
-class Groovy4585Bug extends GroovyTestCase {
-void test() {
-def engineForBuildXml = new groovy.text.SimpleTemplateEngine(false)
-engineForBuildXml.setEscapeBackslash(true)
-def templateForBuildXml =
engineForBuildXml.createTemplate(this.getClass().getResource("/groovy/bugs/groovy4585/groovy4585.xml").text)
-String buildXmlContent = templateForBuildXml.make([names:['a', 'b',
'c']]).toString()
-
-assert buildXmlContent.contains('')
-assert buildXmlContent.contains('')
-}
-}
http://git-wip-us.apache.org/repos/asf/groovy/blob/26cacfc7/src/test/groovy/tree/NavigationNodeTest.groovy
--
diff --git a/src/test/groovy/tree/NavigationNodeTest.groovy
b/src/test/groovy/tree/NavigationNodeTest.groovy
new file mode 100644
index 000..2ff997d
--- /dev/null
+++ b/src/test/groovy/tree/NavigationNodeTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * 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 groovy.tree
groovy git commit: minor refactor: slight decoupling of module dependencies
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 54d9d8188 -> cca1bbbe9
minor refactor: slight decoupling of module dependencies
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/cca1bbbe
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cca1bbbe
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cca1bbbe
Branch: refs/heads/GROOVY_2_5_X
Commit: cca1bbbe9470afabebfc234c1a0794e669b6938e
Parents: 54d9d81
Author: Paul King
Authored: Mon Jul 9 16:28:15 2018 +1000
Committer: Paul King
Committed: Mon Jul 9 16:28:15 2018 +1000
--
build.gradle| 1 +
subprojects/groovy-ant/build.gradle | 5 -
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/cca1bbbe/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 355094f..82b15c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -242,6 +242,7 @@ dependencies {
antlr "org.apache.ant:ant-antlr:$antVersion"
testCompile project(':groovy-ant')
+testCompile project(':groovy-xml')
testCompile project(':groovy-dateutil')
testCompile project(':groovy-test')
testCompile project(':groovy-macro')
http://git-wip-us.apache.org/repos/asf/groovy/blob/cca1bbbe/subprojects/groovy-ant/build.gradle
--
diff --git a/subprojects/groovy-ant/build.gradle
b/subprojects/groovy-ant/build.gradle
index 6fb5ba4..045cf4b 100644
--- a/subprojects/groovy-ant/build.gradle
+++ b/subprojects/groovy-ant/build.gradle
@@ -25,8 +25,11 @@ dependencies {
runtime "org.apache.ant:ant-launcher:$antVersion"
runtime "org.apache.ant:ant-antlr:$antVersion"
// for groovydoc ant command
-compile project(':groovy-groovydoc')
+compile project(':groovy-groovydoc'), {
+transitive = false
+}
testCompile project(':groovy-test')
+testCompile project(':groovy-xml')
}
apply from: "${rootProject.projectDir}/gradle/jacoco/jacocofix.gradle"
\ No newline at end of file
groovy git commit: minor refactor: move some tests into their respective modules
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 9dbbbffb9 -> 54d9d8188
minor refactor: move some tests into their respective modules
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/54d9d818
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/54d9d818
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/54d9d818
Branch: refs/heads/GROOVY_2_5_X
Commit: 54d9d8188fe5e0cd548490290364ec7d90b00a56
Parents: 9dbbbff
Author: Paul King
Authored: Mon Jul 9 15:22:21 2018 +1000
Committer: Paul King
Committed: Mon Jul 9 15:22:21 2018 +1000
--
.../groovy/bugs/groovy4585/groovy4585.xml | 32 -
.../groovy/bugs/groovy4585/Groovy4585Bug.groovy | 31 -
src/test/groovy/tree/NavigationNodeTest.groovy | 58 ++
src/test/groovy/tree/NavigationTest.groovy | 116 ---
.../groovy/util/DelegatingScriptTest.groovy | 58 +-
.../groovy/bugs/groovy4585/Groovy4585Bug.groovy | 31 +
.../resources/bugs/groovy4585/groovy4585.xml| 32 +
.../groovy/groovy/tree/NavigationXmlTest.groovy | 86 ++
8 files changed, 237 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/54d9d818/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
--
diff --git a/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
b/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
deleted file mode 100644
index 6dcf2bb..000
--- a/src/test-resources/groovy/bugs/groovy4585/groovy4585.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-<%for (int i = 0; i < names.size(); i++) {%>
-
-
-
-<%}%>
-
-
http://git-wip-us.apache.org/repos/asf/groovy/blob/54d9d818/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
--
diff --git a/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
b/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
deleted file mode 100644
index 0dc274c..000
--- a/src/test/groovy/bugs/groovy4585/Groovy4585Bug.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 groovy.bugs.groovy4585
-
-class Groovy4585Bug extends GroovyTestCase {
-void test() {
-def engineForBuildXml = new groovy.text.SimpleTemplateEngine(false)
-engineForBuildXml.setEscapeBackslash(true)
-def templateForBuildXml =
engineForBuildXml.createTemplate(this.getClass().getResource("/groovy/bugs/groovy4585/groovy4585.xml").text)
-String buildXmlContent = templateForBuildXml.make([names:['a', 'b',
'c']]).toString()
-
-assert buildXmlContent.contains('')
-assert buildXmlContent.contains('')
-}
-}
http://git-wip-us.apache.org/repos/asf/groovy/blob/54d9d818/src/test/groovy/tree/NavigationNodeTest.groovy
--
diff --git a/src/test/groovy/tree/NavigationNodeTest.groovy
b/src/test/groovy/tree/NavigationNodeTest.groovy
new file mode 100644
index 000..2ff997d
--- /dev/null
+++ b/src/test/groovy/tree/NavigationNodeTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * 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 la
groovy git commit: minor refactor - no need to loop through array when we have a set of names now
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X adfc7e394 -> eda1f82b9
minor refactor - no need to loop through array when we have a set of names now
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/eda1f82b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/eda1f82b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/eda1f82b
Branch: refs/heads/GROOVY_2_6_X
Commit: eda1f82b958cb4840c4749f987935f2e2b4bef05
Parents: adfc7e3
Author: Daniel Sun
Authored: Mon May 14 21:56:22 2018 +1000
Committer: Paul King
Committed: Mon May 14 21:59:03 2018 +1000
--
.../org/codehaus/groovy/control/CompilerConfiguration.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/eda1f82b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
--
diff --git
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 6fa0961..559a974 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -763,10 +763,8 @@ public class CompilerConfiguration {
* @param version the bytecode compatibility level
*/
public void setTargetBytecode(String version) {
-for (String allowedJdk : ALLOWED_JDKS) {
-if (allowedJdk.equals(version)) {
-this.targetBytecode = version;
-}
+if (JDK_TO_BYTECODE_VERSION_MAP.keySet().contains(version)) {
+this.targetBytecode = version;
}
}
groovy git commit: minor refactor - no need to loop through array when we have a set of names now
Repository: groovy
Updated Branches:
refs/heads/master 4439e3a27 -> 62f877abd
minor refactor - no need to loop through array when we have a set of names now
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/62f877ab
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/62f877ab
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/62f877ab
Branch: refs/heads/master
Commit: 62f877abd28c62e3058a383905bb93624ef36130
Parents: 4439e3a
Author: Daniel Sun
Authored: Mon May 14 21:56:22 2018 +1000
Committer: Paul King
Committed: Mon May 14 21:56:22 2018 +1000
--
.../org/codehaus/groovy/control/CompilerConfiguration.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/62f877ab/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
--
diff --git
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index e03ea4f..04d9e99 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -762,10 +762,8 @@ public class CompilerConfiguration {
* @param version the bytecode compatibility level
*/
public void setTargetBytecode(String version) {
-for (String allowedJdk : ALLOWED_JDKS) {
-if (allowedJdk.equals(version)) {
-this.targetBytecode = version;
-}
+if (JDK_TO_BYTECODE_VERSION_MAP.keySet().contains(version)) {
+this.targetBytecode = version;
}
}
[1/5] groovy git commit: minor refactor: prepare to remove some duplicated code
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 07bcbcf43 -> e9d8dffca
minor refactor: prepare to remove some duplicated code
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/19b011e4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/19b011e4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/19b011e4
Branch: refs/heads/GROOVY_2_5_X
Commit: 19b011e460f9255b0627d75d1a23f427ac19f5e5
Parents: 07bcbcf
Author: paulk
Authored: Thu Jan 25 21:13:01 2018 +1000
Committer: paulk
Committed: Wed Jan 31 22:41:27 2018 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 8 ++--
.../TupleConstructorASTTransformation.java | 48 ++--
2 files changed, 28 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/19b011e4/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index 84196e3..986a439 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -463,16 +463,16 @@ public class GeneralUtils {
return result;
}
-public static List getAllFields(Set names, ClassNode
cNode, boolean includeProperties, boolean includeFields, boolean allProperties,
boolean traverseSuperClasses) {
-return getAllFields(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
+public static List getAllProperties(Set names,
ClassNode cNode, boolean includeProperties, boolean includeFields, boolean
allProperties, boolean traverseSuperClasses) {
+return getAllProperties(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
}
-private static List getAllFields(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
+private static List getAllProperties(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
final List result;
if (cNode == ClassHelper.OBJECT_TYPE || !traverseSuperClasses) {
result = new ArrayList();
} else {
-result = getAllFields(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
+result = getAllProperties(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
}
if (includeProperties) {
for (PropertyNode pNode : cNode.getProperties()) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/19b011e4/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
index c253d93..2815cb1 100644
---
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
@@ -61,7 +61,7 @@ import static
org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static
org.codehaus.groovy.ast.tools.GeneralUtils.copyStatementsWithSuperAdjustment;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.equalsNullX;
-import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllFields;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllProperties;
import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS;
@@ -136,18 +136,9 @@ public class TupleConstructorASTTransformation extends
AbstractASTTransformation
return;
}
-// TODO remove duplication between various paths below
-List list =
ImmutableASTTransformation.getProperties(cNode, includeSuperProperties,
allProperties);
-boolean specialHashMapCase =
ImmutableASTTransformation.isSpecialHashMapCase(list);
-if (makeImmutable) {
-if (!specialHashMapCase) {
-ImmutableASTTransformation.createConstructorOrdered(cNode,
list);
-}
-} else {
-createC
[1/5] groovy git commit: minor refactor: prepare to remove some duplicated code
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X addd312aa -> 6e533451e
minor refactor: prepare to remove some duplicated code
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3ad9a0ea
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3ad9a0ea
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3ad9a0ea
Branch: refs/heads/GROOVY_2_6_X
Commit: 3ad9a0ea7bbeba122095713adc2da215d2c7b3d7
Parents: addd312
Author: paulk
Authored: Thu Jan 25 21:13:01 2018 +1000
Committer: paulk
Committed: Wed Jan 31 22:40:30 2018 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 8 ++--
.../TupleConstructorASTTransformation.java | 48 ++--
2 files changed, 28 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/3ad9a0ea/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index b61ae64..807ea7d 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -466,16 +466,16 @@ public class GeneralUtils {
return result;
}
-public static List getAllFields(Set names, ClassNode
cNode, boolean includeProperties, boolean includeFields, boolean allProperties,
boolean traverseSuperClasses) {
-return getAllFields(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
+public static List getAllProperties(Set names,
ClassNode cNode, boolean includeProperties, boolean includeFields, boolean
allProperties, boolean traverseSuperClasses) {
+return getAllProperties(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
}
-private static List getAllFields(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
+private static List getAllProperties(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
final List result;
if (cNode == ClassHelper.OBJECT_TYPE || !traverseSuperClasses) {
result = new ArrayList();
} else {
-result = getAllFields(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
+result = getAllProperties(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
}
if (includeProperties) {
for (PropertyNode pNode : cNode.getProperties()) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/3ad9a0ea/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
index 179ba1a..7cefac6 100644
---
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
@@ -61,7 +61,7 @@ import static
org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static
org.codehaus.groovy.ast.tools.GeneralUtils.copyStatementsWithSuperAdjustment;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.equalsNullX;
-import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllFields;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllProperties;
import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS;
@@ -136,18 +136,9 @@ public class TupleConstructorASTTransformation extends
AbstractASTTransformation
return;
}
-// TODO remove duplication between various paths below
-List list =
ImmutableASTTransformation.getProperties(cNode, includeSuperProperties,
allProperties);
-boolean specialHashMapCase =
ImmutableASTTransformation.isSpecialHashMapCase(list);
-if (makeImmutable) {
-if (!specialHashMapCase) {
-ImmutableASTTransformation.createConstructorOrdered(cNode,
list);
-}
-} else {
-createC
groovy git commit: minor refactor: prepare to remove some duplicated code
Repository: groovy
Updated Branches:
refs/heads/master 7be5f2f82 -> d2706f74b
minor refactor: prepare to remove some duplicated code
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d2706f74
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d2706f74
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d2706f74
Branch: refs/heads/master
Commit: d2706f74b2b3f69b5c40a9416c26a77655a44a23
Parents: 7be5f2f
Author: paulk
Authored: Thu Jan 25 21:13:01 2018 +1000
Committer: paulk
Committed: Thu Jan 25 21:13:01 2018 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 8 ++--
.../TupleConstructorASTTransformation.java | 48 ++--
2 files changed, 28 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/d2706f74/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index b61ae64..807ea7d 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -466,16 +466,16 @@ public class GeneralUtils {
return result;
}
-public static List getAllFields(Set names, ClassNode
cNode, boolean includeProperties, boolean includeFields, boolean allProperties,
boolean traverseSuperClasses) {
-return getAllFields(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
+public static List getAllProperties(Set names,
ClassNode cNode, boolean includeProperties, boolean includeFields, boolean
allProperties, boolean traverseSuperClasses) {
+return getAllProperties(names, cNode, cNode, includeProperties,
includeFields, allProperties, traverseSuperClasses);
}
-private static List getAllFields(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
+private static List getAllProperties(Set names,
ClassNode origType, ClassNode cNode, boolean includeProperties, boolean
includeFields, boolean allProperties, boolean traverseSuperClasses) {
final List result;
if (cNode == ClassHelper.OBJECT_TYPE || !traverseSuperClasses) {
result = new ArrayList();
} else {
-result = getAllFields(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
+result = getAllProperties(names, origType, cNode.getSuperClass(),
includeProperties, includeFields, allProperties, true);
}
if (includeProperties) {
for (PropertyNode pNode : cNode.getProperties()) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/d2706f74/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
index 179ba1a..7cefac6 100644
---
a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
@@ -61,7 +61,7 @@ import static
org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static
org.codehaus.groovy.ast.tools.GeneralUtils.copyStatementsWithSuperAdjustment;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.equalsNullX;
-import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllFields;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllProperties;
import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS;
@@ -136,18 +136,9 @@ public class TupleConstructorASTTransformation extends
AbstractASTTransformation
return;
}
-// TODO remove duplication between various paths below
-List list =
ImmutableASTTransformation.getProperties(cNode, includeSuperProperties,
allProperties);
-boolean specialHashMapCase =
ImmutableASTTransformation.isSpecialHashMapCase(list);
-if (makeImmutable) {
-if (!specialHashMapCase) {
-ImmutableASTTransformation.createConstructorOrdered(cNode,
list);
-}
-} else {
-createConstructor(t
groovy git commit: minor refactor - swap Immutable to Sortable to yield equivalent test but will make a potential future refactoring easier
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 5cffc77e9 -> 78461d126
minor refactor - swap Immutable to Sortable to yield equivalent test but will
make a potential future refactoring easier
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/78461d12
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/78461d12
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/78461d12
Branch: refs/heads/GROOVY_2_5_X
Commit: 78461d126882db715fb9c97816027c4f8242c696
Parents: 5cffc77
Author: paulk
Authored: Sat Jan 6 16:17:49 2018 +1000
Committer: paulk
Committed: Wed Jan 24 18:22:05 2018 +1000
--
.../transform/AnnotationCollectorTest.groovy| 105 ++-
1 file changed, 54 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/78461d12/src/test/groovy/transform/AnnotationCollectorTest.groovy
--
diff --git a/src/test/groovy/transform/AnnotationCollectorTest.groovy
b/src/test/groovy/transform/AnnotationCollectorTest.groovy
index ac22a92..984c6fc 100644
--- a/src/test/groovy/transform/AnnotationCollectorTest.groovy
+++ b/src/test/groovy/transform/AnnotationCollectorTest.groovy
@@ -18,38 +18,41 @@
*/
package groovy.transform
-import org.codehaus.groovy.ast.*;
+import org.codehaus.groovy.ast.AnnotatedNode
+import org.codehaus.groovy.ast.AnnotationNode
+import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.SourceUnit
+import org.codehaus.groovy.transform.AnnotationCollectorTransform
import java.lang.annotation.Retention
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.RetentionPolicy
class AnnotationCollectorTest extends GroovyTestCase {
-static class MyProcessor extends
org.codehaus.groovy.transform.AnnotationCollectorTransform {
-public List visit(AnnotationNode collector,
AnnotationNode aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit
source) {
+static class MyProcessor extends AnnotationCollectorTransform {
+List visit(AnnotationNode collector, AnnotationNode
aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit source) {
def excludes = aliasAnnotationUsage.getMember("excludes")
if (excludes) {
addError("use myex instead of excludes", aliasAnnotationUsage,
source)
return []
}
def myex = aliasAnnotationUsage.getMembers().remove("myex")
-if (myex) aliasAnnotationUsage.addMember("excludes",myex);
+if (myex) aliasAnnotationUsage.addMember("excludes", myex);
return super.visit(collector, aliasAnnotationUsage,
aliasAnnotated, source)
}
}
-public void assertScript(String script) {
+void assertScript(String script) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
shell.evaluate(script, getTestClassName())
}
-public void shouldNotCompile(String script, Closure failureAction) {
+void shouldNotCompile(String script, Closure failureAction) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
try {
shell.parse(script, getTestClassName())
assert false
-} catch
(org.codehaus.groovy.control.MultipleCompilationErrorsException mce) {
+} catch (MultipleCompilationErrorsException mce) {
failureAction(mce)
}
}
@@ -63,23 +66,23 @@ class AnnotationCollectorTest extends GroovyTestCase {
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert PreCompiledAlias.value().length == 0
assert PreCompiledAlias.value() instanceof Object[][]
"""
assertScript """
import groovy.transform.*
-@AnnotationCollector([ToString, EqualsAndHashCode, Immutable])
+@AnnotationCollector([ToString, EqualsAndHashCode, Sortable])
@interface NotPreCompiledAlias {}
@NotPreCompiledAlias
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert NotPreCompiledAlias.value().length == 0
assert NotPreCompiledAlias.value() instanceof Object[][]
"""
@@ -93,28 +96,28 @@ cla
groovy git commit: minor refactor - swap Immutable to Sortable to yield equivalent test but will make a potential future refactoring easier
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X e01dc8d90 -> 3b17152c9
minor refactor - swap Immutable to Sortable to yield equivalent test but will
make a potential future refactoring easier
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3b17152c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3b17152c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3b17152c
Branch: refs/heads/GROOVY_2_6_X
Commit: 3b17152c9d887cf5b8e804ff121b98ff032d32b3
Parents: e01dc8d
Author: paulk
Authored: Sat Jan 6 16:17:49 2018 +1000
Committer: paulk
Committed: Wed Jan 24 18:21:39 2018 +1000
--
.../transform/AnnotationCollectorTest.groovy| 105 ++-
1 file changed, 54 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/3b17152c/src/test/groovy/transform/AnnotationCollectorTest.groovy
--
diff --git a/src/test/groovy/transform/AnnotationCollectorTest.groovy
b/src/test/groovy/transform/AnnotationCollectorTest.groovy
index ac22a92..984c6fc 100644
--- a/src/test/groovy/transform/AnnotationCollectorTest.groovy
+++ b/src/test/groovy/transform/AnnotationCollectorTest.groovy
@@ -18,38 +18,41 @@
*/
package groovy.transform
-import org.codehaus.groovy.ast.*;
+import org.codehaus.groovy.ast.AnnotatedNode
+import org.codehaus.groovy.ast.AnnotationNode
+import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.SourceUnit
+import org.codehaus.groovy.transform.AnnotationCollectorTransform
import java.lang.annotation.Retention
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.RetentionPolicy
class AnnotationCollectorTest extends GroovyTestCase {
-static class MyProcessor extends
org.codehaus.groovy.transform.AnnotationCollectorTransform {
-public List visit(AnnotationNode collector,
AnnotationNode aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit
source) {
+static class MyProcessor extends AnnotationCollectorTransform {
+List visit(AnnotationNode collector, AnnotationNode
aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit source) {
def excludes = aliasAnnotationUsage.getMember("excludes")
if (excludes) {
addError("use myex instead of excludes", aliasAnnotationUsage,
source)
return []
}
def myex = aliasAnnotationUsage.getMembers().remove("myex")
-if (myex) aliasAnnotationUsage.addMember("excludes",myex);
+if (myex) aliasAnnotationUsage.addMember("excludes", myex);
return super.visit(collector, aliasAnnotationUsage,
aliasAnnotated, source)
}
}
-public void assertScript(String script) {
+void assertScript(String script) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
shell.evaluate(script, getTestClassName())
}
-public void shouldNotCompile(String script, Closure failureAction) {
+void shouldNotCompile(String script, Closure failureAction) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
try {
shell.parse(script, getTestClassName())
assert false
-} catch
(org.codehaus.groovy.control.MultipleCompilationErrorsException mce) {
+} catch (MultipleCompilationErrorsException mce) {
failureAction(mce)
}
}
@@ -63,23 +66,23 @@ class AnnotationCollectorTest extends GroovyTestCase {
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert PreCompiledAlias.value().length == 0
assert PreCompiledAlias.value() instanceof Object[][]
"""
assertScript """
import groovy.transform.*
-@AnnotationCollector([ToString, EqualsAndHashCode, Immutable])
+@AnnotationCollector([ToString, EqualsAndHashCode, Sortable])
@interface NotPreCompiledAlias {}
@NotPreCompiledAlias
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert NotPreCompiledAlias.value().length == 0
assert NotPreCompiledAlias.value() instanceof Object[][]
"""
@@ -93,28 +96,28 @@ cla
groovy git commit: minor refactor - swap Immutable to Sortable to yield equivalent test but will make a potential future refactoring easier
Repository: groovy
Updated Branches:
refs/heads/master fece39d61 -> f5e63e577
minor refactor - swap Immutable to Sortable to yield equivalent test but will
make a potential future refactoring easier
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f5e63e57
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f5e63e57
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f5e63e57
Branch: refs/heads/master
Commit: f5e63e5770785b3ae691446f00252bcec3359f79
Parents: fece39d
Author: paulk
Authored: Sat Jan 6 16:17:49 2018 +1000
Committer: paulk
Committed: Sat Jan 6 16:17:49 2018 +1000
--
.../transform/AnnotationCollectorTest.groovy| 105 ++-
1 file changed, 54 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/f5e63e57/src/test/groovy/transform/AnnotationCollectorTest.groovy
--
diff --git a/src/test/groovy/transform/AnnotationCollectorTest.groovy
b/src/test/groovy/transform/AnnotationCollectorTest.groovy
index ac22a92..984c6fc 100644
--- a/src/test/groovy/transform/AnnotationCollectorTest.groovy
+++ b/src/test/groovy/transform/AnnotationCollectorTest.groovy
@@ -18,38 +18,41 @@
*/
package groovy.transform
-import org.codehaus.groovy.ast.*;
+import org.codehaus.groovy.ast.AnnotatedNode
+import org.codehaus.groovy.ast.AnnotationNode
+import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.SourceUnit
+import org.codehaus.groovy.transform.AnnotationCollectorTransform
import java.lang.annotation.Retention
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.RetentionPolicy
class AnnotationCollectorTest extends GroovyTestCase {
-static class MyProcessor extends
org.codehaus.groovy.transform.AnnotationCollectorTransform {
-public List visit(AnnotationNode collector,
AnnotationNode aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit
source) {
+static class MyProcessor extends AnnotationCollectorTransform {
+List visit(AnnotationNode collector, AnnotationNode
aliasAnnotationUsage, AnnotatedNode aliasAnnotated, SourceUnit source) {
def excludes = aliasAnnotationUsage.getMember("excludes")
if (excludes) {
addError("use myex instead of excludes", aliasAnnotationUsage,
source)
return []
}
def myex = aliasAnnotationUsage.getMembers().remove("myex")
-if (myex) aliasAnnotationUsage.addMember("excludes",myex);
+if (myex) aliasAnnotationUsage.addMember("excludes", myex);
return super.visit(collector, aliasAnnotationUsage,
aliasAnnotated, source)
}
}
-public void assertScript(String script) {
+void assertScript(String script) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
shell.evaluate(script, getTestClassName())
}
-public void shouldNotCompile(String script, Closure failureAction) {
+void shouldNotCompile(String script, Closure failureAction) {
GroovyShell shell = new GroovyShell(this.class.classLoader)
try {
shell.parse(script, getTestClassName())
assert false
-} catch
(org.codehaus.groovy.control.MultipleCompilationErrorsException mce) {
+} catch (MultipleCompilationErrorsException mce) {
failureAction(mce)
}
}
@@ -63,23 +66,23 @@ class AnnotationCollectorTest extends GroovyTestCase {
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert PreCompiledAlias.value().length == 0
assert PreCompiledAlias.value() instanceof Object[][]
"""
assertScript """
import groovy.transform.*
-@AnnotationCollector([ToString, EqualsAndHashCode, Immutable])
+@AnnotationCollector([ToString, EqualsAndHashCode, Sortable])
@interface NotPreCompiledAlias {}
@NotPreCompiledAlias
class Foo {
Integer a, b
}
-assert Foo.class.annotations.size()==3
-assert new Foo(1,2).toString() == "Foo(1, 2)"
+assert Foo.class.annotations.size() == 3
+assert new Foo(a: 1, b: 2).toString() == "Foo(1, 2)"
assert NotPreCompiledAlias.value().length == 0
assert NotPreCompiledAlias.value() instanceof Object[][]
"""
@@ -93,28 +96,28 @@ class Annotation
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 4955c999b -> 6f4503471
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6f450347
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6f450347
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6f450347
Branch: refs/heads/GROOVY_2_4_X
Commit: 6f45034719d0f4ee57b33d0cb669a5d28268b264
Parents: 4955c99
Author: paulk
Authored: Thu Nov 23 07:55:06 2017 +1000
Committer: paulk
Committed: Thu Nov 23 13:03:51 2017 +1000
--
gradle/pomconfigurer.gradle | 3 ++
.../groovy/jmx/builder/JmxTimerFactory.groovy | 56 ++--
.../jmx/builder/JmxTimerFactoryTest.groovy | 3 --
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/6f450347/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 197dc42..07e38db 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -588,6 +588,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Stephane Landelle'
}
+contributor {
+name 'Vladimir Vivien'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/6f450347/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
--
diff --git
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index 934ead2..6b51bf7 100644
---
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -39,8 +39,6 @@ import javax.management.ObjectName
* occurences:long
* )
*
- *
- * @author Vladimir Vivien
*/
class JmxTimerFactory extends AbstractFactory {
public Object newInstance(FactoryBuilderSupport builder, Object nodeName,
Object nodeParam, Map nodeAttribs) {
@@ -67,10 +65,10 @@ class JmxTimerFactory extends AbstractFactory {
metaMap.listeners = getNormalizedRecipientList(metaMap.listeners)
def result = registerTimer(metaMap)
-return result
+result
}
-private def getNormalizedName(fsb, timer, name) {
+private static getNormalizedName(fsb, timer, name) {
def result
if (!name) {
result = getDefaultName(fsb, timer)
@@ -80,18 +78,18 @@ class JmxTimerFactory extends AbstractFactory {
} else if (name instanceof ObjectName) {
result = name
} else {
-result = getDefaultName(fsb, time)
+result = getDefaultName(fsb, timer)
}
}
-return result
+result
}
-private def getDefaultName(fsb, timer) {
+private static getDefaultName(fsb, timer) {
def name =
"${fsb.getDefaultJmxNameDomain()}:type=TimerService,name=Timer@${timer.hashCode()}"
-return new ObjectName(name)
+new ObjectName(name)
}
-private def getNormalizedDate(date) {
+private static getNormalizedDate(date) {
if (!date) return new Date()
if (date instanceof Date) {
return date
@@ -103,10 +101,10 @@ class JmxTimerFactory extends AbstractFactory {
default:
startDate = new Date()
}
-return startDate
+startDate
}
-private def getNormalizedPeriod(period) {
+private static getNormalizedPeriod(period) {
if (!period) return 1000L
if (period instanceof Number) {
return period
@@ -117,8 +115,9 @@ class JmxTimerFactory extends AbstractFactory {
def value
try {
value = period[0..-2].toLong()
-} catch (e) {
+} catch (ignore) {
multiplier = "x"
+value = 0
}
switch (multiplier) {
case "s":
@@ -137,28 +136,29 @@ class JmxTimerFactory extends AbstractFactory {
result = 1000L
}
}
-return result
+result
}
-private def getNormalizedRecipientList(list) {
+private static getNormalizedRecipientList(list) {
if (!list) return null
def result = []
-list.each {name ->
+list.each { name ->
def on
if (name instanceof String) {
on = new ObjectName(
[2/2] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8e2e942f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8e2e942f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8e2e942f
Branch: refs/heads/GROOVY_2_5_X
Commit: 8e2e942fea6511ddb87a9927b73cd7c27ce3c0bb
Parents: e28d031
Author: paulk
Authored: Thu Nov 23 07:55:06 2017 +1000
Committer: paulk
Committed: Thu Nov 23 13:02:13 2017 +1000
--
gradle/pomconfigurer.gradle | 3 ++
.../groovy/jmx/builder/JmxTimerFactory.groovy | 56 ++--
.../jmx/builder/JmxTimerFactoryTest.groovy | 3 --
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/8e2e942f/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 197dc42..07e38db 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -588,6 +588,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Stephane Landelle'
}
+contributor {
+name 'Vladimir Vivien'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/8e2e942f/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
--
diff --git
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index 934ead2..6b51bf7 100644
---
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -39,8 +39,6 @@ import javax.management.ObjectName
* occurences:long
* )
*
- *
- * @author Vladimir Vivien
*/
class JmxTimerFactory extends AbstractFactory {
public Object newInstance(FactoryBuilderSupport builder, Object nodeName,
Object nodeParam, Map nodeAttribs) {
@@ -67,10 +65,10 @@ class JmxTimerFactory extends AbstractFactory {
metaMap.listeners = getNormalizedRecipientList(metaMap.listeners)
def result = registerTimer(metaMap)
-return result
+result
}
-private def getNormalizedName(fsb, timer, name) {
+private static getNormalizedName(fsb, timer, name) {
def result
if (!name) {
result = getDefaultName(fsb, timer)
@@ -80,18 +78,18 @@ class JmxTimerFactory extends AbstractFactory {
} else if (name instanceof ObjectName) {
result = name
} else {
-result = getDefaultName(fsb, time)
+result = getDefaultName(fsb, timer)
}
}
-return result
+result
}
-private def getDefaultName(fsb, timer) {
+private static getDefaultName(fsb, timer) {
def name =
"${fsb.getDefaultJmxNameDomain()}:type=TimerService,name=Timer@${timer.hashCode()}"
-return new ObjectName(name)
+new ObjectName(name)
}
-private def getNormalizedDate(date) {
+private static getNormalizedDate(date) {
if (!date) return new Date()
if (date instanceof Date) {
return date
@@ -103,10 +101,10 @@ class JmxTimerFactory extends AbstractFactory {
default:
startDate = new Date()
}
-return startDate
+startDate
}
-private def getNormalizedPeriod(period) {
+private static getNormalizedPeriod(period) {
if (!period) return 1000L
if (period instanceof Number) {
return period
@@ -117,8 +115,9 @@ class JmxTimerFactory extends AbstractFactory {
def value
try {
value = period[0..-2].toLong()
-} catch (e) {
+} catch (ignore) {
multiplier = "x"
+value = 0
}
switch (multiplier) {
case "s":
@@ -137,28 +136,29 @@ class JmxTimerFactory extends AbstractFactory {
result = 1000L
}
}
-return result
+result
}
-private def getNormalizedRecipientList(list) {
+private static getNormalizedRecipientList(list) {
if (!list) return null
def result = []
-list.each {name ->
+list.each { name ->
def on
if (name instanceof String) {
on = new ObjectName(name)
-}
-if (name instanceof ObjectName) {
+} else
[2/3] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4f8f843e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4f8f843e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4f8f843e
Branch: refs/heads/GROOVY_2_6_X
Commit: 4f8f843e0a18e114d31fcd60b169089c88ed6107
Parents: 1660de9
Author: paulk
Authored: Thu Nov 23 07:55:06 2017 +1000
Committer: paulk
Committed: Thu Nov 23 12:57:24 2017 +1000
--
gradle/pomconfigurer.gradle | 3 ++
.../groovy/jmx/builder/JmxTimerFactory.groovy | 56 ++--
.../jmx/builder/JmxTimerFactoryTest.groovy | 3 --
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/4f8f843e/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 197dc42..07e38db 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -588,6 +588,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Stephane Landelle'
}
+contributor {
+name 'Vladimir Vivien'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/4f8f843e/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
--
diff --git
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index 934ead2..6b51bf7 100644
---
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -39,8 +39,6 @@ import javax.management.ObjectName
* occurences:long
* )
*
- *
- * @author Vladimir Vivien
*/
class JmxTimerFactory extends AbstractFactory {
public Object newInstance(FactoryBuilderSupport builder, Object nodeName,
Object nodeParam, Map nodeAttribs) {
@@ -67,10 +65,10 @@ class JmxTimerFactory extends AbstractFactory {
metaMap.listeners = getNormalizedRecipientList(metaMap.listeners)
def result = registerTimer(metaMap)
-return result
+result
}
-private def getNormalizedName(fsb, timer, name) {
+private static getNormalizedName(fsb, timer, name) {
def result
if (!name) {
result = getDefaultName(fsb, timer)
@@ -80,18 +78,18 @@ class JmxTimerFactory extends AbstractFactory {
} else if (name instanceof ObjectName) {
result = name
} else {
-result = getDefaultName(fsb, time)
+result = getDefaultName(fsb, timer)
}
}
-return result
+result
}
-private def getDefaultName(fsb, timer) {
+private static getDefaultName(fsb, timer) {
def name =
"${fsb.getDefaultJmxNameDomain()}:type=TimerService,name=Timer@${timer.hashCode()}"
-return new ObjectName(name)
+new ObjectName(name)
}
-private def getNormalizedDate(date) {
+private static getNormalizedDate(date) {
if (!date) return new Date()
if (date instanceof Date) {
return date
@@ -103,10 +101,10 @@ class JmxTimerFactory extends AbstractFactory {
default:
startDate = new Date()
}
-return startDate
+startDate
}
-private def getNormalizedPeriod(period) {
+private static getNormalizedPeriod(period) {
if (!period) return 1000L
if (period instanceof Number) {
return period
@@ -117,8 +115,9 @@ class JmxTimerFactory extends AbstractFactory {
def value
try {
value = period[0..-2].toLong()
-} catch (e) {
+} catch (ignore) {
multiplier = "x"
+value = 0
}
switch (multiplier) {
case "s":
@@ -137,28 +136,29 @@ class JmxTimerFactory extends AbstractFactory {
result = 1000L
}
}
-return result
+result
}
-private def getNormalizedRecipientList(list) {
+private static getNormalizedRecipientList(list) {
if (!list) return null
def result = []
-list.each {name ->
+list.each { name ->
def on
if (name instanceof String) {
on = new ObjectName(name)
-}
-if (name instanceof ObjectName) {
+} else
[3/3] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/62a97152
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/62a97152
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/62a97152
Branch: refs/heads/GROOVY_2_6_X
Commit: 62a9715217c2ca950898f89b1f081bd6eea86938
Parents: 4f8f843
Author: paulk
Authored: Thu Nov 23 11:05:57 2017 +1000
Committer: paulk
Committed: Thu Nov 23 12:57:24 2017 +1000
--
.../parser-antlr4/src/test/resources/core/DoWhile_03x.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/62a97152/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
b/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
index abddd24..bda62c7 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-int i, j = 0;
+int i = 0, j = 0
do {
i++
-if (i == 4) break;
+if (i == 4) break
-if (j == 3) continue;
+if (j == 3) continue
j++
} while (true)
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master ca72d7dd1 -> 5eb617f03
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5eb617f0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5eb617f0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5eb617f0
Branch: refs/heads/master
Commit: 5eb617f03733d97017b5ac21883b255c9ecf99af
Parents: ca72d7d
Author: paulk
Authored: Thu Nov 23 11:05:57 2017 +1000
Committer: paulk
Committed: Thu Nov 23 11:05:57 2017 +1000
--
.../parser-antlr4/src/test/resources/core/DoWhile_03x.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/5eb617f0/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
b/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
index abddd24..bda62c7 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-int i, j = 0;
+int i = 0, j = 0
do {
i++
-if (i == 4) break;
+if (i == 4) break
-if (j == 3) continue;
+if (j == 3) continue
j++
} while (true)
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 67feeaf6b -> ca72d7dd1
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ca72d7dd
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ca72d7dd
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ca72d7dd
Branch: refs/heads/master
Commit: ca72d7dd1b6f3a2d68126cd3473da2bf20a1aa9e
Parents: 67feeaf
Author: paulk
Authored: Thu Nov 23 07:55:06 2017 +1000
Committer: paulk
Committed: Thu Nov 23 07:55:06 2017 +1000
--
gradle/pomconfigurer.gradle | 3 ++
.../groovy/jmx/builder/JmxTimerFactory.groovy | 56 ++--
.../jmx/builder/JmxTimerFactoryTest.groovy | 3 --
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/ca72d7dd/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 197dc42..07e38db 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -588,6 +588,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Stephane Landelle'
}
+contributor {
+name 'Vladimir Vivien'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/ca72d7dd/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
--
diff --git
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index 934ead2..6b51bf7 100644
---
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -39,8 +39,6 @@ import javax.management.ObjectName
* occurences:long
* )
*
- *
- * @author Vladimir Vivien
*/
class JmxTimerFactory extends AbstractFactory {
public Object newInstance(FactoryBuilderSupport builder, Object nodeName,
Object nodeParam, Map nodeAttribs) {
@@ -67,10 +65,10 @@ class JmxTimerFactory extends AbstractFactory {
metaMap.listeners = getNormalizedRecipientList(metaMap.listeners)
def result = registerTimer(metaMap)
-return result
+result
}
-private def getNormalizedName(fsb, timer, name) {
+private static getNormalizedName(fsb, timer, name) {
def result
if (!name) {
result = getDefaultName(fsb, timer)
@@ -80,18 +78,18 @@ class JmxTimerFactory extends AbstractFactory {
} else if (name instanceof ObjectName) {
result = name
} else {
-result = getDefaultName(fsb, time)
+result = getDefaultName(fsb, timer)
}
}
-return result
+result
}
-private def getDefaultName(fsb, timer) {
+private static getDefaultName(fsb, timer) {
def name =
"${fsb.getDefaultJmxNameDomain()}:type=TimerService,name=Timer@${timer.hashCode()}"
-return new ObjectName(name)
+new ObjectName(name)
}
-private def getNormalizedDate(date) {
+private static getNormalizedDate(date) {
if (!date) return new Date()
if (date instanceof Date) {
return date
@@ -103,10 +101,10 @@ class JmxTimerFactory extends AbstractFactory {
default:
startDate = new Date()
}
-return startDate
+startDate
}
-private def getNormalizedPeriod(period) {
+private static getNormalizedPeriod(period) {
if (!period) return 1000L
if (period instanceof Number) {
return period
@@ -117,8 +115,9 @@ class JmxTimerFactory extends AbstractFactory {
def value
try {
value = period[0..-2].toLong()
-} catch (e) {
+} catch (ignore) {
multiplier = "x"
+value = 0
}
switch (multiplier) {
case "s":
@@ -137,28 +136,29 @@ class JmxTimerFactory extends AbstractFactory {
result = 1000L
}
}
-return result
+result
}
-private def getNormalizedRecipientList(list) {
+private static getNormalizedRecipientList(list) {
if (!list) return null
def result = []
-list.each {name ->
+list.each { name ->
def on
if (name instanceof String) {
on = new ObjectName(name)
-
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 96659465b -> bb0d5effd
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/bb0d5eff
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/bb0d5eff
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/bb0d5eff
Branch: refs/heads/GROOVY_2_6_X
Commit: bb0d5effd458c8384faefdf429d52d6354a84ddf
Parents: 9665946
Author: paulk
Authored: Wed Oct 25 21:36:43 2017 +1000
Committer: paulk
Committed: Wed Oct 25 21:36:43 2017 +1000
--
.../org/apache/groovy/parser/antlr4/GroovyParserTest.groovy | 4 ++--
.../parser-antlr4/src/test/resources/core/Lambda_01x.groovy | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/bb0d5eff/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
index 40650a3..391b284 100644
---
a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
+++
b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
@@ -142,14 +142,14 @@ class GroovyParserTest extends GroovyTestCase {
}
void "test groovy core - Lambda"() {
-doRunAndTest('core/Lambda_01x.groovy ')
+doRunAndTest('core/Lambda_01x.groovy')
if (jdk8orGreater) {
doRunAndTest('core/Lambda_01x_1_8.groovy')
}
}
void "test groovy core - MethodReference"() {
-doRunAndTest('core/MethodReference_01x.groovy ')
+doRunAndTest('core/MethodReference_01x.groovy')
if (jdk8orGreater) {
doRunAndTest('core/MethodReference_01x_1_8.groovy')
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/bb0d5eff/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
b/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
index dbab616..2c407fa 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
@@ -50,6 +50,3 @@ assert 6 == c()(3)
c = { (e) -> { e * 2 } }
assert 6 == c()(3)
-
-
-
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 7f7da9985 -> 5861d8106
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5861d810
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5861d810
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5861d810
Branch: refs/heads/GROOVY_2_6_X
Commit: 5861d8106b0872650c2964e3b957fdd503f2654e
Parents: 7f7da99
Author: paulk
Authored: Mon Oct 23 21:13:29 2017 +1000
Committer: paulk
Committed: Mon Oct 23 21:13:29 2017 +1000
--
.../parser/antlr4/GroovyParserTest.groovy | 24 -
.../src/test/resources/core/Lambda_01x.groovy | 15 +-
.../test/resources/core/Lambda_01x_1_7.groovy | 37 -
.../test/resources/core/Lambda_01x_1_8.groovy | 35
.../resources/core/MethodReference_01x.groovy | 54 ---
.../core/MethodReference_01x_1_7.groovy | 57
.../core/MethodReference_01x_1_8.groovy | 49 +
7 files changed, 108 insertions(+), 163 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/5861d810/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
index a4227fb..40650a3 100644
---
a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
+++
b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
@@ -34,10 +34,11 @@ import static
org.apache.groovy.parser.antlr4.TestUtils.doRunAndTest
* Some basic test cases for the new parser
*/
class GroovyParserTest extends GroovyTestCase {
+private boolean jdk8orGreater
-void setUp() {}
-
-void tearDown() {}
+void setUp() {
+jdk8orGreater = System.getProperty('java.specification.version') >=
'1.8'
+}
void "test groovy core - Comments"() {
doTest('core/Comments_01.groovy', [ExpressionStatement])
@@ -141,18 +142,16 @@ class GroovyParserTest extends GroovyTestCase {
}
void "test groovy core - Lambda"() {
-if
(Runtime.class.getPackage().getImplementationVersion().startsWith("1.7.")) {
-doRunAndTest('core/Lambda_01x_1_7.groovy')
-} else {
-doRunAndTest('core/Lambda_01x.groovy')
+doRunAndTest('core/Lambda_01x.groovy ')
+if (jdk8orGreater) {
+doRunAndTest('core/Lambda_01x_1_8.groovy')
}
}
void "test groovy core - MethodReference"() {
-if
(Runtime.class.getPackage().getImplementationVersion().startsWith("1.7.")) {
-doRunAndTest('core/MethodReference_01x_1_7.groovy')
-} else {
-doRunAndTest('core/MethodReference_01x.groovy')
+doRunAndTest('core/MethodReference_01x.groovy ')
+if (jdk8orGreater) {
+doRunAndTest('core/MethodReference_01x_1_8.groovy')
}
}
@@ -288,7 +287,6 @@ class GroovyParserTest extends GroovyTestCase {
void "test groovy core - LocalVariableDeclaration"() {
doTest('core/LocalVariableDeclaration_01.groovy', [Token]) // [class
org.codehaus.groovy.syntax.Token][startLine]:: 9 != 8
doRunAndTest('core/LocalVariableDeclaration_02x.groovy')
-
}
void "test groovy core - MethodDeclaration"() {
@@ -388,7 +386,7 @@ class GroovyParserTest extends GroovyTestCase {
doTest('bugs/BUG-GROOVY-8161.groovy')
doRunAndTest('bugs/GROOVY-3898.groovy')
doRunAndTest('bugs/BUG-GROOVY-8311.groovy')
-if (System.getProperty('java.specification.version') < '1.8') return
+if (!jdk8orGreater) return
doRunAndTest('bugs/GROOVY-8228.groovy')
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/5861d810/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
--
diff --git
a/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
b/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
index 5c147ac..dbab616 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
@@ -16,10 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert 9 == [1, 2, 3].stream().map(e -> e + 1).reduce(0, (r, e) -> r + e)
-assert 9 == [1, 2, 3].stream().map(e -> {e + 1}).reduce(0, (r, e) -> r + e)
-assert 9 == [1, 2, 3].stream().map
groovy git commit: minor refactor: a little more consistency around how -Dname=value system properties are set
Repository: groovy
Updated Branches:
refs/heads/master 6605eef92 -> 3493dc708
minor refactor: a little more consistency around how -Dname=value system
properties are set
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3493dc70
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3493dc70
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3493dc70
Branch: refs/heads/master
Commit: 3493dc708d82294558c538d790a9fcbbd9a980d5
Parents: 6605eef
Author: paulk
Authored: Thu Oct 12 18:19:53 2017 +1000
Committer: paulk
Committed: Thu Oct 12 18:19:53 2017 +1000
--
src/main/groovy/ui/GroovyMain.java | 60 +++-
src/main/org/apache/groovy/util/SystemUtil.java | 46 +++
.../org/codehaus/groovy/tools/GrapeMain.groovy | 10 ++--
.../groovy/tools/LoaderConfiguration.java | 12 ++--
.../org/codehaus/groovy/tools/shell/Main.groovy | 29 +++---
5 files changed, 82 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/3493dc70/src/main/groovy/ui/GroovyMain.java
--
diff --git a/src/main/groovy/ui/GroovyMain.java
b/src/main/groovy/ui/GroovyMain.java
index 402d53e..04c5a14 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -46,18 +46,16 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.regex.Pattern;
import static org.apache.commons.cli.Option.builder;
/**
* A Command line to execute groovy.
- *
- * @author Jeremy Rayner
- * @author Yuri Schimke
- * @author Roshan Dawrani
*/
public class GroovyMain {
@@ -178,49 +176,30 @@ public class GroovyMain {
return new Options()
.addOption(builder("classpath").hasArg().argName("path").desc("Specify where to
find the class files - must be first argument").build())
.addOption(builder("cp").longOpt("classpath").hasArg().argName("path").desc("Aliases
for '-classpath'").build())
-.addOption(builder("D").longOpt("define").desc("define a
system property").hasArg().argName("name=value").build())
+.addOption(builder("D").longOpt("define").desc("Define a
system
property").numberOfArgs(2).valueSeparator().argName("name=value").build())
.addOption(
builder().longOpt("disableopt")
-.desc("disables one or all optimization
elements. " +
+.desc("Disables one or all optimization
elements; " +
"optlist can be a comma separated list
with the elements: " +
"all (disables all optimizations), " +
"int (disable any int based
optimizations)")
.hasArg().argName("optlist").build())
-.addOption(builder("h").hasArg(false).desc("usage
information").longOpt("help").build())
-.addOption(builder("d").hasArg(false).desc("debug mode will
print out full stack traces").longOpt("debug").build())
-.addOption(builder("v").hasArg(false).desc("display the Groovy
and JVM versions").longOpt("version").build())
-
.addOption(builder("c").argName("charset").hasArg().desc("specify the encoding
of the files").longOpt("encoding").build())
-
.addOption(builder("e").argName("script").hasArg().desc("specify a command line
script").build())
-
.addOption(builder("i").argName("extension").optionalArg(true).desc("modify
files in place; create backup if extension is given (e.g. \'.bak\')").build())
-.addOption(builder("n").hasArg(false).desc("process files line
by line using implicit 'line' variable").build())
-.addOption(builder("p").hasArg(false).desc("process files line
by line and print result (see also -n)").build())
+.addOption(builder("h").hasArg(false).desc("Usage
information").longOpt("help").build())
+.addOption(builder("d").hasArg(false).desc("Debug mode will
print out full stack traces").longOpt("debug").build())
+.addOption(builder("v").hasArg(false).desc("Display the Groovy
and JVM versions").longOpt("version").build())
+
.addOption(builder("c").argName("charset").hasArg().desc("Specify the encoding
of the files").longOpt("encoding").build())
+
.addOption(builder("e").argName("script").hasArg().desc("Specify a command line
script
groovy git commit: minor refactor: a little more consistency around how -Dname=value system properties are set (port for 2_4_X)
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 00b3161dd -> 233357b21
minor refactor: a little more consistency around how -Dname=value system
properties are set (port for 2_4_X)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/233357b2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/233357b2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/233357b2
Branch: refs/heads/GROOVY_2_4_X
Commit: 233357b21b8bdc3f33621265f5abc4bea785b76d
Parents: 00b3161
Author: paulk
Authored: Thu Oct 12 18:19:53 2017 +1000
Committer: paulk
Committed: Thu Oct 12 18:44:03 2017 +1000
--
src/main/groovy/ui/GroovyMain.java | 115 +--
src/main/org/apache/groovy/util/SystemUtil.java | 46
.../org/codehaus/groovy/tools/GrapeMain.groovy | 11 +-
.../groovy/tools/LoaderConfiguration.java | 12 +-
.../org/codehaus/groovy/tools/shell/Main.groovy | 29 ++---
5 files changed, 89 insertions(+), 124 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/233357b2/src/main/groovy/ui/GroovyMain.java
--
diff --git a/src/main/groovy/ui/GroovyMain.java
b/src/main/groovy/ui/GroovyMain.java
index b1aea2b..3b75e11 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -47,17 +47,14 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.regex.Pattern;
/**
* A Command line to execute groovy.
- *
- * @author Jeremy Rayner
- * @author Yuri Schimke
- * @author Roshan Dawrani
- * @version $Revision$
*/
public class GroovyMain {
@@ -177,107 +174,46 @@ public class GroovyMain {
@SuppressWarnings("static-access")
private static synchronized Options buildOptions() {
Options options = new Options();
-
options.addOption(OptionBuilder.hasArg().withArgName("path").withDescription("Specify
where to find the class files - must be first argument").create("classpath"));
-
options.addOption(OptionBuilder.withLongOpt("classpath").hasArg().withArgName("path").withDescription("Aliases
for '-classpath'").create("cp"));
-
options.addOption(
-OptionBuilder.withLongOpt("define").
-withDescription("define a system property").
-hasArg(true).
-withArgName("name=value").
-create('D'));
+
OptionBuilder.hasArg().withArgName("path").withDescription("Specify where to
find the class files - must be first argument").create("classpath"));
+options.addOption(
+
OptionBuilder.withLongOpt("classpath").hasArg().withArgName("path").withDescription("Aliases
for '-classpath'").create("cp"));
+options.addOption(
+OptionBuilder.withLongOpt("define").withDescription("define a
system
property").hasArgs(2).withValueSeparator().withArgName("name=value").create('D'));
options.addOption(
OptionBuilder.withLongOpt("disableopt").
withDescription("disables one or all optimization elements. " +
"optlist can be a comma separated list with the
elements: " +
"all (disables all optimizations), " +
"int (disable any int based optimizations)").
-hasArg(true).
-withArgName("optlist").
-create());
+hasArg(true).withArgName("optlist").create());
options.addOption(
-OptionBuilder.hasArg(false)
-.withDescription("usage information")
-.withLongOpt("help")
-.create('h'));
+OptionBuilder.hasArg(false).withDescription("usage
information").withLongOpt("help").create('h'));
options.addOption(
-OptionBuilder.hasArg(false)
-.withDescription("debug mode will print out full stack traces")
-.withLongOpt("debug")
-.create('d'));
+OptionBuilder.hasArg(false).withDescription("debug mode will print
out full stack traces").withLongOpt("debug").create('d'));
options.addOption(
-OptionBuilder.hasArg(false)
-.withDescription("display the Groovy and JVM versions")
-.withLongOpt("version")
-.create('v'));
+OptionBuilder.hasArg(false).withDescription("display the Groovy
and JVM versions").withLongOpt("version").create('v'));
options.addOption(
-OptionBuilder.withArgName("charset")
-.hasArg()
-.withDescription("specify the encoding
[2/2] groovy git commit: minor refactor: a little more consistency around how -Dname=value system properties are set
minor refactor: a little more consistency around how -Dname=value system
properties are set
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ff5d63f9
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ff5d63f9
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ff5d63f9
Branch: refs/heads/GROOVY_2_5_X
Commit: ff5d63f913d1f81ac150456b0b8083b41fc30530
Parents: 03935c9
Author: paulk
Authored: Thu Oct 12 18:19:53 2017 +1000
Committer: paulk
Committed: Thu Oct 12 18:21:26 2017 +1000
--
src/main/groovy/ui/GroovyMain.java | 60 +++-
src/main/org/apache/groovy/util/SystemUtil.java | 46 +++
.../org/codehaus/groovy/tools/GrapeMain.groovy | 10 ++--
.../groovy/tools/LoaderConfiguration.java | 12 ++--
.../org/codehaus/groovy/tools/shell/Main.groovy | 29 +++---
5 files changed, 82 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/ff5d63f9/src/main/groovy/ui/GroovyMain.java
--
diff --git a/src/main/groovy/ui/GroovyMain.java
b/src/main/groovy/ui/GroovyMain.java
index 0fdd696..9cb973d 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -46,18 +46,16 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.regex.Pattern;
import static org.apache.commons.cli.Option.builder;
/**
* A Command line to execute groovy.
- *
- * @author Jeremy Rayner
- * @author Yuri Schimke
- * @author Roshan Dawrani
*/
public class GroovyMain {
@@ -178,49 +176,30 @@ public class GroovyMain {
return new Options()
.addOption(builder("classpath").hasArg().argName("path").desc("Specify where to
find the class files - must be first argument").build())
.addOption(builder("cp").longOpt("classpath").hasArg().argName("path").desc("Aliases
for '-classpath'").build())
-.addOption(builder("D").longOpt("define").desc("define a
system property").hasArg().argName("name=value").build())
+.addOption(builder("D").longOpt("define").desc("Define a
system
property").numberOfArgs(2).valueSeparator().argName("name=value").build())
.addOption(
builder().longOpt("disableopt")
-.desc("disables one or all optimization
elements. " +
+.desc("Disables one or all optimization
elements; " +
"optlist can be a comma separated list
with the elements: " +
"all (disables all optimizations), " +
"int (disable any int based
optimizations)")
.hasArg().argName("optlist").build())
-.addOption(builder("h").hasArg(false).desc("usage
information").longOpt("help").build())
-.addOption(builder("d").hasArg(false).desc("debug mode will
print out full stack traces").longOpt("debug").build())
-.addOption(builder("v").hasArg(false).desc("display the Groovy
and JVM versions").longOpt("version").build())
-
.addOption(builder("c").argName("charset").hasArg().desc("specify the encoding
of the files").longOpt("encoding").build())
-
.addOption(builder("e").argName("script").hasArg().desc("specify a command line
script").build())
-
.addOption(builder("i").argName("extension").optionalArg(true).desc("modify
files in place; create backup if extension is given (e.g. \'.bak\')").build())
-.addOption(builder("n").hasArg(false).desc("process files line
by line using implicit 'line' variable").build())
-.addOption(builder("p").hasArg(false).desc("process files line
by line and print result (see also -n)").build())
+.addOption(builder("h").hasArg(false).desc("Usage
information").longOpt("help").build())
+.addOption(builder("d").hasArg(false).desc("Debug mode will
print out full stack traces").longOpt("debug").build())
+.addOption(builder("v").hasArg(false).desc("Display the Groovy
and JVM versions").longOpt("version").build())
+
.addOption(builder("c").argName("charset").hasArg().desc("Specify the encoding
of the files").longOpt("encoding").build())
+
.addOption(builder("e").argName("script").hasArg().desc("Specify a command line
script").build())
+
.addOption(builder("i").argName("extension").o
[1/2] groovy git commit: minor refactor: a little more consistency around how -Dname=value system properties are set
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 2974831c1 -> c4e5e2250
minor refactor: a little more consistency around how -Dname=value system
properties are set
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c4e5e225
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c4e5e225
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c4e5e225
Branch: refs/heads/GROOVY_2_6_X
Commit: c4e5e22505f7eafa384bb802d83d6a9c40faf086
Parents: 8e9b3ec
Author: paulk
Authored: Thu Oct 12 18:19:53 2017 +1000
Committer: paulk
Committed: Thu Oct 12 18:21:04 2017 +1000
--
src/main/groovy/ui/GroovyMain.java | 60 +++-
src/main/org/apache/groovy/util/SystemUtil.java | 46 +++
.../org/codehaus/groovy/tools/GrapeMain.groovy | 10 ++--
.../groovy/tools/LoaderConfiguration.java | 12 ++--
.../org/codehaus/groovy/tools/shell/Main.groovy | 29 +++---
5 files changed, 82 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c4e5e225/src/main/groovy/ui/GroovyMain.java
--
diff --git a/src/main/groovy/ui/GroovyMain.java
b/src/main/groovy/ui/GroovyMain.java
index 402d53e..04c5a14 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -46,18 +46,16 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.regex.Pattern;
import static org.apache.commons.cli.Option.builder;
/**
* A Command line to execute groovy.
- *
- * @author Jeremy Rayner
- * @author Yuri Schimke
- * @author Roshan Dawrani
*/
public class GroovyMain {
@@ -178,49 +176,30 @@ public class GroovyMain {
return new Options()
.addOption(builder("classpath").hasArg().argName("path").desc("Specify where to
find the class files - must be first argument").build())
.addOption(builder("cp").longOpt("classpath").hasArg().argName("path").desc("Aliases
for '-classpath'").build())
-.addOption(builder("D").longOpt("define").desc("define a
system property").hasArg().argName("name=value").build())
+.addOption(builder("D").longOpt("define").desc("Define a
system
property").numberOfArgs(2).valueSeparator().argName("name=value").build())
.addOption(
builder().longOpt("disableopt")
-.desc("disables one or all optimization
elements. " +
+.desc("Disables one or all optimization
elements; " +
"optlist can be a comma separated list
with the elements: " +
"all (disables all optimizations), " +
"int (disable any int based
optimizations)")
.hasArg().argName("optlist").build())
-.addOption(builder("h").hasArg(false).desc("usage
information").longOpt("help").build())
-.addOption(builder("d").hasArg(false).desc("debug mode will
print out full stack traces").longOpt("debug").build())
-.addOption(builder("v").hasArg(false).desc("display the Groovy
and JVM versions").longOpt("version").build())
-
.addOption(builder("c").argName("charset").hasArg().desc("specify the encoding
of the files").longOpt("encoding").build())
-
.addOption(builder("e").argName("script").hasArg().desc("specify a command line
script").build())
-
.addOption(builder("i").argName("extension").optionalArg(true).desc("modify
files in place; create backup if extension is given (e.g. \'.bak\')").build())
-.addOption(builder("n").hasArg(false).desc("process files line
by line using implicit 'line' variable").build())
-.addOption(builder("p").hasArg(false).desc("process files line
by line and print result (see also -n)").build())
+.addOption(builder("h").hasArg(false).desc("Usage
information").longOpt("help").build())
+.addOption(builder("d").hasArg(false).desc("Debug mode will
print out full stack traces").longOpt("debug").build())
+.addOption(builder("v").hasArg(false).desc("Display the Groovy
and JVM versions").longOpt("version").build())
+
.addOption(builder("c").argName("charset").hasArg().desc("Specify the encoding
of the files").longOpt("encoding").build())
+
.addOption(builder("e").argName("script").hasArg().desc("Specify a command
[1/3] groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X faeca1600 -> d3baea9ac
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/dbf8e71d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/dbf8e71d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/dbf8e71d
Branch: refs/heads/GROOVY_2_6_X
Commit: dbf8e71ddc8fda325a936a4537ed0ee5570aba27
Parents: faeca16
Author: paulk
Authored: Wed Sep 27 21:50:52 2017 +1000
Committer: paulk
Committed: Fri Sep 29 22:44:06 2017 +1000
--
.../stc/StaticTypeCheckingVisitor.java | 63 ++--
1 file changed, 33 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/dbf8e71d/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index d5e4080..aec399c 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -112,7 +112,7 @@ import static
org.codehaus.groovy.syntax.Types.ASSIGNMENT_OPERATOR;
import static org.codehaus.groovy.syntax.Types.COMPARE_EQUAL;
import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL;
import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_IN;
-import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
+//import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
import static org.codehaus.groovy.syntax.Types.COMPARE_TO;
import static org.codehaus.groovy.syntax.Types.DIVIDE;
import static org.codehaus.groovy.syntax.Types.DIVIDE_EQUAL;
@@ -1973,40 +1973,43 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
protected ClassNode[] getArgumentTypes(ArgumentListExpression args) {
List arglist = args.getExpressions();
ClassNode[] ret = new ClassNode[arglist.size()];
-int i = 0;
+for (int i = 0; i < arglist.size(); i++) {
+Expression exp = arglist.get(i);
+if (isNullConstant(exp)) {
+ret[i] = UNKNOWN_PARAMETER_TYPE;
+} else {
+ret[i] = getInferredTypeFromTempInfo(exp, getType(exp));
+}
+}
+return ret;
+}
+
+private ClassNode getInferredTypeFromTempInfo(Expression exp, ClassNode
result) {
Map> info =
typeCheckingContext.temporaryIfBranchTypeInformation.empty() ? null :
typeCheckingContext.temporaryIfBranchTypeInformation.peek();
-for (Expression exp : arglist) {
-if (isNullConstant(exp)) {
-ret[i] = UNKNOWN_PARAMETER_TYPE;
-} else {
-ret[i] = getType(exp);
-if (exp instanceof VariableExpression && info != null) {
-List classNodes =
getTemporaryTypesForExpression(exp);
-if (classNodes != null && !classNodes.isEmpty()) {
-ArrayList arr = new
ArrayList(classNodes.size() + 1);
-arr.add(ret[i]);
-arr.addAll(classNodes);
-// GROOVY-7333: filter out Object
-Iterator iterator = arr.iterator();
-while (iterator.hasNext()) {
-ClassNode next = iterator.next();
-if (ClassHelper.OBJECT_TYPE.equals(next)) {
-iterator.remove();
-}
-}
-if (arr.isEmpty()) {
-ret[i] =
ClassHelper.OBJECT_TYPE.getPlainNodeReference();
-} else if (arr.size()==1) {
-ret[i] = arr.get(0);
-} else {
-ret[i] = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
-}
+if (exp instanceof VariableExpression && info != null) {
+List classNodes = getTemporaryTypesForExpression(exp);
+if (classNodes != null && !classNodes.isEmpty()) {
+ArrayList arr = new
ArrayList(classNodes.size() + 1);
+if (result != null) arr.add(result);
+arr.addAll(classNodes);
+// GROOVY-7333: filter out Object
+Iterator iterator = arr.iterator();
+while (iterator.hasNext()) {
+ClassNode next = iterator.next();
+if (ClassHelper.OBJECT_TYPE.equals(next)) {
+iterator.r
[2/3] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/42e3cedb
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/42e3cedb
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/42e3cedb
Branch: refs/heads/GROOVY_2_6_X
Commit: 42e3cedb0d77549934233ee669bea7b0d9cf80f6
Parents: dbf8e71
Author: paulk
Authored: Wed Sep 27 22:01:49 2017 +1000
Committer: paulk
Committed: Fri Sep 29 22:44:07 2017 +1000
--
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/42e3cedb/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index aec399c..d4711cc 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1990,7 +1990,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
List classNodes = getTemporaryTypesForExpression(exp);
if (classNodes != null && !classNodes.isEmpty()) {
ArrayList arr = new
ArrayList(classNodes.size() + 1);
-if (result != null) arr.add(result);
+if (result != null && !classNodes.contains(result))
arr.add(result);
arr.addAll(classNodes);
// GROOVY-7333: filter out Object
Iterator iterator = arr.iterator();
[2/3] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/132f8ca1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/132f8ca1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/132f8ca1
Branch: refs/heads/GROOVY_2_4_X
Commit: 132f8ca1b8a460c53169d9eee3181c539825b947
Parents: b672fda
Author: paulk
Authored: Wed Sep 27 21:50:52 2017 +1000
Committer: paulk
Committed: Fri Sep 29 23:05:35 2017 +1000
--
.../stc/StaticTypeCheckingVisitor.java | 61 ++--
1 file changed, 32 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/132f8ca1/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 32c2818..f986d1b 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1949,40 +1949,43 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
protected ClassNode[] getArgumentTypes(ArgumentListExpression args) {
List arglist = args.getExpressions();
ClassNode[] ret = new ClassNode[arglist.size()];
-int i = 0;
+for (int i = 0; i < arglist.size(); i++) {
+Expression exp = arglist.get(i);
+if (isNullConstant(exp)) {
+ret[i] = UNKNOWN_PARAMETER_TYPE;
+} else {
+ret[i] = getInferredTypeFromTempInfo(exp, getType(exp));
+}
+}
+return ret;
+}
+
+private ClassNode getInferredTypeFromTempInfo(Expression exp, ClassNode
result) {
Map> info =
typeCheckingContext.temporaryIfBranchTypeInformation.empty() ? null :
typeCheckingContext.temporaryIfBranchTypeInformation.peek();
-for (Expression exp : arglist) {
-if (isNullConstant(exp)) {
-ret[i] = UNKNOWN_PARAMETER_TYPE;
-} else {
-ret[i] = getType(exp);
-if (exp instanceof VariableExpression && info != null) {
-List classNodes =
getTemporaryTypesForExpression(exp);
-if (classNodes != null && !classNodes.isEmpty()) {
-ArrayList arr = new
ArrayList(classNodes.size() + 1);
-arr.add(ret[i]);
-arr.addAll(classNodes);
-// GROOVY-7333: filter out Object
-Iterator iterator = arr.iterator();
-while (iterator.hasNext()) {
-ClassNode next = iterator.next();
-if (ClassHelper.OBJECT_TYPE.equals(next)) {
-iterator.remove();
-}
-}
-if (arr.isEmpty()) {
-ret[i] =
ClassHelper.OBJECT_TYPE.getPlainNodeReference();
-} else if (arr.size()==1) {
-ret[i] = arr.get(0);
-} else {
-ret[i] = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
-}
+if (exp instanceof VariableExpression && info != null) {
+List classNodes = getTemporaryTypesForExpression(exp);
+if (classNodes != null && !classNodes.isEmpty()) {
+ArrayList arr = new
ArrayList(classNodes.size() + 1);
+if (result != null) arr.add(result);
+arr.addAll(classNodes);
+// GROOVY-7333: filter out Object
+Iterator iterator = arr.iterator();
+while (iterator.hasNext()) {
+ClassNode next = iterator.next();
+if (ClassHelper.OBJECT_TYPE.equals(next)) {
+iterator.remove();
}
}
+if (arr.isEmpty()) {
+result = ClassHelper.OBJECT_TYPE.getPlainNodeReference();
+} else if (arr.size()==1) {
+result = arr.get(0);
+} else {
+result = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
+}
}
-i++;
}
-return ret;
+return result;
}
@Override
[3/3] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a8bccc94
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a8bccc94
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a8bccc94
Branch: refs/heads/GROOVY_2_4_X
Commit: a8bccc944e7532a7efa694f8b1341bacc6df32cb
Parents: 132f8ca
Author: paulk
Authored: Wed Sep 27 22:01:49 2017 +1000
Committer: paulk
Committed: Fri Sep 29 23:05:35 2017 +1000
--
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a8bccc94/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index f986d1b..5872bb8 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1966,7 +1966,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
List classNodes = getTemporaryTypesForExpression(exp);
if (classNodes != null && !classNodes.isEmpty()) {
ArrayList arr = new
ArrayList(classNodes.size() + 1);
-if (result != null) arr.add(result);
+if (result != null && !classNodes.contains(result))
arr.add(result);
arr.addAll(classNodes);
// GROOVY-7333: filter out Object
Iterator iterator = arr.iterator();
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 4888769de -> aa0782ee6
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/aa0782ee
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/aa0782ee
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/aa0782ee
Branch: refs/heads/GROOVY_2_5_X
Commit: aa0782ee6d0b7570d372cfd39738e5f7ea6aca4a
Parents: 4888769
Author: paulk
Authored: Fri Sep 29 22:58:53 2017 +1000
Committer: paulk
Committed: Fri Sep 29 22:58:53 2017 +1000
--
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/aa0782ee/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index f410f71..64c8c2e 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -487,7 +487,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
variable = (VariableExpression) vexp.getAccessedVariable();
}
if (variable != null) {
-ClassNode inferredType = getInferredTypeFromTempInfo(variable,
variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
+ClassNode inferredType = getInferredTypeFromTempInfo(variable,
(ClassNode) variable.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
if (inferredType != null &&
!inferredType.getName().equals("java.lang.Object")) {
if (typeCheckingContext.getEnclosingBinaryExpression() !=
null) {
// TODO narrow this down to assignment
[2/2] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4888769d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4888769d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4888769d
Branch: refs/heads/GROOVY_2_5_X
Commit: 4888769de12d760e644c58a79417534fc2362b6f
Parents: f56a9b5
Author: paulk
Authored: Wed Sep 27 22:01:49 2017 +1000
Committer: paulk
Committed: Fri Sep 29 22:50:15 2017 +1000
--
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/4888769d/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index aed8f01..f410f71 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1992,7 +1992,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
List classNodes = getTemporaryTypesForExpression(exp);
if (classNodes != null && !classNodes.isEmpty()) {
ArrayList arr = new
ArrayList(classNodes.size() + 1);
-if (result != null) arr.add(result);
+if (result != null && !classNodes.contains(result))
arr.add(result);
arr.addAll(classNodes);
// GROOVY-7333: filter out Object
Iterator iterator = arr.iterator();
[1/2] groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X caa1e5f6a -> 4888769de
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f56a9b51
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f56a9b51
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f56a9b51
Branch: refs/heads/GROOVY_2_5_X
Commit: f56a9b514def3886912131ebe88ca5d4d6a6c92c
Parents: caa1e5f
Author: paulk
Authored: Wed Sep 27 21:50:52 2017 +1000
Committer: paulk
Committed: Fri Sep 29 22:50:12 2017 +1000
--
.../stc/StaticTypeCheckingVisitor.java | 61 ++--
1 file changed, 32 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/f56a9b51/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index cca4167..aed8f01 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1975,40 +1975,43 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
protected ClassNode[] getArgumentTypes(ArgumentListExpression args) {
List arglist = args.getExpressions();
ClassNode[] ret = new ClassNode[arglist.size()];
-int i = 0;
+for (int i = 0; i < arglist.size(); i++) {
+Expression exp = arglist.get(i);
+if (isNullConstant(exp)) {
+ret[i] = UNKNOWN_PARAMETER_TYPE;
+} else {
+ret[i] = getInferredTypeFromTempInfo(exp, getType(exp));
+}
+}
+return ret;
+}
+
+private ClassNode getInferredTypeFromTempInfo(Expression exp, ClassNode
result) {
Map> info =
typeCheckingContext.temporaryIfBranchTypeInformation.empty() ? null :
typeCheckingContext.temporaryIfBranchTypeInformation.peek();
-for (Expression exp : arglist) {
-if (isNullConstant(exp)) {
-ret[i] = UNKNOWN_PARAMETER_TYPE;
-} else {
-ret[i] = getType(exp);
-if (exp instanceof VariableExpression && info != null) {
-List classNodes =
getTemporaryTypesForExpression(exp);
-if (classNodes != null && !classNodes.isEmpty()) {
-ArrayList arr = new
ArrayList(classNodes.size() + 1);
-arr.add(ret[i]);
-arr.addAll(classNodes);
-// GROOVY-7333: filter out Object
-Iterator iterator = arr.iterator();
-while (iterator.hasNext()) {
-ClassNode next = iterator.next();
-if (ClassHelper.OBJECT_TYPE.equals(next)) {
-iterator.remove();
-}
-}
-if (arr.isEmpty()) {
-ret[i] =
ClassHelper.OBJECT_TYPE.getPlainNodeReference();
-} else if (arr.size()==1) {
-ret[i] = arr.get(0);
-} else {
-ret[i] = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
-}
+if (exp instanceof VariableExpression && info != null) {
+List classNodes = getTemporaryTypesForExpression(exp);
+if (classNodes != null && !classNodes.isEmpty()) {
+ArrayList arr = new
ArrayList(classNodes.size() + 1);
+if (result != null) arr.add(result);
+arr.addAll(classNodes);
+// GROOVY-7333: filter out Object
+Iterator iterator = arr.iterator();
+while (iterator.hasNext()) {
+ClassNode next = iterator.next();
+if (ClassHelper.OBJECT_TYPE.equals(next)) {
+iterator.remove();
}
}
+if (arr.isEmpty()) {
+result = ClassHelper.OBJECT_TYPE.getPlainNodeReference();
+} else if (arr.size()==1) {
+result = arr.get(0);
+} else {
+result = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
+}
}
-i++;
}
-return ret;
+return result;
}
@Override
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 0d54b5357 -> 4cc78440d
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4cc78440
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4cc78440
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4cc78440
Branch: refs/heads/master
Commit: 4cc78440d88480788ad7fe2573b7460bc8bec93c
Parents: 0d54b53
Author: paulk
Authored: Wed Sep 27 22:01:49 2017 +1000
Committer: paulk
Committed: Wed Sep 27 22:01:49 2017 +1000
--
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/4cc78440/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 9188b2d..807449a 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1964,7 +1964,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
List classNodes = getTemporaryTypesForExpression(exp);
if (classNodes != null && !classNodes.isEmpty()) {
ArrayList arr = new
ArrayList(classNodes.size() + 1);
-if (result != null) arr.add(result);
+if (result != null && !classNodes.contains(result))
arr.add(result);
arr.addAll(classNodes);
// GROOVY-7333: filter out Object
Iterator iterator = arr.iterator();
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 8b99a30e0 -> 0d54b5357
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0d54b535
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0d54b535
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0d54b535
Branch: refs/heads/master
Commit: 0d54b5357863d101eec47f20739d60913b3c869d
Parents: 8b99a30
Author: paulk
Authored: Wed Sep 27 21:50:52 2017 +1000
Committer: paulk
Committed: Wed Sep 27 21:50:52 2017 +1000
--
.../stc/StaticTypeCheckingVisitor.java | 63 ++--
1 file changed, 33 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/0d54b535/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 9289fcd..9188b2d 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -112,7 +112,7 @@ import static
org.codehaus.groovy.syntax.Types.ASSIGNMENT_OPERATOR;
import static org.codehaus.groovy.syntax.Types.COMPARE_EQUAL;
import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL;
import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_IN;
-import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
+//import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
import static org.codehaus.groovy.syntax.Types.COMPARE_TO;
import static org.codehaus.groovy.syntax.Types.DIVIDE;
import static org.codehaus.groovy.syntax.Types.DIVIDE_EQUAL;
@@ -1947,40 +1947,43 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
protected ClassNode[] getArgumentTypes(ArgumentListExpression args) {
List arglist = args.getExpressions();
ClassNode[] ret = new ClassNode[arglist.size()];
-int i = 0;
+for (int i = 0; i < arglist.size(); i++) {
+Expression exp = arglist.get(i);
+if (isNullConstant(exp)) {
+ret[i] = UNKNOWN_PARAMETER_TYPE;
+} else {
+ret[i] = getInferredTypeFromTempInfo(exp, getType(exp));
+}
+}
+return ret;
+}
+
+private ClassNode getInferredTypeFromTempInfo(Expression exp, ClassNode
result) {
Map> info =
typeCheckingContext.temporaryIfBranchTypeInformation.empty() ? null :
typeCheckingContext.temporaryIfBranchTypeInformation.peek();
-for (Expression exp : arglist) {
-if (isNullConstant(exp)) {
-ret[i] = UNKNOWN_PARAMETER_TYPE;
-} else {
-ret[i] = getType(exp);
-if (exp instanceof VariableExpression && info != null) {
-List classNodes =
getTemporaryTypesForExpression(exp);
-if (classNodes != null && !classNodes.isEmpty()) {
-ArrayList arr = new
ArrayList(classNodes.size() + 1);
-arr.add(ret[i]);
-arr.addAll(classNodes);
-// GROOVY-7333: filter out Object
-Iterator iterator = arr.iterator();
-while (iterator.hasNext()) {
-ClassNode next = iterator.next();
-if (ClassHelper.OBJECT_TYPE.equals(next)) {
-iterator.remove();
-}
-}
-if (arr.isEmpty()) {
-ret[i] =
ClassHelper.OBJECT_TYPE.getPlainNodeReference();
-} else if (arr.size()==1) {
-ret[i] = arr.get(0);
-} else {
-ret[i] = new UnionTypeClassNode(arr.toArray(new
ClassNode[arr.size()]));
-}
+if (exp instanceof VariableExpression && info != null) {
+List classNodes = getTemporaryTypesForExpression(exp);
+if (classNodes != null && !classNodes.isEmpty()) {
+ArrayList arr = new
ArrayList(classNodes.size() + 1);
+if (result != null) arr.add(result);
+arr.addAll(classNodes);
+// GROOVY-7333: filter out Object
+Iterator iterator = arr.iterator();
+while (iterator.hasNext()) {
+ClassNode next = iterator.next();
+if (ClassHelper.OBJECT_TYPE.equals(next)) {
+iterator.remove();
groovy git commit: minor refactor to aid when debugging AST
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 145cda8d4 -> c2cace44f
minor refactor to aid when debugging AST
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c2cace44
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c2cace44
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c2cace44
Branch: refs/heads/GROOVY_2_5_X
Commit: c2cace44f1b94993d8a9e3de96fced1a04e8b0bc
Parents: 145cda8
Author: paulk
Authored: Fri Sep 22 14:56:38 2017 +1000
Committer: paulk
Committed: Fri Sep 22 15:10:57 2017 +1000
--
src/main/org/codehaus/groovy/ast/MethodNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2cace44/src/main/org/codehaus/groovy/ast/MethodNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/MethodNode.java
b/src/main/org/codehaus/groovy/ast/MethodNode.java
index 7239a86..0f97ab6 100644
--- a/src/main/org/codehaus/groovy/ast/MethodNode.java
+++ b/src/main/org/codehaus/groovy/ast/MethodNode.java
@@ -190,7 +190,7 @@ public class MethodNode extends AnnotatedNode implements
Opcodes {
}
public String toString() {
-return "MethodNode@" + hashCode() + "[" + getTypeDescriptor() + "]";
+return "MethodNode@" + hashCode() + "[" +
getDeclaringClass().getName() + "#" + getTypeDescriptor() + "]";
}
public void setReturnType(ClassNode returnType) {
groovy git commit: minor refactor to aid when debugging AST
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X e6b62dfa1 -> ef7173c2a
minor refactor to aid when debugging AST
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ef7173c2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ef7173c2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ef7173c2
Branch: refs/heads/GROOVY_2_6_X
Commit: ef7173c2a78a2b3fe922b2a00ac9a28e1d577d32
Parents: e6b62df
Author: paulk
Authored: Fri Sep 22 14:56:38 2017 +1000
Committer: paulk
Committed: Fri Sep 22 15:10:26 2017 +1000
--
src/main/org/codehaus/groovy/ast/MethodNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef7173c2/src/main/org/codehaus/groovy/ast/MethodNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/MethodNode.java
b/src/main/org/codehaus/groovy/ast/MethodNode.java
index e493071..a43286f 100644
--- a/src/main/org/codehaus/groovy/ast/MethodNode.java
+++ b/src/main/org/codehaus/groovy/ast/MethodNode.java
@@ -192,7 +192,7 @@ public class MethodNode extends AnnotatedNode implements
Opcodes, GroovydocHolde
}
public String toString() {
-return "MethodNode@" + hashCode() + "[" + getTypeDescriptor() + "]";
+return "MethodNode@" + hashCode() + "[" +
getDeclaringClass().getName() + "#" + getTypeDescriptor() + "]";
}
public void setReturnType(ClassNode returnType) {
groovy git commit: minor refactor to aid when debugging AST
Repository: groovy
Updated Branches:
refs/heads/master e74774255 -> 412ec8e01
minor refactor to aid when debugging AST
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/412ec8e0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/412ec8e0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/412ec8e0
Branch: refs/heads/master
Commit: 412ec8e013a3ee9581066148813ddd8a40817a38
Parents: e747742
Author: paulk
Authored: Fri Sep 22 14:56:38 2017 +1000
Committer: paulk
Committed: Fri Sep 22 15:08:40 2017 +1000
--
src/main/org/codehaus/groovy/ast/MethodNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/412ec8e0/src/main/org/codehaus/groovy/ast/MethodNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/MethodNode.java
b/src/main/org/codehaus/groovy/ast/MethodNode.java
index e493071..a43286f 100644
--- a/src/main/org/codehaus/groovy/ast/MethodNode.java
+++ b/src/main/org/codehaus/groovy/ast/MethodNode.java
@@ -192,7 +192,7 @@ public class MethodNode extends AnnotatedNode implements
Opcodes, GroovydocHolde
}
public String toString() {
-return "MethodNode@" + hashCode() + "[" + getTypeDescriptor() + "]";
+return "MethodNode@" + hashCode() + "[" +
getDeclaringClass().getName() + "#" + getTypeDescriptor() + "]";
}
public void setReturnType(ClassNode returnType) {
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 5f9a1e766 -> edea990dc
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/edea990d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/edea990d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/edea990d
Branch: refs/heads/master
Commit: edea990dc9f8431309eba25425c2e2c6183c0e02
Parents: 5f9a1e7
Author: paulk
Authored: Wed Sep 20 23:59:13 2017 +1000
Committer: paulk
Committed: Wed Sep 20 23:59:13 2017 +1000
--
.../stc/StaticTypeCheckingVisitor.java | 56 +++-
1 file changed, 30 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/edea990d/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index d22e006..186efdd 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3993,19 +3993,22 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
}
}
-protected ClassNode getType(ASTNode exp) {
+protected ClassNode getType(final ASTNode exp) {
ClassNode cn = exp.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE);
-if (cn != null) return cn;
+if (cn != null) {
+return cn;
+}
if (exp instanceof ClassExpression) {
ClassNode node = CLASS_Type.getPlainNodeReference();
node.setGenericsTypes(new GenericsType[]{
new GenericsType(((ClassExpression) exp).getType())
});
return node;
-} else if (exp instanceof VariableExpression) {
-VariableExpression vexp = (VariableExpression) exp;
+}
+if (exp instanceof VariableExpression) {
+final VariableExpression vexp = (VariableExpression) exp;
ClassNode selfTrait = isTraitSelf(vexp);
-if (selfTrait!=null) return makeSelf(selfTrait);
+if (selfTrait != null) return makeSelf(selfTrait);
if (vexp == VariableExpression.THIS_EXPRESSION) return makeThis();
if (vexp == VariableExpression.SUPER_EXPRESSION) return
makeSuper();
final Variable variable = vexp.getAccessedVariable();
@@ -4020,24 +4023,26 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
Parameter parameter = (Parameter) variable;
ClassNode type =
typeCheckingContext.controlStructureVariables.get(parameter);
TypeCheckingContext.EnclosingClosure enclosingClosure =
typeCheckingContext.getEnclosingClosure();
-ClassNode[] closureParamTypes =
(ClassNode[])(enclosingClosure!=null?enclosingClosure.getClosureExpression().getNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS):null);
-if (type==null && enclosingClosure !=null &&
"it".equals(variable.getName()) && closureParamTypes!=null) {
+ClassNode[] closureParamTypes = (ClassNode[])
(enclosingClosure != null ?
enclosingClosure.getClosureExpression().getNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS)
: null);
+if (type == null && enclosingClosure != null &&
"it".equals(variable.getName()) && closureParamTypes != null) {
final Parameter[] parameters =
enclosingClosure.getClosureExpression().getParameters();
-if (parameters.length==0 &&
getTemporaryTypesForExpression(vexp)==null && closureParamTypes.length!=0) {
+if (parameters.length == 0 &&
getTemporaryTypesForExpression(vexp) == null && closureParamTypes.length != 0) {
type = closureParamTypes[0];
}
}
if (type != null) {
-storeType((VariableExpression)exp, type);
+storeType(vexp, type);
return type;
}
return getType((Parameter) variable);
}
+return vexp.getOriginType();
}
if (exp instanceof ListExpression) {
return inferListExpressionType((ListExpression) exp);
-} else if (exp instanceof MapExpression) {
+}
+if (exp instanceof MapExpression) {
return inferMapExpressionType((MapExpression) exp);
}
if (exp instanceof ConstructorCallExpression) {
@@ -4050,15 +4055,6 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
[1/2] groovy git commit: minor refactor for build
Repository: groovy
Updated Branches:
refs/heads/master 378e94d23 -> 26fc4e0f2
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a9a8d524
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a9a8d524
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a9a8d524
Branch: refs/heads/master
Commit: a9a8d524e159a1a06a78940f0ee884073175454d
Parents: 378e94d
Author: paulk
Authored: Wed Sep 13 00:38:18 2017 +1000
Committer: paulk
Committed: Wed Sep 13 16:17:04 2017 +1000
--
build.gradle | 7 ---
subprojects/parser-antlr4/build.gradle | 7 +++
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a9a8d524/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 504ab57..1de344a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -321,13 +321,6 @@ sourceSets {
}
apply from: 'subprojects/parser-antlr4/build.gradle'
-sourceSets {
-main {
-antlr {
-srcDirs = ['src/antlr']
-}
-}
-}
// make sure examples can be compiled, even if we don't run them
// todo: reorganize examples so that we can run them too
http://git-wip-us.apache.org/repos/asf/groovy/blob/a9a8d524/subprojects/parser-antlr4/build.gradle
--
diff --git a/subprojects/parser-antlr4/build.gradle
b/subprojects/parser-antlr4/build.gradle
index fc7239a..e70db77 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -18,6 +18,13 @@
*/
apply plugin: 'antlr'
+sourceSets {
+main {
+antlr {
+srcDirs = ['src/antlr']
+}
+}
+}
def srcBase = "subprojects/parser-antlr4/src"
def srcMain = "$srcBase/main"
[2/2] groovy git commit: minor refactor for build
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/26fc4e0f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/26fc4e0f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/26fc4e0f
Branch: refs/heads/master
Commit: 26fc4e0f2b3ac6bb26660899f6d2e8b1daee39ce
Parents: a9a8d52
Author: paulk
Authored: Wed Sep 13 12:49:25 2017 +1000
Committer: paulk
Committed: Wed Sep 13 16:17:05 2017 +1000
--
build.gradle| 5 +
gradle/assemble.gradle | 10 -
gradle/docs.gradle | 2 +-
.../META-INF/groovy-release-info.properties | 23
.../org.codehaus.groovy.source.Extensions | 22 ---
codehaus.groovy.transform.ASTTransformation | 20 -
.../META-INF/groovy-release-info.properties | 23
.../org.codehaus.groovy.source.Extensions | 22 +++
codehaus.groovy.transform.ASTTransformation | 20 +
9 files changed, 71 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 1de344a..1bf8f47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,10 +287,7 @@ sourceSets {
}
}
resources {
-srcDirs = ['src/main', 'src/resources']
-include 'META-INF/services/*',
-'META-INF/groovy-release-info.properties',
-'groovy/grape/*.xml'
+srcDirs = ['src/resources']
}
}
test {
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/gradle/assemble.gradle
--
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 3fdfd31..b6581c4 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -141,14 +141,12 @@ jar {
include('antlr2-license.txt')
}
from("$projectDir/notices/NOTICE-JARJAR")
-from('src/main/META-INF/groovy-release-info.properties') {
+from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' :
filename == 'NOTICE-JARJAR' ? 'NOTICE' : filename }
}
-
-exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
-
+exclude '**/package-info.class'
}
allprojects {
@@ -276,12 +274,12 @@ subprojects { sp ->
} else {
from "${rootProject.projectDir}/notices/NOTICE-BASE"
}
-
from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties")
{
+
from("${rootProject.projectDir}/src/resources/META-INF/groovy-release-info.properties")
{
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE'
: filename == 'NOTICE-BASE' ? 'NOTICE' : filename }
}
-exclude '**/package-info.class',
'META-INF/groovy-release-info.properties'
+exclude '**/package-info.class'
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/gradle/docs.gradle
--
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 905d06a..f9992ba 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -114,7 +114,7 @@ groovydocAll groovydocSpec
task docProjectVersionInfo(type: Copy) {
destinationDir =
file("${project(':groovy-docgenerator').buildDir}/classes/main")
into('META-INF') {
-from('src/main/META-INF/groovy-release-info.properties') {
+from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/26fc4e0f/src/main/META-INF/groovy-release-info.properties
--
diff --git a/src/main/META-INF/groovy-release-info.properties
b/src/main/META-INF/groovy-release-info.properties
deleted file mode 100644
index 7eae8ae..000
--- a/src/main/META-INF/groovy-release-info.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
-
groovy git commit: minor refactor for build
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 496dbaa4d -> d39107bb9
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d39107bb
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d39107bb
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d39107bb
Branch: refs/heads/GROOVY_2_6_X
Commit: d39107bb9b5b0adad42fbabf518e8ce8de0f90dc
Parents: 496dbaa
Author: paulk
Authored: Wed Sep 13 12:49:25 2017 +1000
Committer: paulk
Committed: Wed Sep 13 12:49:25 2017 +1000
--
build.gradle| 5 +
gradle/assemble.gradle | 10 -
gradle/docs.gradle | 2 +-
.../META-INF/groovy-release-info.properties | 23
.../org.codehaus.groovy.source.Extensions | 22 ---
codehaus.groovy.transform.ASTTransformation | 20 -
.../META-INF/groovy-release-info.properties | 23
.../org.codehaus.groovy.source.Extensions | 22 +++
codehaus.groovy.transform.ASTTransformation | 20 +
9 files changed, 71 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/build.gradle
--
diff --git a/build.gradle b/build.gradle
index b7ec76a..832f1cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -289,10 +289,7 @@ sourceSets {
}
}
resources {
-srcDirs = ['src/main', 'src/resources']
-include 'META-INF/services/*',
-'META-INF/groovy-release-info.properties',
-'groovy/grape/*.xml'
+srcDirs = ['src/resources']
}
}
test {
http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/gradle/assemble.gradle
--
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 3fdfd31..b6581c4 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -141,14 +141,12 @@ jar {
include('antlr2-license.txt')
}
from("$projectDir/notices/NOTICE-JARJAR")
-from('src/main/META-INF/groovy-release-info.properties') {
+from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' :
filename == 'NOTICE-JARJAR' ? 'NOTICE' : filename }
}
-
-exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
-
+exclude '**/package-info.class'
}
allprojects {
@@ -276,12 +274,12 @@ subprojects { sp ->
} else {
from "${rootProject.projectDir}/notices/NOTICE-BASE"
}
-
from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties")
{
+
from("${rootProject.projectDir}/src/resources/META-INF/groovy-release-info.properties")
{
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE'
: filename == 'NOTICE-BASE' ? 'NOTICE' : filename }
}
-exclude '**/package-info.class',
'META-INF/groovy-release-info.properties'
+exclude '**/package-info.class'
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/gradle/docs.gradle
--
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 905d06a..f9992ba 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -114,7 +114,7 @@ groovydocAll groovydocSpec
task docProjectVersionInfo(type: Copy) {
destinationDir =
file("${project(':groovy-docgenerator').buildDir}/classes/main")
into('META-INF') {
-from('src/main/META-INF/groovy-release-info.properties') {
+from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter,
org.apache.tools.ant.filters.ReplaceTokens)
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/main/META-INF/groovy-release-info.properties
--
diff --git a/src/main/META-INF/groovy-release-info.properties
b/src/main/META-INF/groovy-release-info.properties
deleted file mode 100644
index 7eae8ae..000
--- a/src/main/META-INF/groovy-release-info.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor licens
groovy git commit: minor refactor for build
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 57e54 -> 496dbaa4d
minor refactor for build
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/496dbaa4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/496dbaa4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/496dbaa4
Branch: refs/heads/GROOVY_2_6_X
Commit: 496dbaa4dc68e7c969e1d05b4dbf45732c8e64d0
Parents: 57e
Author: paulk
Authored: Wed Sep 13 00:38:18 2017 +1000
Committer: paulk
Committed: Wed Sep 13 00:38:35 2017 +1000
--
build.gradle | 7 ---
subprojects/parser-antlr4/build.gradle | 7 +++
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/496dbaa4/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 8de2ac6..b7ec76a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -323,13 +323,6 @@ sourceSets {
}
apply from: 'subprojects/parser-antlr4/build.gradle'
-sourceSets {
-main {
-antlr {
-srcDirs = ['src/antlr']
-}
-}
-}
// make sure examples can be compiled, even if we don't run them
// todo: reorganize examples so that we can run them too
http://git-wip-us.apache.org/repos/asf/groovy/blob/496dbaa4/subprojects/parser-antlr4/build.gradle
--
diff --git a/subprojects/parser-antlr4/build.gradle
b/subprojects/parser-antlr4/build.gradle
index a2a28a3..d1fd1d0 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -19,6 +19,13 @@
if (!rootProject.hasProperty('useAntlr4')) return
apply plugin: 'antlr'
+sourceSets {
+main {
+antlr {
+srcDirs = ['src/antlr']
+}
+}
+}
def srcBase = "subprojects/parser-antlr4/src"
def srcMain = "$srcBase/main"
[6/6] groovy git commit: minor refactor after 'Refine node position of fields'
minor refactor after 'Refine node position of fields'
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6f78baf8
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6f78baf8
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6f78baf8
Branch: refs/heads/GROOVY_2_6_X
Commit: 6f78baf82e18c47d4ffc1dfb8bc3a8cfd190b3ed
Parents: d822809
Author: paulk
Authored: Sat May 13 21:51:55 2017 +1000
Committer: paulk
Committed: Sat May 13 22:01:46 2017 +1000
--
src/test/org/codehaus/groovy/ast/LineColumnCheck.txt| 9 +
src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt | 9 -
src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt | 9 -
3 files changed, 9 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/6f78baf8/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 7895ca1..825bb63 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
@@ -17,6 +17,15 @@
under the License.
+###FieldNode:::
+public class Test {
+ public attribute = 6, second = 9
+ String prop = "property"
+}
+:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
+[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
+[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
+
###wholeAnnotationExpressionSelection:::
import java.lang.annotation.*
@Target([ElementType.TYPE])
http://git-wip-us.apache.org/repos/asf/groovy/blob/6f78baf8/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 dd70f0a..54e707d 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
@@ -17,15 +17,6 @@
under the License.
-###FieldNode:::
-public class Test {
- public attribute = 6, second = 9
- String prop = "property"
-}
-:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
-[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
-[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
-
###ifElse:::
if (expression) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/6f78baf8/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 8659937..6f26726 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
@@ -17,15 +17,6 @@
under the License.
-###FieldNode:::
-public class Test {
- public attribute = 6, second = 9
- String prop = "property"
-}
-:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
-[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
-[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
-
###ifElse:::
if (expression) {
groovy git commit: minor refactor after 'Refine node position of fields'
Repository: groovy
Updated Branches:
refs/heads/master 7da88ad24 -> c68cfc165
minor refactor after 'Refine node position of fields'
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c68cfc16
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c68cfc16
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c68cfc16
Branch: refs/heads/master
Commit: c68cfc1659b6afafc1c6c643186c7c89ab184db2
Parents: 7da88ad
Author: paulk
Authored: Sat May 13 21:51:55 2017 +1000
Committer: paulk
Committed: Sat May 13 21:51:55 2017 +1000
--
src/test/org/codehaus/groovy/ast/LineColumnCheck.txt| 9 +
src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt | 9 -
src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt | 9 -
3 files changed, 9 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c68cfc16/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 7895ca1..825bb63 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
@@ -17,6 +17,15 @@
under the License.
+###FieldNode:::
+public class Test {
+ public attribute = 6, second = 9
+ String prop = "property"
+}
+:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
+[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
+[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
+
###wholeAnnotationExpressionSelection:::
import java.lang.annotation.*
@Target([ElementType.TYPE])
http://git-wip-us.apache.org/repos/asf/groovy/blob/c68cfc16/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 dd70f0a..54e707d 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr2.txt
@@ -17,15 +17,6 @@
under the License.
-###FieldNode:::
-public class Test {
- public attribute = 6, second = 9
- String prop = "property"
-}
-:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
-[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
-[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
-
###ifElse:::
if (expression) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/c68cfc16/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 8659937..6f26726 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheck_antlr4.txt
@@ -17,15 +17,6 @@
under the License.
-###FieldNode:::
-public class Test {
- public attribute = 6, second = 9
- String prop = "property"
-}
-:::[FieldNode,(2:2),(2:22)][ConstantExpression,(2:21),(2:22)];
-[FieldNode,(2:24),(2:34)][ConstantExpression,(2:33),(2:34)];
-[FieldNode,(3:2),(3:26)][ConstantExpression,(3:16),(3:26)]
-
###ifElse:::
if (expression) {
[1/6] groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map}
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 81f4fd62a -> 1031d90b7
minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map}
instead of Hash{Set|Map}
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/752d06f3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/752d06f3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/752d06f3
Branch: refs/heads/GROOVY_2_4_X
Commit: 752d06f387fd0980641a68b971b069ee69e84e8f
Parents: 81f4fd6
Author: paulk
Authored: Sat Apr 22 07:28:26 2017 +1000
Committer: paulk
Committed: Sat Apr 22 16:11:29 2017 +1000
--
.../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++---
.../groovy/tools/groovydoc/MockOutputTool.java| 8
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++---
.../groovydoc/SimpleGroovyClassDocAssembler.java | 8
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/752d06f3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index afc0fdc..8633e9b 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine {
this.docTemplatePaths = Arrays.asList(docTemplates);
this.packageTemplatePaths = Arrays.asList(packageTemplates);
this.classTemplatePaths = Arrays.asList(classTemplates);
-this.docTemplates = new HashMap();
-this.packageTemplates = new HashMap();
-this.classTemplates = new HashMap();
+this.docTemplates = new LinkedHashMap();
+this.packageTemplates = new LinkedHashMap();
+this.classTemplates = new LinkedHashMap();
engine = new GStringTemplateEngine();
}
@@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine {
t =
engine.createTemplate(resourceManager.getReader(templatePath));
classTemplates.put(templatePath, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("classDoc", classDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
packageTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("packageDoc", packageDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
docTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("rootDoc", rootDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
http://git-wip-us.apache.org/repos/asf/groovy/blob/752d06f3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
index 0a384cf..260485d 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
@@ -18,8 +18,8 @@
*/
package org.codehaus.groovy.tools.groo
[2/6] groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map}
minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map}
instead of Hash{Set|Map}
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8d0cf4e9
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8d0cf4e9
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8d0cf4e9
Branch: refs/heads/GROOVY_2_5_X
Commit: 8d0cf4e90e0e4a3c24d4e4f7df61eb2fb24329d3
Parents: e802f6f
Author: paulk
Authored: Sat Apr 22 07:28:26 2017 +1000
Committer: paulk
Committed: Sat Apr 22 16:08:27 2017 +1000
--
.../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++---
.../groovy/tools/groovydoc/MockOutputTool.java| 8
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++---
.../groovydoc/SimpleGroovyClassDocAssembler.java | 8
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index 07f7119..ce63ed5 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine {
this.docTemplatePaths = Arrays.asList(docTemplates);
this.packageTemplatePaths = Arrays.asList(packageTemplates);
this.classTemplatePaths = Arrays.asList(classTemplates);
-this.docTemplates = new HashMap();
-this.packageTemplates = new HashMap();
-this.classTemplates = new HashMap();
+this.docTemplates = new LinkedHashMap();
+this.packageTemplates = new LinkedHashMap();
+this.classTemplates = new LinkedHashMap();
engine = new GStringTemplateEngine();
}
@@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine {
t =
engine.createTemplate(resourceManager.getReader(templatePath));
classTemplates.put(templatePath, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("classDoc", classDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
packageTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("packageDoc", packageDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
docTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("rootDoc", rootDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
index 0a384cf..260485d 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
@@ -18,8 +18,8 @@
*/
package org.codehaus.groovy.tools.groovydoc;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedH
[1/6] groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map}
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 7eba954a3 -> b84d25803
minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map}
instead of Hash{Set|Map}
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/891211b2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/891211b2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/891211b2
Branch: refs/heads/GROOVY_2_6_X
Commit: 891211b23fd289204f3ba7239e0f2a9fd02f0db3
Parents: 7eba954
Author: paulk
Authored: Sat Apr 22 07:28:26 2017 +1000
Committer: paulk
Committed: Sat Apr 22 16:07:37 2017 +1000
--
.../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++---
.../groovy/tools/groovydoc/MockOutputTool.java| 8
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++---
.../groovydoc/SimpleGroovyClassDocAssembler.java | 8
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/891211b2/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index 07f7119..ce63ed5 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine {
this.docTemplatePaths = Arrays.asList(docTemplates);
this.packageTemplatePaths = Arrays.asList(packageTemplates);
this.classTemplatePaths = Arrays.asList(classTemplates);
-this.docTemplates = new HashMap();
-this.packageTemplates = new HashMap();
-this.classTemplates = new HashMap();
+this.docTemplates = new LinkedHashMap();
+this.packageTemplates = new LinkedHashMap();
+this.classTemplates = new LinkedHashMap();
engine = new GStringTemplateEngine();
}
@@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine {
t =
engine.createTemplate(resourceManager.getReader(templatePath));
classTemplates.put(templatePath, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("classDoc", classDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
packageTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("packageDoc", packageDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
docTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("rootDoc", rootDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
http://git-wip-us.apache.org/repos/asf/groovy/blob/891211b2/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
index 0a384cf..260485d 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
@@ -18,8 +18,8 @@
*/
package org.codehaus.groovy.tools.groo
[29/40] groovy git commit: minor refactor: no longer needed
minor refactor: no longer needed
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/17c4ac2f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/17c4ac2f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/17c4ac2f
Branch: refs/heads/parrot
Commit: 17c4ac2fdd6ba6af22d4b5464ef351aa120707a7
Parents: b30925c
Author: paulk
Authored: Fri Apr 21 13:12:40 2017 +1000
Committer: paulk
Committed: Fri Apr 21 13:12:40 2017 +1000
--
build.gradle | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/17c4ac2f/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 6e94268..a17549f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -264,11 +264,6 @@ sourceSets {
'src/main',
"$generatedDirectory/src/main"
]
-fileTree('src/main/groovy/ui').matching {
-exclude 'GroovyMain.java', 'GroovySocketServer.java'
-}.visit { details ->
-exclude "groovy/ui/$details.path"
-}
}
groovy {
srcDirs = [
[37/40] groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map}
minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map}
instead of Hash{Set|Map}
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c2daa7d0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c2daa7d0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c2daa7d0
Branch: refs/heads/parrot
Commit: c2daa7d069593ec9d6c42a5aa7c40210629fd1ae
Parents: 8ab8377
Author: paulk
Authored: Sat Apr 22 07:28:26 2017 +1000
Committer: paulk
Committed: Sat Apr 22 07:29:05 2017 +1000
--
.../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++---
.../groovy/tools/groovydoc/MockOutputTool.java| 8
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++---
.../groovydoc/SimpleGroovyClassDocAssembler.java | 8
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2daa7d0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index 07f7119..ce63ed5 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine {
this.docTemplatePaths = Arrays.asList(docTemplates);
this.packageTemplatePaths = Arrays.asList(packageTemplates);
this.classTemplatePaths = Arrays.asList(classTemplates);
-this.docTemplates = new HashMap();
-this.packageTemplates = new HashMap();
-this.classTemplates = new HashMap();
+this.docTemplates = new LinkedHashMap();
+this.packageTemplates = new LinkedHashMap();
+this.classTemplates = new LinkedHashMap();
engine = new GStringTemplateEngine();
}
@@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine {
t =
engine.createTemplate(resourceManager.getReader(templatePath));
classTemplates.put(templatePath, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("classDoc", classDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
packageTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("packageDoc", packageDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
docTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("rootDoc", rootDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2daa7d0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
index 0a384cf..260485d 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
@@ -18,8 +18,8 @@
*/
package org.codehaus.groovy.tools.groovydoc;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap
groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map}
Repository: groovy
Updated Branches:
refs/heads/master 8ab837782 -> c2daa7d06
minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map}
instead of Hash{Set|Map}
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c2daa7d0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c2daa7d0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c2daa7d0
Branch: refs/heads/master
Commit: c2daa7d069593ec9d6c42a5aa7c40210629fd1ae
Parents: 8ab8377
Author: paulk
Authored: Sat Apr 22 07:28:26 2017 +1000
Committer: paulk
Committed: Sat Apr 22 07:29:05 2017 +1000
--
.../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++---
.../groovy/tools/groovydoc/MockOutputTool.java| 8
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++---
.../groovydoc/SimpleGroovyClassDocAssembler.java | 8
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2daa7d0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index 07f7119..ce63ed5 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine {
this.docTemplatePaths = Arrays.asList(docTemplates);
this.packageTemplatePaths = Arrays.asList(packageTemplates);
this.classTemplatePaths = Arrays.asList(classTemplates);
-this.docTemplates = new HashMap();
-this.packageTemplates = new HashMap();
-this.classTemplates = new HashMap();
+this.docTemplates = new LinkedHashMap();
+this.packageTemplates = new LinkedHashMap();
+this.classTemplates = new LinkedHashMap();
engine = new GStringTemplateEngine();
}
@@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine {
t =
engine.createTemplate(resourceManager.getReader(templatePath));
classTemplates.put(templatePath, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("classDoc", classDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
packageTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("packageDoc", packageDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
@@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine {
t = engine.createTemplate(resourceManager.getReader(template));
docTemplates.put(template, t);
}
-Map binding = new HashMap();
+Map binding = new LinkedHashMap();
binding.put("rootDoc", rootDoc);
binding.put("props", properties);
templateWithBindingApplied = t.make(binding).toString();
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2daa7d0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
--
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
index 0a384cf..260485d 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
@@ -18,8 +18,8 @@
*/
package org.codehaus.groovy.tools.groovydoc;
-im
[4/6] groovy git commit: minor refactor: no longer needed
minor refactor: no longer needed
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0efdb1e4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0efdb1e4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0efdb1e4
Branch: refs/heads/GROOVY_2_5_X
Commit: 0efdb1e4d8db6f8a16de0adb5c30cb80a152e67a
Parents: b100c6f
Author: paulk
Authored: Fri Apr 21 13:12:40 2017 +1000
Committer: paulk
Committed: Fri Apr 21 16:06:17 2017 +1000
--
build.gradle | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/0efdb1e4/build.gradle
--
diff --git a/build.gradle b/build.gradle
index b2a5047..1152d94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -258,11 +258,6 @@ sourceSets {
'src/main',
"$generatedDirectory/src/main"
]
-fileTree('src/main/groovy/ui').matching {
-exclude 'GroovyMain.java', 'GroovySocketServer.java'
-}.visit { details ->
-exclude "groovy/ui/$details.path"
-}
}
groovy {
srcDirs = [
groovy git commit: minor refactor: no longer needed
Repository: groovy
Updated Branches:
refs/heads/master b30925cfc -> 17c4ac2fd
minor refactor: no longer needed
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/17c4ac2f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/17c4ac2f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/17c4ac2f
Branch: refs/heads/master
Commit: 17c4ac2fdd6ba6af22d4b5464ef351aa120707a7
Parents: b30925c
Author: paulk
Authored: Fri Apr 21 13:12:40 2017 +1000
Committer: paulk
Committed: Fri Apr 21 13:12:40 2017 +1000
--
build.gradle | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/17c4ac2f/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 6e94268..a17549f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -264,11 +264,6 @@ sourceSets {
'src/main',
"$generatedDirectory/src/main"
]
-fileTree('src/main/groovy/ui').matching {
-exclude 'GroovyMain.java', 'GroovySocketServer.java'
-}.visit { details ->
-exclude "groovy/ui/$details.path"
-}
}
groovy {
srcDirs = [
[05/11] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c219797c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c219797c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c219797c
Branch: refs/heads/parrot
Commit: c219797c8f4e2021e05ed70adb8a562140ab1dd2
Parents: d4edf9c
Author: paulk
Authored: Wed Feb 1 14:17:53 2017 +1000
Committer: paulk
Committed: Wed Feb 1 14:18:20 2017 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 4 +
.../stc/StaticTypeCheckingVisitor.java | 128 ---
2 files changed, 58 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c219797c/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
index 6afa4e0..bcdf627 100644
--- a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -125,6 +125,10 @@ public class GeneralUtils {
return new AttributeExpression(oe, prop);
}
+public static BinaryExpression binX(Expression left, Token token,
Expression right) {
+return new BinaryExpression(left, token, right);
+}
+
public static BlockStatement block(VariableScope varScope, Statement...
stmts) {
BlockStatement block = new BlockStatement();
block.setVariableScope(varScope);
http://git-wip-us.apache.org/repos/asf/groovy/blob/c219797c/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index bac9d7c..0f49976 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -91,6 +91,11 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import static org.codehaus.groovy.ast.ClassHelper.*;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
import static
org.codehaus.groovy.ast.tools.WideningCategories.LowestUpperBoundClassNode;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigDecCategory;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory;
@@ -490,7 +495,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
}
private boolean tryVariableExpressionAsProperty(final VariableExpression
vexp, final String dynName) {
-VariableExpression implicitThis = new VariableExpression("this");
+VariableExpression implicitThis = varX("this");
PropertyExpression pe = new PropertyExpression(implicitThis, dynName);
pe.setImplicitThis(true);
if (visitPropertyExpressionSilent(pe, vexp)) {
@@ -575,7 +580,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (!isPrimitiveType(lType))
rType = UNKNOWN_PARAMETER_TYPE; // primitive types should
be ignored as they will result in another failure
}
-BinaryExpression reversedBinaryExpression = new
BinaryExpression(rightExpression, expression.getOperation(), leftExpression);
+BinaryExpression reversedBinaryExpression = binX(rightExpression,
expression.getOperation(), leftExpression);
ClassNode resultType = op==KEYWORD_IN
?getResultType(rType,op,lType,reversedBinaryExpression)
:getResultType(lType, op, rType, expression);
@@ -717,12 +722,12 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
// we know that the RHS type is a closure
// but we must check if the binary expression is an assignment
// because we need to check if a setter uses @DelegatesTo
-VariableExpression ve = new VariableExpression("%",
setterInfo.receiverType);
+VariableExpression ve = varX("%", setterInfo.receiverType);
// for compound assignment "x op= y" find type as if it was "x = (x op
y)"
final Expression newRightExpression = isCompoundAssignment(expression)
-? new BinaryExpression(leftExpression,
getOpWithoutEqual(
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 86873e5ad -> 21c14515d
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/21c14515
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/21c14515
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/21c14515
Branch: refs/heads/GROOVY_2_4_X
Commit: 21c14515d8a57d056e6dedcef52eb754791fa386
Parents: 86873e5
Author: paulk
Authored: Wed Feb 1 14:17:53 2017 +1000
Committer: paulk
Committed: Wed Feb 1 14:17:53 2017 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 4 +
.../stc/StaticTypeCheckingVisitor.java | 128 ---
2 files changed, 58 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/21c14515/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
index feec3aa..65e6f28 100644
--- a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -121,6 +121,10 @@ public class GeneralUtils {
return new AttributeExpression(oe, prop);
}
+public static BinaryExpression binX(Expression left, Token token,
Expression right) {
+return new BinaryExpression(left, token, right);
+}
+
public static BlockStatement block(VariableScope varScope, Statement...
stmts) {
BlockStatement block = new BlockStatement();
block.setVariableScope(varScope);
http://git-wip-us.apache.org/repos/asf/groovy/blob/21c14515/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 036404d..643253a 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -90,6 +90,11 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import static org.codehaus.groovy.ast.ClassHelper.*;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
import static
org.codehaus.groovy.ast.tools.WideningCategories.LowestUpperBoundClassNode;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigDecCategory;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory;
@@ -481,7 +486,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
}
private boolean tryVariableExpressionAsProperty(final VariableExpression
vexp, final String dynName) {
-VariableExpression implicitThis = new VariableExpression("this");
+VariableExpression implicitThis = varX("this");
PropertyExpression pe = new PropertyExpression(implicitThis, dynName);
pe.setImplicitThis(true);
if (visitPropertyExpressionSilent(pe, vexp)) {
@@ -566,7 +571,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (!isPrimitiveType(lType))
rType = UNKNOWN_PARAMETER_TYPE; // primitive types should
be ignored as they will result in another failure
}
-BinaryExpression reversedBinaryExpression = new
BinaryExpression(rightExpression, expression.getOperation(), leftExpression);
+BinaryExpression reversedBinaryExpression = binX(rightExpression,
expression.getOperation(), leftExpression);
ClassNode resultType = op==KEYWORD_IN
?getResultType(rType,op,lType,reversedBinaryExpression)
:getResultType(lType, op, rType, expression);
@@ -708,12 +713,12 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
// we know that the RHS type is a closure
// but we must check if the binary expression is an assignment
// because we need to check if a setter uses @DelegatesTo
-VariableExpression ve = new VariableExpression("%",
setterInfo.receiverType);
+VariableExpression ve = varX("%", setterInfo.receiverType);
// for compound assignment "x op= y" find type as if it was "x = (x op
y)"
final Expression newRightExpression = isCompoundAssi
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master d4edf9c53 -> c219797c8
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c219797c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c219797c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c219797c
Branch: refs/heads/master
Commit: c219797c8f4e2021e05ed70adb8a562140ab1dd2
Parents: d4edf9c
Author: paulk
Authored: Wed Feb 1 14:17:53 2017 +1000
Committer: paulk
Committed: Wed Feb 1 14:18:20 2017 +1000
--
.../codehaus/groovy/ast/tools/GeneralUtils.java | 4 +
.../stc/StaticTypeCheckingVisitor.java | 128 ---
2 files changed, 58 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/c219797c/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
index 6afa4e0..bcdf627 100644
--- a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -125,6 +125,10 @@ public class GeneralUtils {
return new AttributeExpression(oe, prop);
}
+public static BinaryExpression binX(Expression left, Token token,
Expression right) {
+return new BinaryExpression(left, token, right);
+}
+
public static BlockStatement block(VariableScope varScope, Statement...
stmts) {
BlockStatement block = new BlockStatement();
block.setVariableScope(varScope);
http://git-wip-us.apache.org/repos/asf/groovy/blob/c219797c/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index bac9d7c..0f49976 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -91,6 +91,11 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import static org.codehaus.groovy.ast.ClassHelper.*;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
import static
org.codehaus.groovy.ast.tools.WideningCategories.LowestUpperBoundClassNode;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigDecCategory;
import static
org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory;
@@ -490,7 +495,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
}
private boolean tryVariableExpressionAsProperty(final VariableExpression
vexp, final String dynName) {
-VariableExpression implicitThis = new VariableExpression("this");
+VariableExpression implicitThis = varX("this");
PropertyExpression pe = new PropertyExpression(implicitThis, dynName);
pe.setImplicitThis(true);
if (visitPropertyExpressionSilent(pe, vexp)) {
@@ -575,7 +580,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (!isPrimitiveType(lType))
rType = UNKNOWN_PARAMETER_TYPE; // primitive types should
be ignored as they will result in another failure
}
-BinaryExpression reversedBinaryExpression = new
BinaryExpression(rightExpression, expression.getOperation(), leftExpression);
+BinaryExpression reversedBinaryExpression = binX(rightExpression,
expression.getOperation(), leftExpression);
ClassNode resultType = op==KEYWORD_IN
?getResultType(rType,op,lType,reversedBinaryExpression)
:getResultType(lType, op, rType, expression);
@@ -717,12 +722,12 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
// we know that the RHS type is a closure
// but we must check if the binary expression is an assignment
// because we need to check if a setter uses @DelegatesTo
-VariableExpression ve = new VariableExpression("%",
setterInfo.receiverType);
+VariableExpression ve = varX("%", setterInfo.receiverType);
// for compound assignment "x op= y" find type as if it was "x = (x op
y)"
final Expression newRightExpression = isCompoundAssignment(expre
[28/50] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d96256ca
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d96256ca
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d96256ca
Branch: refs/heads/GROOVY_2_4_X
Commit: d96256ca2fbf54c8786143355691dfa278df1d20
Parents: 9accb0e
Author: paulk
Authored: Thu Dec 29 18:29:45 2016 +1000
Committer: paulk
Committed: Thu Dec 29 18:30:44 2016 +1000
--
build.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/d96256ca/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 3349147..18f63d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -437,7 +437,9 @@ compileTestGroovy {
// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for
future?
task checkCompatibility {
-assert JavaVersion.current().java7Compatible
+doLast {
+assert JavaVersion.current().java7Compatible
+}
}
apply from: 'gradle/test.gradle'
[02/22] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a19feb7d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a19feb7d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a19feb7d
Branch: refs/heads/parrot
Commit: a19feb7d310bb86b925e1d092af28ad00dceee6c
Parents: 370df79
Author: paulk
Authored: Thu Dec 29 18:29:45 2016 +1000
Committer: paulk
Committed: Thu Dec 29 18:29:45 2016 +1000
--
build.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a19feb7d/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 9ed8d26..a23496b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -467,7 +467,9 @@ compileTestGroovy {
// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for
future?
task checkCompatibility {
-assert JavaVersion.current().java7Compatible
+doLast {
+assert JavaVersion.current().java7Compatible
+}
}
apply from: 'gradle/test.gradle'
[03/22] groovy git commit: minor refactor
minor refactor Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0d5c0b8e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0d5c0b8e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0d5c0b8e Branch: refs/heads/parrot Commit: 0d5c0b8eeefe9f4fdcbfd5a92ef28106d7bf0ccf Parents: a19feb7 Author: paulk Authored: Thu Dec 29 21:55:48 2016 +1000 Committer: paulk Committed: Thu Dec 29 21:55:48 2016 +1000 -- .../codehaus/groovy/transform/AutoImplementASTTransformation.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/0d5c0b8e/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java -- diff --git a/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java index 6366627..5ec874f 100644 --- a/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java @@ -34,7 +34,6 @@ import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.ast.tools.ParameterUtils; import org.codehaus.groovy.control.CompilePhase; -import org.codehaus.groovy.control.GenericsVisitor; import org.codehaus.groovy.control.SourceUnit; import org.objectweb.asm.Opcodes;
groovy git commit: minor refactor
Repository: groovy Updated Branches: refs/heads/master a19feb7d3 -> 0d5c0b8ee minor refactor Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0d5c0b8e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0d5c0b8e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0d5c0b8e Branch: refs/heads/master Commit: 0d5c0b8eeefe9f4fdcbfd5a92ef28106d7bf0ccf Parents: a19feb7 Author: paulk Authored: Thu Dec 29 21:55:48 2016 +1000 Committer: paulk Committed: Thu Dec 29 21:55:48 2016 +1000 -- .../codehaus/groovy/transform/AutoImplementASTTransformation.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/0d5c0b8e/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java -- diff --git a/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java index 6366627..5ec874f 100644 --- a/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/AutoImplementASTTransformation.java @@ -34,7 +34,6 @@ import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.ast.tools.ParameterUtils; import org.codehaus.groovy.control.CompilePhase; -import org.codehaus.groovy.control.GenericsVisitor; import org.codehaus.groovy.control.SourceUnit; import org.objectweb.asm.Opcodes;
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 9accb0e3d -> d96256ca2
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d96256ca
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d96256ca
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d96256ca
Branch: refs/heads/GROOVY_2_4_X
Commit: d96256ca2fbf54c8786143355691dfa278df1d20
Parents: 9accb0e
Author: paulk
Authored: Thu Dec 29 18:29:45 2016 +1000
Committer: paulk
Committed: Thu Dec 29 18:30:44 2016 +1000
--
build.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/d96256ca/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 3349147..18f63d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -437,7 +437,9 @@ compileTestGroovy {
// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for
future?
task checkCompatibility {
-assert JavaVersion.current().java7Compatible
+doLast {
+assert JavaVersion.current().java7Compatible
+}
}
apply from: 'gradle/test.gradle'
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 370df790d -> a19feb7d3
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a19feb7d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a19feb7d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a19feb7d
Branch: refs/heads/master
Commit: a19feb7d310bb86b925e1d092af28ad00dceee6c
Parents: 370df79
Author: paulk
Authored: Thu Dec 29 18:29:45 2016 +1000
Committer: paulk
Committed: Thu Dec 29 18:29:45 2016 +1000
--
build.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a19feb7d/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 9ed8d26..a23496b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -467,7 +467,9 @@ compileTestGroovy {
// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for
future?
task checkCompatibility {
-assert JavaVersion.current().java7Compatible
+doLast {
+assert JavaVersion.current().java7Compatible
+}
}
apply from: 'gradle/test.gradle'
[1/2] groovy git commit: minor refactor: deprecate method
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 49d5dd159 -> 287b9ab5b
minor refactor: deprecate method
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/287b9ab5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/287b9ab5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/287b9ab5
Branch: refs/heads/GROOVY_2_4_X
Commit: 287b9ab5bf80b944b34b30122a4db9dcbbee5d1d
Parents: 5bae714
Author: John Wagenleitner
Authored: Sat Sep 10 19:08:44 2016 -0700
Committer: John Wagenleitner
Committed: Sat Sep 10 19:19:09 2016 -0700
--
src/main/org/codehaus/groovy/control/ParserPluginFactory.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/287b9ab5/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
--
diff --git a/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
b/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
index d043a7f..30a0d1c 100644
--- a/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
+++ b/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
@@ -34,7 +34,9 @@ public abstract class ParserPluginFactory {
*
* @param useNewParser unused.
* @return the new parser factory.
+ * @deprecated use {@link #newInstance()}
*/
+@Deprecated
public static ParserPluginFactory newInstance(boolean useNewParser) {
return newInstance();
}
[1/2] groovy git commit: minor refactor: deprecate method
Repository: groovy
Updated Branches:
refs/heads/master 84f6288b9 -> 006b0ba12
minor refactor: deprecate method
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/006b0ba1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/006b0ba1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/006b0ba1
Branch: refs/heads/master
Commit: 006b0ba1255fdc449e0f8b38a9997f513be090fc
Parents: 4241dce
Author: John Wagenleitner
Authored: Sat Sep 10 19:08:44 2016 -0700
Committer: John Wagenleitner
Committed: Sat Sep 10 19:10:03 2016 -0700
--
src/main/org/codehaus/groovy/control/ParserPluginFactory.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/006b0ba1/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
--
diff --git a/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
b/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
index d043a7f..30a0d1c 100644
--- a/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
+++ b/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
@@ -34,7 +34,9 @@ public abstract class ParserPluginFactory {
*
* @param useNewParser unused.
* @return the new parser factory.
+ * @deprecated use {@link #newInstance()}
*/
+@Deprecated
public static ParserPluginFactory newInstance(boolean useNewParser) {
return newInstance();
}
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master c6f32044e -> 0765a21f6
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0765a21f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0765a21f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0765a21f
Branch: refs/heads/master
Commit: 0765a21f6a058f7023d73a170635a4dffa851a72
Parents: c6f3204
Author: paulk
Authored: Mon Aug 29 12:05:47 2016 +1000
Committer: paulk
Committed: Mon Aug 29 12:05:47 2016 +1000
--
src/main/groovy/lang/MetaClassImpl.java | 17 +
.../codehaus/groovy/ast/tools/GeneralUtils.java | 20
.../codehaus/groovy/control/ResolveVisitor.java | 13 -
3 files changed, 29 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/0765a21f/src/main/groovy/lang/MetaClassImpl.java
--
diff --git a/src/main/groovy/lang/MetaClassImpl.java
b/src/main/groovy/lang/MetaClassImpl.java
index 32988a9..91ddf9a 100644
--- a/src/main/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/lang/MetaClassImpl.java
@@ -92,15 +92,11 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.inSamePackage;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.isDefaultVisibility;
+
/**
* Allows methods to be dynamically added to existing classes at runtime
- *
- * @author mailto:ja...@coredevelopers.net";>James Strachan
- * @author Guillaume Laforge
- * @author mailto:blackd...@gmx.org";>Jochen "blackdrag" Theodorou
- * @author Graeme Rocher
- * @author Alex Tkachman
- * @author Roshan Dawrani
* @see groovy.lang.MetaClass
*/
public class MetaClassImpl implements MetaClass, MutableMetaClass {
@@ -2403,12 +2399,9 @@ public class MetaClassImpl implements MetaClass,
MutableMetaClass {
}
private static boolean packageLocal(CachedField mfp, CachedClass klass) {
-if ((mfp.getModifiers() & (Modifier.PRIVATE | Modifier.PUBLIC |
Modifier.PROTECTED)) != 0 || klass == null)
+if (klass == null)
return false;
-Package fieldPackage = mfp.field.getDeclaringClass().getPackage();
-Package classPackage = klass.getTheClass().getPackage();
-return (fieldPackage == null && classPackage == null) ||
-fieldPackage != null && classPackage != null &&
fieldPackage.getName().equals(classPackage.getName());
+return isDefaultVisibility(mfp.getModifiers()) &&
inSamePackage(mfp.field.getDeclaringClass(), klass.getTheClass());
}
private void applyStrayPropertyMethods(LinkedList
superClasses, Index classPropertyIndex, boolean isThis) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/0765a21f/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
index ba9bb0e..b7d9deb 100644
--- a/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -25,6 +25,7 @@ import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.FieldNode;
import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.PackageNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.PropertyNode;
import org.codehaus.groovy.ast.Variable;
@@ -63,6 +64,7 @@ import org.codehaus.groovy.syntax.Token;
import org.codehaus.groovy.syntax.Types;
import org.codehaus.groovy.transform.AbstractASTTransformation;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -762,4 +764,22 @@ public class GeneralUtils {
public static String getSetterName(String name) {
return "set" + Verifier.capitalize(name);
}
+
+public static boolean isDefaultVisibility(int modifiers) {
+return (modifiers & (Modifier.PRIVATE | Modifier.PUBLIC |
Modifier.PROTECTED)) == 0;
+}
+
+public static boolean inSamePackage(ClassNode first, ClassNode second) {
+PackageNode firstPackage = first.getPackage();
+PackageNode secondPackage = second.getPackage();
+return ((firstPackage == null && secondPackage == null) ||
+firstPackage != null && secondPackage != null &&
firstPackage.getName().equals(secondPackage.getName()));
+}
+
+public static boolean inSamePackage(Class first, Class second) {
+Package firstPackage = first.getPack
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X d8dc2001e -> 5f86d08b0
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5f86d08b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5f86d08b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5f86d08b
Branch: refs/heads/GROOVY_2_4_X
Commit: 5f86d08b06cb7d738a265bffd818486c460364f9
Parents: d8dc200
Author: paulk
Authored: Wed Aug 17 11:07:49 2016 +1000
Committer: paulk
Committed: Wed Aug 17 11:08:40 2016 +1000
--
.../stc/StaticTypeCheckingSupport.java | 167 +++
1 file changed, 95 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/5f86d08b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index d4ad2a5..55d187c 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -19,8 +19,20 @@
package org.codehaus.groovy.transform.stc;
import org.codehaus.groovy.GroovyBugError;
-import org.codehaus.groovy.ast.*;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.GenericsType;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.Parameter;
+import org.codehaus.groovy.ast.Variable;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ArrayExpression;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.ListExpression;
+import org.codehaus.groovy.ast.expr.MapExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.ast.tools.WideningCategories;
@@ -39,8 +51,20 @@ import org.objectweb.asm.Opcodes;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Matcher;
@@ -59,30 +83,30 @@ public abstract class StaticTypeCheckingSupport {
protected static final ExtensionMethodCache EXTENSION_METHOD_CACHE = new
ExtensionMethodCache();
protected static final Map NUMBER_TYPES =
Collections.unmodifiableMap(
new HashMap() {{
-put(ClassHelper.byte_TYPE, 0);
-put(ClassHelper.Byte_TYPE, 0);
-put(ClassHelper.short_TYPE, 1);
-put(ClassHelper.Short_TYPE, 1);
-put(ClassHelper.int_TYPE, 2);
-put(ClassHelper.Integer_TYPE, 2);
-put(ClassHelper.Long_TYPE, 3);
-put(ClassHelper.long_TYPE, 3);
-put(ClassHelper.float_TYPE, 4);
-put(ClassHelper.Float_TYPE, 4);
-put(ClassHelper.double_TYPE, 5);
-put(ClassHelper.Double_TYPE, 5);
+put(byte_TYPE, 0);
+put(Byte_TYPE, 0);
+put(short_TYPE, 1);
+put(Short_TYPE, 1);
+put(int_TYPE, 2);
+put(Integer_TYPE, 2);
+put(Long_TYPE, 3);
+put(long_TYPE, 3);
+put(float_TYPE, 4);
+put(Float_TYPE, 4);
+put(double_TYPE, 5);
+put(Double_TYPE, 5);
}});
protected static final ClassNode GSTRING_STRING_CLASSNODE =
WideningCategories.lowestUpperBound(
-ClassHelper.STRING_TYPE,
-ClassHelper.GSTRING_TYPE
+STRING_TYPE,
+GSTRING_TYPE
);
/**
* This is for internal use only. When an argument method is null, we
cannot determine its type, so
* we use this one as a wildcard.
*/
-protected static final ClassNode UNKNOWN_PARAMETER_TYPE =
ClassHelper.make("");
+protected static final ClassNode UNKNOWN_PARAMETER_TYPE
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master 2d329ead6 -> 9572de356
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9572de35
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9572de35
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9572de35
Branch: refs/heads/master
Commit: 9572de356ba2f6274bf4036ca5a8e584a91d7782
Parents: 2d329ea
Author: paulk
Authored: Wed Aug 17 11:07:49 2016 +1000
Committer: paulk
Committed: Wed Aug 17 11:07:49 2016 +1000
--
.../stc/StaticTypeCheckingSupport.java | 167 +++
1 file changed, 95 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/9572de35/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
--
diff --git
a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index 3eab1df..0ad8da2 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -19,8 +19,20 @@
package org.codehaus.groovy.transform.stc;
import org.codehaus.groovy.GroovyBugError;
-import org.codehaus.groovy.ast.*;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.GenericsType;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.Parameter;
+import org.codehaus.groovy.ast.Variable;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ArrayExpression;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.ListExpression;
+import org.codehaus.groovy.ast.expr.MapExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.ast.tools.WideningCategories;
@@ -39,8 +51,20 @@ import org.objectweb.asm.Opcodes;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Matcher;
@@ -59,30 +83,30 @@ public abstract class StaticTypeCheckingSupport {
protected static final ExtensionMethodCache EXTENSION_METHOD_CACHE = new
ExtensionMethodCache();
protected static final Map NUMBER_TYPES =
Collections.unmodifiableMap(
new HashMap() {{
-put(ClassHelper.byte_TYPE, 0);
-put(ClassHelper.Byte_TYPE, 0);
-put(ClassHelper.short_TYPE, 1);
-put(ClassHelper.Short_TYPE, 1);
-put(ClassHelper.int_TYPE, 2);
-put(ClassHelper.Integer_TYPE, 2);
-put(ClassHelper.Long_TYPE, 3);
-put(ClassHelper.long_TYPE, 3);
-put(ClassHelper.float_TYPE, 4);
-put(ClassHelper.Float_TYPE, 4);
-put(ClassHelper.double_TYPE, 5);
-put(ClassHelper.Double_TYPE, 5);
+put(byte_TYPE, 0);
+put(Byte_TYPE, 0);
+put(short_TYPE, 1);
+put(Short_TYPE, 1);
+put(int_TYPE, 2);
+put(Integer_TYPE, 2);
+put(Long_TYPE, 3);
+put(long_TYPE, 3);
+put(float_TYPE, 4);
+put(Float_TYPE, 4);
+put(double_TYPE, 5);
+put(Double_TYPE, 5);
}});
protected static final ClassNode GSTRING_STRING_CLASSNODE =
WideningCategories.lowestUpperBound(
-ClassHelper.STRING_TYPE,
-ClassHelper.GSTRING_TYPE
+STRING_TYPE,
+GSTRING_TYPE
);
/**
* This is for internal use only. When an argument method is null, we
cannot determine its type, so
* we use this one as a wildcard.
*/
-protected static final ClassNode UNKNOWN_PARAMETER_TYPE =
ClassHelper.make("");
+protected static final ClassNode UNKNOWN_PARAMETER_TYPE = make("");
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master a472efe53 -> 8311b23ad
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8311b23a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8311b23a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8311b23a
Branch: refs/heads/master
Commit: 8311b23ade10c4b26c4473f6cc498641ebf2acb0
Parents: a472efe
Author: paulk
Authored: Wed Aug 10 23:02:51 2016 +1000
Committer: paulk
Committed: Wed Aug 10 23:02:51 2016 +1000
--
.../groovy/lang/BigDecimalObjectRangeTest.java | 49 ++
src/test/groovy/lang/BigDecimalRangeTest.java | 44 --
.../groovy/lang/BigIntegerObjectRangeTest.java | 49 ++
src/test/groovy/lang/BigIntegerRangeTest.java | 44 --
src/test/groovy/lang/DoubleObjectRangeTest.java | 49 ++
src/test/groovy/lang/EmptyRangeTest.java| 2 +-
src/test/groovy/lang/FloatObjectRangeTest.java | 47 ++
src/test/groovy/lang/FloatRangeTest.java| 42 --
.../groovy/lang/IntegerObjectRangeTest.java | 47 ++
src/test/groovy/lang/IntegerRangeTest.java | 43 --
src/test/groovy/lang/LongObjectRangeTest.java | 56 ++
src/test/groovy/lang/LongRangeTest.java | 52 --
src/test/groovy/lang/NumberRangeTest.java | 737 --
src/test/groovy/lang/NumberRangeTestCase.java | 749 +++
src/test/groovy/lang/ShortObjectRangeTest.java | 46 ++
src/test/groovy/lang/ShortRangeTest.java| 42 --
16 files changed, 1093 insertions(+), 1005 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/8311b23a/src/test/groovy/lang/BigDecimalObjectRangeTest.java
--
diff --git a/src/test/groovy/lang/BigDecimalObjectRangeTest.java
b/src/test/groovy/lang/BigDecimalObjectRangeTest.java
new file mode 100644
index 000..fcaa7b2
--- /dev/null
+++ b/src/test/groovy/lang/BigDecimalObjectRangeTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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 groovy.lang;
+
+import java.math.BigDecimal;
+
+/**
+ * Tests {@link ObjectRange}s of {@link BigDecimal}s.
+ */
+public class BigDecimalObjectRangeTest extends NumberRangeTestCase {
+@Override
+protected void setUp() throws Exception {
+super.setUp();
+expectNullFromExhausted = true;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+protected Range createRange(int from, int to) {
+return new ObjectRange(new BigDecimal(from), new BigDecimal(to));
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+protected Comparable createValue(int value) {
+return new BigDecimal(value);
+}
+
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/8311b23a/src/test/groovy/lang/BigDecimalRangeTest.java
--
diff --git a/src/test/groovy/lang/BigDecimalRangeTest.java
b/src/test/groovy/lang/BigDecimalRangeTest.java
deleted file mode 100644
index 61414f6..000
--- a/src/test/groovy/lang/BigDecimalRangeTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 groovy.lang;
-
-import java.math.BigDecimal;
-
-
[2/4] groovy git commit: minor refactor: use enhanced for loop
minor refactor: use enhanced for loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/037ff659
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/037ff659
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/037ff659
Branch: refs/heads/GROOVY_2_4_X
Commit: 037ff6598fd36096b46a5256efb99ab76177
Parents: e23c7ef
Author: John Wagenleitner
Authored: Sat Aug 6 19:01:31 2016 -0700
Committer: John Wagenleitner
Committed: Sat Aug 6 20:00:23 2016 -0700
--
.../org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/037ff659/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
index b804b06..759ced7 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
@@ -180,10 +180,8 @@ public class GroovyScriptEngineFactory implements
ScriptEngineFactory {
public String getProgram(String... statements) {
StringBuilder ret = new StringBuilder();
-int len = statements.length;
-for (int i = 0; i < len; i++) {
-ret.append(statements[i]);
-ret.append('\n');
+for (String statement : statements) {
+ret.append(statement).append('\n');
}
return ret.toString();
}
[4/4] groovy git commit: minor refactor: remove use of raw types
minor refactor: remove use of raw types
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a671fafe
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a671fafe
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a671fafe
Branch: refs/heads/GROOVY_2_4_X
Commit: a671fafe1e62c41e35db890e0d390167054a349f
Parents: 215e265
Author: John Wagenleitner
Authored: Sat Aug 6 19:53:17 2016 -0700
Committer: John Wagenleitner
Committed: Sat Aug 6 20:03:24 2016 -0700
--
.../groovy/jsr223/GroovyCompiledScript.java | 4 ++--
.../groovy/jsr223/GroovyScriptEngineImpl.java | 18 +-
.../codehaus/groovy/jsr223/ScriptExtensions.java | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a671fafe/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
index e7bb44c..4962aa5 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
@@ -61,9 +61,9 @@ import javax.script.ScriptException;
public class GroovyCompiledScript extends CompiledScript {
private final GroovyScriptEngineImpl engine;
-private final Class clasz;
+private final Class clasz;
-public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class clazz) {
+public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class clazz)
{
this.engine = engine;
this.clasz = clazz;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a671fafe/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index d6d9fe9..8fe62a5 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -97,10 +97,10 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
private static boolean debug = false;
// script-string-to-generated Class map
-private ManagedConcurrentValueMap classMap = new
ManagedConcurrentValueMap(ReferenceBundle.getSoftBundle());
+private final ManagedConcurrentValueMap> classMap = new
ManagedConcurrentValueMap>(ReferenceBundle.getSoftBundle());
// global closures map - this is used to simulate a single
// global functions namespace
-private ManagedConcurrentValueMap globalClosures = new
ManagedConcurrentValueMap(ReferenceBundle.getHardBundle());
+private final ManagedConcurrentValueMap> globalClosures
= new ManagedConcurrentValueMap>(ReferenceBundle.getHardBundle());
// class loader for Groovy generated classes
private GroovyClassLoader loader;
// lazily initialized factory
@@ -150,7 +150,7 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
} catch (ClassCastException cce) { /*ignore.*/ }
try {
-Class clazz = getScriptClass(script);
+Class clazz = getScriptClass(script);
if (clazz == null) throw new ScriptException("Script class is
null");
return eval(clazz, ctx);
} catch (Exception e) {
@@ -214,7 +214,7 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
}
// package-privates
-Object eval(Class scriptClass, final ScriptContext ctx) throws
ScriptException {
+Object eval(Class scriptClass, final ScriptContext ctx) throws
ScriptException {
/*
* We use the following Binding instance so that global variable lookup
* will be done in the current ScriptContext instance.
@@ -321,9 +321,9 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
}
}
-Class getScriptClass(String script)
+Class getScriptClass(String script)
throws CompilationFailedException {
-Class clazz = classMap.get(script);
+Class clazz = classMap.get(script);
if (clazz != null) {
return clazz;
}
@@ -369,7 +369,7 @@ public class GroovyScriptEngineImpl extend
[4/4] groovy git commit: minor refactor: remove use of raw types
minor refactor: remove use of raw types
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ef86c2c4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ef86c2c4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ef86c2c4
Branch: refs/heads/master
Commit: ef86c2c4db4e3d6fb82be3fad1177f9d0364093f
Parents: 6b7c908
Author: John Wagenleitner
Authored: Sat Aug 6 19:53:17 2016 -0700
Committer: John Wagenleitner
Committed: Sat Aug 6 19:53:17 2016 -0700
--
.../groovy/jsr223/GroovyCompiledScript.java | 4 ++--
.../groovy/jsr223/GroovyScriptEngineImpl.java | 18 +-
.../codehaus/groovy/jsr223/ScriptExtensions.java | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef86c2c4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
index e7bb44c..4962aa5 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
@@ -61,9 +61,9 @@ import javax.script.ScriptException;
public class GroovyCompiledScript extends CompiledScript {
private final GroovyScriptEngineImpl engine;
-private final Class clasz;
+private final Class clasz;
-public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class clazz) {
+public GroovyCompiledScript(GroovyScriptEngineImpl engine, Class clazz)
{
this.engine = engine;
this.clasz = clazz;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef86c2c4/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 406668a..8fe62a5 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -97,10 +97,10 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
private static boolean debug = false;
// script-string-to-generated Class map
-private final ManagedConcurrentValueMap classMap = new
ManagedConcurrentValueMap(ReferenceBundle.getSoftBundle());
+private final ManagedConcurrentValueMap> classMap = new
ManagedConcurrentValueMap>(ReferenceBundle.getSoftBundle());
// global closures map - this is used to simulate a single
// global functions namespace
-private final ManagedConcurrentValueMap globalClosures =
new ManagedConcurrentValueMap(ReferenceBundle.getHardBundle());
+private final ManagedConcurrentValueMap> globalClosures
= new ManagedConcurrentValueMap>(ReferenceBundle.getHardBundle());
// class loader for Groovy generated classes
private GroovyClassLoader loader;
// lazily initialized factory
@@ -150,7 +150,7 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
} catch (ClassCastException cce) { /*ignore.*/ }
try {
-Class clazz = getScriptClass(script);
+Class clazz = getScriptClass(script);
if (clazz == null) throw new ScriptException("Script class is
null");
return eval(clazz, ctx);
} catch (Exception e) {
@@ -214,7 +214,7 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
}
// package-privates
-Object eval(Class scriptClass, final ScriptContext ctx) throws
ScriptException {
+Object eval(Class scriptClass, final ScriptContext ctx) throws
ScriptException {
/*
* We use the following Binding instance so that global variable lookup
* will be done in the current ScriptContext instance.
@@ -321,9 +321,9 @@ public class GroovyScriptEngineImpl extends
AbstractScriptEngine implements Comp
}
}
-Class getScriptClass(String script)
+Class getScriptClass(String script)
throws CompilationFailedException {
-Class clazz = classMap.get(script);
+Class clazz = classMap.get(script);
if (clazz != null) {
return clazz;
}
@@ -369,7 +369,7 @@ public class GroovyScriptEngineImpl
[2/4] groovy git commit: minor refactor: use enhanced for loop
minor refactor: use enhanced for loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a82b86ef
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a82b86ef
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a82b86ef
Branch: refs/heads/master
Commit: a82b86ef25e59fb45a5797acdb4a1b4da0a680f6
Parents: 6754d4a
Author: John Wagenleitner
Authored: Sat Aug 6 19:01:31 2016 -0700
Committer: John Wagenleitner
Committed: Sat Aug 6 19:01:31 2016 -0700
--
.../org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a82b86ef/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
--
diff --git
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
index b804b06..759ced7 100644
---
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+++
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
@@ -180,10 +180,8 @@ public class GroovyScriptEngineFactory implements
ScriptEngineFactory {
public String getProgram(String... statements) {
StringBuilder ret = new StringBuilder();
-int len = statements.length;
-for (int i = 0; i < len; i++) {
-ret.append(statements[i]);
-ret.append('\n');
+for (String statement : statements) {
+ret.append(statement).append('\n');
}
return ret.toString();
}
groovy git commit: minor refactor and javadoc clarification
Repository: groovy
Updated Branches:
refs/heads/master 85cf8bc5f -> 4db71e697
minor refactor and javadoc clarification
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4db71e69
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4db71e69
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4db71e69
Branch: refs/heads/master
Commit: 4db71e69730f1ea45da30644e133a494b9a91832
Parents: 85cf8bc
Author: paulk
Authored: Thu Aug 4 14:57:51 2016 +1000
Committer: paulk
Committed: Thu Aug 4 14:57:51 2016 +1000
--
.../groovy/runtime/DefaultGroovyMethods.java| 60 +++-
1 file changed, 32 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/4db71e69/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 b61f3be..7e89c44 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -1008,12 +1008,12 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
/**
* Returns an iterator equivalent to this iterator with all duplicated
items removed
- * by using the default comparator. The original iterator will become
+ * by using Groovy's default number-aware comparator. The original
iterator will become
* exhausted of elements after determining the unique values. A new
iterator
* for the unique values will be returned.
*
* @param self an Iterator
- * @return the modified Iterator
+ * @return a new Iterator of the unique items from the original iterator
* @since 1.5.5
*/
public static Iterator unique(Iterator self) {
@@ -1021,8 +1021,8 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
}
/**
- * Modifies this collection to remove all duplicated items, using the
- * default comparator.
+ * Modifies this collection to remove all duplicated items, using Groovy's
+ * default number-aware comparator.
* assert [1,3] == [1,3,3].unique()
*
* @param self a collection
@@ -1035,8 +1035,8 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
}
/**
- * Modifies this List to remove all duplicated items, using the
- * default comparator.
+ * Modifies this List to remove all duplicated items, using Groovy's
+ * default number-aware comparator.
* assert [1,3] == [1,3,3].unique()
*
* @param self a List
@@ -1049,7 +1049,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
}
/**
- * Remove all duplicates from a given Collection using the default
comparator.
+ * Remove all duplicates from a given Collection using Groovy's default
number-aware comparator.
* If mutate is true, it works by modifying the original object (and also
returning it).
* If mutate is false, a new collection is returned leaving the original
unchanged.
*
@@ -1088,7 +1088,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
}
/**
- * Remove all duplicates from a given List using the default comparator.
+ * Remove all duplicates from a given List using Groovy's default
number-aware comparator.
* If mutate is true, it works by modifying the original object (and also
returning it).
* If mutate is false, a new collection is returned leaving the original
unchanged.
*
@@ -1135,13 +1135,16 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* will be passed as arguments, and the closure should return an
* int value (with 0 indicating the items are not unique).
*
- * @param self an Iterator
- * @param closure a Closure used to determine unique items
+ * @param self an Iterator
+ * @param condition a Closure used to determine unique items
* @return the modified Iterator
* @since 1.5.5
*/
-public static Iterator unique(Iterator self,
@ClosureParams(value=FromString.class, options={"T","T,T"}) Closure closure) {
-return toList((Iterable) unique(toList(self),
closure)).listIterator();
+public static Iterator unique(Iterator self,
@ClosureParams(value=FromString.class, options={"T","T,T"}) Closure condition) {
+Comparator comparator = condition.getMaximumNumberOfParameters() ==
1
+? new OrderBy(condition, true)
+: new ClosureComparator(condition);
+return unique(self, comparator);
}
/**
@@
groovy git commit: minor refactor (a binary incompatible change but this class is likely not used by anyone outside Groovy)
Repository: groovy
Updated Branches:
refs/heads/master 4c829ca39 -> 571e8eea4
minor refactor (a binary incompatible change but this class is likely not used
by anyone outside Groovy)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/571e8eea
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/571e8eea
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/571e8eea
Branch: refs/heads/master
Commit: 571e8eea4472b7b20b0ef80fed3af35a22eb7b91
Parents: 4c829ca
Author: paulk
Authored: Fri Jul 29 14:13:22 2016 +1000
Committer: paulk
Committed: Fri Jul 29 14:13:22 2016 +1000
--
gradle/pomconfigurer.gradle | 3 +
.../org/codehaus/groovy/antlr/LexerFrame.java | 171 ++-
2 files changed, 93 insertions(+), 81 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/571e8eea/gradle/pomconfigurer.gradle
--
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 9495481..3f08f4a 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -573,6 +573,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Guillaume Balaine'
}
+contributor {
+name 'Santhosh Kumar T'
+}
}
mailingLists {
mailingList {
http://git-wip-us.apache.org/repos/asf/groovy/blob/571e8eea/src/main/org/codehaus/groovy/antlr/LexerFrame.java
--
diff --git a/src/main/org/codehaus/groovy/antlr/LexerFrame.java
b/src/main/org/codehaus/groovy/antlr/LexerFrame.java
index 5f2a93e..0a1cb2b 100644
--- a/src/main/org/codehaus/groovy/antlr/LexerFrame.java
+++ b/src/main/org/codehaus/groovy/antlr/LexerFrame.java
@@ -17,39 +17,46 @@
* under the License.
*/
package org.codehaus.groovy.antlr;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Hashtable;
+
+import antlr.CharScanner;
+import antlr.Token;
+import org.codehaus.groovy.antlr.parser.GroovyLexer;
+import org.codehaus.groovy.antlr.parser.GroovyTokenTypes;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.text.BadLocationException;
-import org.codehaus.groovy.antlr.parser.*;
-
-import antlr.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.util.Hashtable;
/**
- * @author Santhosh Kumar T
+ * Swing application to graphically display the tokens produced by the lexer.
*/
-public class LexerFrame extends JFrame implements ActionListener{
-JSplitPane jSplitPane1 = new JSplitPane();
-JScrollPane jScrollPane1 = new JScrollPane();
-JScrollPane jScrollPane2 = new JScrollPane();
-JTextPane tokenPane = new HScrollableTextPane();
-JButton jbutton = new JButton("open");
-JPanel mainPanel = new JPanel(new BorderLayout());
-JTextArea scriptPane = new JTextArea();
-Border border1;
-Border border2;
-
-Class lexerClass;
-
-public LexerFrame(Class lexerClass, Class tokenTypesClass){
+public class LexerFrame extends JFrame implements ActionListener {
+private final JSplitPane jSplitPane1 = new JSplitPane();
+private final JScrollPane jScrollPane1 = new JScrollPane();
+private final JScrollPane jScrollPane2 = new JScrollPane();
+private final JTextPane tokenPane = new HScrollableTextPane();
+private final JButton jbutton = new JButton("open");
+private final JPanel mainPanel = new JPanel(new BorderLayout());
+private final JTextArea scriptPane = new JTextArea();
+private final Class lexerClass;
+private final Hashtable tokens = new Hashtable();
+
+public LexerFrame(Class lexerClass, Class tokenTypesClass) {
super("Token Steam Viewer");
this.lexerClass = lexerClass;
-try{
+try {
jbInit();
setSize(500, 500);
listTokens(tokenTypesClass);
@@ -57,71 +64,71 @@ public class LexerFrame extends JFrame implements
ActionListener{
final JPopupMenu popup = new JPopupMenu();
popup.add(loadFileAction);
-jbutton.setSize(30,30);
-jbutton.addMouseListener(new MouseAdapter(){
+jbutton.setSize(30, 30);
+jbutton.addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {
//if(e.isPop
groovy git commit: minor refactor: partially generify ObjectRange
Repository: groovy
Updated Branches:
refs/heads/master c612fe94d -> a903c9e33
minor refactor: partially generify ObjectRange
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a903c9e3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a903c9e3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a903c9e3
Branch: refs/heads/master
Commit: a903c9e330af224006380af0f56afa98c0cc6b64
Parents: c612fe9
Author: paulk
Authored: Fri Jul 15 16:13:06 2016 +1000
Committer: paulk
Committed: Fri Jul 15 16:13:06 2016 +1000
--
src/main/groovy/lang/ObjectRange.java | 46 ++
1 file changed, 22 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/a903c9e3/src/main/groovy/lang/ObjectRange.java
--
diff --git a/src/main/groovy/lang/ObjectRange.java
b/src/main/groovy/lang/ObjectRange.java
index efb9bd2..d3581d4 100644
--- a/src/main/groovy/lang/ObjectRange.java
+++ b/src/main/groovy/lang/ObjectRange.java
@@ -37,8 +37,7 @@ import java.util.List;
* Note: This class is similar to {@link IntRange}. If you make any changes to
this
* class, you might consider making parallel changes to {@link IntRange}.
*/
-public class ObjectRange extends AbstractList implements Range {
-
+public class ObjectRange extends AbstractList implements
Range {
/**
* The first value in the range.
*/
@@ -77,7 +76,7 @@ public class ObjectRange extends AbstractList implements
Range {
* Optimized Constructor avoiding initial computation of comparison.
*/
public ObjectRange(Comparable smaller, Comparable larger, boolean reverse)
{
-this(smaller, larger, Boolean.valueOf(reverse));
+this(smaller, larger, (Boolean) reverse);
}
/**
@@ -235,13 +234,13 @@ public class ObjectRange extends AbstractList implements
Range {
}
@Override
-public Object get(int index) {
+public Comparable get(int index) {
if (index < 0) {
throw new IndexOutOfBoundsException("Index: " + index + " should
not be negative");
}
final StepIterator iter = new StepIterator(this, 1);
-Object value = iter.next();
+Comparable value = iter.next();
for (int i = 0; i < index; i++) {
if (!iter.hasNext()) {
throw new IndexOutOfBoundsException("Index: " + index + " is
too big for range: " + this);
@@ -309,7 +308,7 @@ public class ObjectRange extends AbstractList implements
Range {
}
} else {
// let's brute-force calculate the size by iterating start to
end
-final Iterator iter = new StepIterator(this, 1);
+final Iterator iter = new StepIterator(this, 1);
while (iter.hasNext()) {
tempsize++;
// integer overflow
@@ -329,7 +328,7 @@ public class ObjectRange extends AbstractList implements
Range {
}
@Override
-public List subList(int fromIndex, int toIndex) {
+public List subList(int fromIndex, int toIndex) {
if (fromIndex < 0) {
throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
}
@@ -342,26 +341,25 @@ public class ObjectRange extends AbstractList implements
Range {
// Performance detail:
// not using get(fromIndex), get(toIndex) in the following to avoid
stepping over elements twice
-final StepIterator iter = new StepIterator(this, 1);
+final Iterator iter = new StepIterator(this, 1);
-Object value = iter.next();
+Comparable toValue = iter.next();
int i = 0;
for (; i < fromIndex; i++) {
if (!iter.hasNext()) {
throw new IndexOutOfBoundsException("Index: " + i + " is too
big for range: " + this);
}
-value = iter.next();
+toValue = iter.next();
}
-final Object fromValue = value;
+final Comparable fromValue = toValue;
for (; i < toIndex - 1; i++) {
if (!iter.hasNext()) {
throw new IndexOutOfBoundsException("Index: " + i + " is too
big for range: " + this);
}
-value = iter.next();
+toValue = iter.next();
}
-final Object toValue = value;
-return new ObjectRange((Comparable) fromValue, (Comparable) toValue,
reverse);
+return new ObjectRange(fromValue, toValue, reverse);
}
public String toString() {
@@ -381,7 +379,7 @@ public class ObjectRange extends AbstractList implements
Range {
*/
@Override
public boolean contains(Object value) {
-final Iterator iter = new StepIte
groovy git commit: minor refactor: include return type for modified methods in japicmp reports
Repository: groovy
Updated Branches:
refs/heads/master 43140c893 -> cb65377d3
minor refactor: include return type for modified methods in japicmp reports
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/cb65377d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cb65377d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cb65377d
Branch: refs/heads/master
Commit: cb65377d326e2997ca6a3c480367ed10b23bbb1e
Parents: 43140c8
Author: paulk
Authored: Mon Jul 11 20:05:38 2016 +1000
Committer: paulk
Committed: Mon Jul 11 20:05:38 2016 +1000
--
gradle/binarycompatibility.gradle | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/cb65377d/gradle/binarycompatibility.gradle
--
diff --git a/gradle/binarycompatibility.gradle
b/gradle/binarycompatibility.gradle
index 0847d72..b7774a9 100644
--- a/gradle/binarycompatibility.gradle
+++ b/gradle/binarycompatibility.gradle
@@ -54,13 +54,17 @@ if (JavaVersion.current().isJava7Compatible()) {
"${Modifier.toString(classOrMethod.get()?.modifiers)}
${classOrMethod.get()?.longName}"
}
+def prettyPrintMethodWithReturnType = { method ->
+"${Modifier.toString(method.get()?.modifiers)}
${method.get()?.returnType.name}
${method.get()?.name}${javassist.bytecode.Descriptor.toString(method.get()?.signature)}"
+}
+
def reportGenerator = { model ->
outputProcessor {
def skipClass = { c ->
c.fullyQualifiedName =~ /\$[0-9]+$/ || // skip AIC
c.fullyQualifiedName.startsWith('org.codehaus.groovy.runtime.dgm$') ||
-//c.fullyQualifiedName.startsWith('groovyjarjar') ||
+c.fullyQualifiedName.startsWith('groovyjarjar') ||
c.fullyQualifiedName.contains('_closure')
}
def skipMethod = { c, m -> skipClass(c) || m.name =~
/access\$[0-9]+/ }
@@ -90,7 +94,7 @@ if (JavaVersion.current().isJava7Compatible()) {
modifiedMethod { c, m ->
if (!skipMethod(c, m)) {
violations[c.fullyQualifiedName].warning << """Method
${m.name} has been modified
-From ${prettyPrint(m.oldMethod)} to
${prettyPrint(m.newMethod)}"""
+From ${prettyPrintMethodWithReturnType(m.oldMethod)} to
${prettyPrintMethodWithReturnType(m.newMethod)}"""
}
}
groovy git commit: minor refactor: generify EmptyRange
Repository: groovy
Updated Branches:
refs/heads/master 057cf3661 -> 43140c893
minor refactor: generify EmptyRange
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/43140c89
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/43140c89
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/43140c89
Branch: refs/heads/master
Commit: 43140c893a55c1958a2e6f606c59ea371f8a2306
Parents: 057cf36
Author: paulk
Authored: Sun Jul 10 21:12:47 2016 +1000
Committer: paulk
Committed: Sun Jul 10 21:12:47 2016 +1000
--
src/main/groovy/lang/EmptyRange.java | 30 +++---
src/main/groovy/lang/IntRange.java| 2 +-
src/main/groovy/lang/ObjectRange.java | 2 +-
src/main/groovy/lang/Range.java | 2 --
4 files changed, 17 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/43140c89/src/main/groovy/lang/EmptyRange.java
--
diff --git a/src/main/groovy/lang/EmptyRange.java
b/src/main/groovy/lang/EmptyRange.java
index 2b5e73a..b67b32e 100644
--- a/src/main/groovy/lang/EmptyRange.java
+++ b/src/main/groovy/lang/EmptyRange.java
@@ -28,19 +28,19 @@ import java.util.List;
/**
* Constructing Ranges like 0..<0
*/
-public class EmptyRange extends AbstractList implements Range {
+public class EmptyRange extends AbstractList
implements Range {
/**
* The value at which the range originates (may be null).
*/
-protected Comparable at;
+protected T at;
/**
* Creates a new {@link EmptyRange}.
*
* @param at the value at which the range starts (may be
null).
*/
-public EmptyRange(Comparable at) {
+public EmptyRange(T at) {
this.at = at;
}
@@ -48,7 +48,7 @@ public class EmptyRange extends AbstractList implements Range
{
* {@inheritDoc}
*/
@Override
-public Comparable getFrom() {
+public T getFrom() {
return at;
}
@@ -56,7 +56,7 @@ public class EmptyRange extends AbstractList implements Range
{
* {@inheritDoc}
*/
@Override
-public Comparable getTo() {
+public T getTo() {
return at;
}
@@ -113,7 +113,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws IndexOutOfBoundsException always
*/
@Override
-public Object get(int index) {
+public T get(int index) {
throw new IndexOutOfBoundsException("can't get values from Empty
Ranges");
}
@@ -123,7 +123,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException always
*/
@Override
-public boolean add(Object o) {
+public boolean add(T o) {
throw new UnsupportedOperationException("cannot add to Empty Ranges");
}
@@ -133,7 +133,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public boolean addAll(int index, Collection c) {
+public boolean addAll(int index, Collection c) {
throw new UnsupportedOperationException("cannot add to Empty Ranges");
}
@@ -143,7 +143,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public boolean addAll(Collection c) {
+public boolean addAll(Collection c) {
throw new UnsupportedOperationException("cannot add to Empty Ranges");
}
@@ -163,7 +163,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public Object remove(int index) {
+public T remove(int index) {
throw new UnsupportedOperationException("cannot remove from Empty
Ranges");
}
@@ -173,7 +173,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public boolean removeAll(Collection c) {
+public boolean removeAll(Collection c) {
throw new UnsupportedOperationException("cannot remove from Empty
Ranges");
}
@@ -183,7 +183,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public boolean retainAll(Collection c) {
+public boolean retainAll(Collection c) {
throw new UnsupportedOperationException("cannot retainAll in Empty
Ranges");
}
@@ -193,7 +193,7 @@ public class EmptyRange extends AbstractList implements
Range {
* @throws UnsupportedOperationException
*/
@Override
-public Object set(int index, Object element) {
+public T set(int index, T element) {
throw
groovy git commit: minor refactor: enhance japicmp slightly to exclude modules
Repository: groovy
Updated Branches:
refs/heads/master 80f102db8 -> 057cf3661
minor refactor: enhance japicmp slightly to exclude modules
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/057cf366
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/057cf366
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/057cf366
Branch: refs/heads/master
Commit: 057cf3661fcede9c7967d2d061dcc5ea527d6ca5
Parents: 80f102d
Author: paulk
Authored: Sun Jul 10 21:00:53 2016 +1000
Committer: paulk
Committed: Sun Jul 10 21:01:26 2016 +1000
--
gradle/binarycompatibility.gradle | 69 ++
1 file changed, 37 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/057cf366/gradle/binarycompatibility.gradle
--
diff --git a/gradle/binarycompatibility.gradle
b/gradle/binarycompatibility.gradle
index 44cdb7d..0847d72 100644
--- a/gradle/binarycompatibility.gradle
+++ b/gradle/binarycompatibility.gradle
@@ -32,6 +32,9 @@ buildscript {
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
}
}
+// for comparing between versions with different modules, set excludeModules
to differing modules, e.g.
+//def excludeModules = ['performance', 'groovy-macro']
+def excludeModules = []
task checkBinaryCompatibility {
description = 'Generates binary compatibility reports'
@@ -40,10 +43,12 @@ check.dependsOn(checkBinaryCompatibility)
if (JavaVersion.current().isJava7Compatible()) {
allprojects {
-apply plugin: 'me.champeau.gradle.japicmp'
+if (!(project.name in excludeModules)) {
+apply plugin: 'me.champeau.gradle.japicmp'
+}
}
-def referenceMinorVersion = '2.4.2'
+def referenceMinorVersion = '2.4.7'
def prettyPrint = { classOrMethod ->
"${Modifier.toString(classOrMethod.get()?.modifiers)}
${classOrMethod.get()?.longName}"
@@ -54,7 +59,8 @@ if (JavaVersion.current().isJava7Compatible()) {
def skipClass = { c ->
c.fullyQualifiedName =~ /\$[0-9]+$/ || // skip AIC
-
c.fullyQualifiedName.startsWith('org.codehaus.groovy.runtime.dgm$') ||
+
c.fullyQualifiedName.startsWith('org.codehaus.groovy.runtime.dgm$') ||
+//c.fullyQualifiedName.startsWith('groovyjarjar') ||
c.fullyQualifiedName.contains('_closure')
}
def skipMethod = { c, m -> skipClass(c) || m.name =~
/access\$[0-9]+/ }
@@ -163,41 +169,40 @@ if (JavaVersion.current().isJava7Compatible()) {
}
allprojects {
+if (!(project.name in excludeModules)) {
+dependencies {
+japicmp files(rootProject.jar.archivePath)
+}
-dependencies {
-japicmp files(rootProject.jar.archivePath)
-}
-
-task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask) {
-dependsOn replaceJarWithJarJar
-baseline =
"org.codehaus.groovy:${project.name}:${referenceMinorVersion}@jar"
-to = jar.archivePath
-accessModifier = 'protected'
-onlyModified = true
-failOnModification = false
-txtOutputFile = file("$buildDir/reports/japi.txt")
-
-def htmlReportFile =
file("${buildDir}/reports/binary-compat-${project.name}.html")
-inputs.file file("$configDir/$templateFile")
-inputs.file templateFile
-outputs.file htmlReportFile
-
-def model = [title : "Binary compatibility report for
${project.name}",
- project : project,
- baseline: baseline,
- archive : to.name]
-outputProcessor(reportGenerator.curry(model))
-
-doLast {
-htmlReportFile.withWriter('utf-8') { wrt ->
-
engine.createTemplateByPath(templateFile).make(model).writeTo(wrt)
+task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask) {
+dependsOn replaceJarWithJarJar
+baseline =
"org.codehaus.groovy:${project.name}:${referenceMinorVersion}@jar"
+to = jar.archivePath
+accessModifier = 'protected'
+onlyModified = true
+failOnModification = false
+txtOutputFile = file("$buildDir/reports/japi.txt")
+
+def htmlReportFile =
file("${buildDir}/reports/binary-compat-${project.name}.html")
+inputs.file file("$configDir/$templateFile")
+inputs.file templateFile
+outputs.file htmlReportFile
+
+def model = [title : "Binary compa
[1/3] groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X bb3daa2c0 -> d84193c2a
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/77f9b9ba
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/77f9b9ba
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/77f9b9ba
Branch: refs/heads/GROOVY_2_4_X
Commit: 77f9b9bac184f788f544f40585a796a0bdbef69e
Parents: 984173f
Author: paulk
Authored: Tue Jun 7 21:46:11 2016 +1000
Committer: paulk
Committed: Tue Jun 14 23:15:57 2016 +1000
--
.../groovy/ast/tools/ClassNodeUtils.java| 27 ++
.../org/codehaus/groovy/classgen/Verifier.java | 29 +++-
2 files changed, 31 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/77f9b9ba/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
index f3eec90..82cc190 100644
--- a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
@@ -20,9 +20,13 @@
package org.codehaus.groovy.ast.tools;
+import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.MethodNode;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class ClassNodeUtils {
@@ -38,4 +42,27 @@ public class ClassNodeUtils {
}
}
}
+
+public static Map
getDeclaredMethodMapsFromInterfaces(ClassNode classNode) {
+Map result = new HashMap();
+ClassNode[] interfaces = classNode.getInterfaces();
+for (ClassNode iface : interfaces) {
+result.putAll(iface.getDeclaredMethodsMap());
+}
+return result;
+}
+
+public static void addDeclaredMethodMapsFromSuperInterfaces(ClassNode cn,
Map allInterfaceMethods) {
+List cnInterfaces = Arrays.asList(cn.getInterfaces());
+ClassNode sn = cn.getSuperClass();
+while (sn != null && !sn.equals(ClassHelper.OBJECT_TYPE)) {
+ClassNode[] interfaces = sn.getInterfaces();
+for (ClassNode iface : interfaces) {
+if (!cnInterfaces.contains(iface)) {
+allInterfaceMethods.putAll(iface.getDeclaredMethodsMap());
+}
+}
+sn = sn.getSuperClass();
+}
+}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/77f9b9ba/src/main/org/codehaus/groovy/classgen/Verifier.java
--
diff --git a/src/main/org/codehaus/groovy/classgen/Verifier.java
b/src/main/org/codehaus/groovy/classgen/Verifier.java
index 1e390a9..d65a755 100644
--- a/src/main/org/codehaus/groovy/classgen/Verifier.java
+++ b/src/main/org/codehaus/groovy/classgen/Verifier.java
@@ -37,6 +37,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.ast.tools.ClassNodeUtils;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.classgen.asm.BytecodeHelper;
import org.codehaus.groovy.classgen.asm.MopWriter;
@@ -1135,16 +1136,9 @@ public class Verifier implements GroovyClassVisitor,
Opcodes {
Map genericsSpec = new HashMap();
// unimplemented abstract methods from interfaces
-Map abstractMethods = new HashMap();
-Map allInterfaceMethods = new HashMap();
-ClassNode[] interfaces = classNode.getInterfaces();
-for (ClassNode iface : interfaces) {
-Map ifaceMethodsMap = iface.getDeclaredMethodsMap();
-abstractMethods.putAll(ifaceMethodsMap);
-allInterfaceMethods.putAll(ifaceMethodsMap);
-}
-
-collectSuperInterfaceMethods(classNode, allInterfaceMethods);
+Map abstractMethods =
ClassNodeUtils.getDeclaredMethodMapsFromInterfaces(classNode);
+Map allInterfaceMethods = new HashMap(abstractMethods);
+ClassNodeUtils.addDeclaredMethodMapsFromSuperInterfaces(classNode,
allInterfaceMethods);
List declaredMethods = new
ArrayList(classNode.getMethods());
// remove all static, private and package private methods
@@ -1183,21 +1177,6 @@ public class Verifier implements GroovyClassVisitor,
Opcodes {
}
}
-private static void collectSuperInterfaceMethods(ClassNode cn, Map allInterfaceMethods) {
-List cnInterfaces = Arrays.asList(cn.getInterfaces());
-
groovy git commit: minor refactor
Repository: groovy
Updated Branches:
refs/heads/master b7383d29e -> 667e134ca
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/667e134c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/667e134c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/667e134c
Branch: refs/heads/master
Commit: 667e134ca0b898ad9e15fee7122ea03b80f5c14b
Parents: b7383d2
Author: paulk
Authored: Tue Jun 7 21:46:11 2016 +1000
Committer: paulk
Committed: Tue Jun 14 23:12:24 2016 +1000
--
.../groovy/ast/tools/ClassNodeUtils.java| 27 ++
.../org/codehaus/groovy/classgen/Verifier.java | 29 +++-
2 files changed, 31 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/667e134c/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
index f3eec90..82cc190 100644
--- a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
@@ -20,9 +20,13 @@
package org.codehaus.groovy.ast.tools;
+import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.MethodNode;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class ClassNodeUtils {
@@ -38,4 +42,27 @@ public class ClassNodeUtils {
}
}
}
+
+public static Map
getDeclaredMethodMapsFromInterfaces(ClassNode classNode) {
+Map result = new HashMap();
+ClassNode[] interfaces = classNode.getInterfaces();
+for (ClassNode iface : interfaces) {
+result.putAll(iface.getDeclaredMethodsMap());
+}
+return result;
+}
+
+public static void addDeclaredMethodMapsFromSuperInterfaces(ClassNode cn,
Map allInterfaceMethods) {
+List cnInterfaces = Arrays.asList(cn.getInterfaces());
+ClassNode sn = cn.getSuperClass();
+while (sn != null && !sn.equals(ClassHelper.OBJECT_TYPE)) {
+ClassNode[] interfaces = sn.getInterfaces();
+for (ClassNode iface : interfaces) {
+if (!cnInterfaces.contains(iface)) {
+allInterfaceMethods.putAll(iface.getDeclaredMethodsMap());
+}
+}
+sn = sn.getSuperClass();
+}
+}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/667e134c/src/main/org/codehaus/groovy/classgen/Verifier.java
--
diff --git a/src/main/org/codehaus/groovy/classgen/Verifier.java
b/src/main/org/codehaus/groovy/classgen/Verifier.java
index c950e51..7f5c5fa 100644
--- a/src/main/org/codehaus/groovy/classgen/Verifier.java
+++ b/src/main/org/codehaus/groovy/classgen/Verifier.java
@@ -37,6 +37,7 @@ import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.ast.tools.ClassNodeUtils;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.classgen.asm.BytecodeHelper;
import org.codehaus.groovy.classgen.asm.MopWriter;
@@ -1172,16 +1173,9 @@ public class Verifier implements GroovyClassVisitor,
Opcodes {
Map genericsSpec = new HashMap();
// unimplemented abstract methods from interfaces
-Map abstractMethods = new HashMap();
-Map allInterfaceMethods = new HashMap();
-ClassNode[] interfaces = classNode.getInterfaces();
-for (ClassNode iface : interfaces) {
-Map ifaceMethodsMap = iface.getDeclaredMethodsMap();
-abstractMethods.putAll(ifaceMethodsMap);
-allInterfaceMethods.putAll(ifaceMethodsMap);
-}
-
-collectSuperInterfaceMethods(classNode, allInterfaceMethods);
+Map abstractMethods =
ClassNodeUtils.getDeclaredMethodMapsFromInterfaces(classNode);
+Map allInterfaceMethods = new HashMap(abstractMethods);
+ClassNodeUtils.addDeclaredMethodMapsFromSuperInterfaces(classNode,
allInterfaceMethods);
List declaredMethods = new
ArrayList(classNode.getMethods());
// remove all static, private and package private methods
@@ -1220,21 +1214,6 @@ public class Verifier implements GroovyClassVisitor,
Opcodes {
}
}
-private static void collectSuperInterfaceMethods(ClassNode cn, Map allInterfaceMethods) {
-List cnInterfaces = Arrays.asList(cn.getInterfaces());
-ClassNode s
groovy git commit: minor refactor: add missing assertions
Repository: groovy
Updated Branches:
refs/heads/master 8bbe3a9ca -> 6318f5726
minor refactor: add missing assertions
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6318f572
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6318f572
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6318f572
Branch: refs/heads/master
Commit: 6318f57268e9e391409e7e26839eacbae11ee86e
Parents: 8bbe3a9
Author: paulk
Authored: Sun Jun 5 09:34:35 2016 +1000
Committer: paulk
Committed: Sun Jun 5 09:34:35 2016 +1000
--
.../groovy/PrimitiveDefaultValueTest.groovy | 90 ++--
1 file changed, 43 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/6318f572/src/test/groovy/PrimitiveDefaultValueTest.groovy
--
diff --git a/src/test/groovy/PrimitiveDefaultValueTest.groovy
b/src/test/groovy/PrimitiveDefaultValueTest.groovy
index 2520bf9..af84f3b 100644
--- a/src/test/groovy/PrimitiveDefaultValueTest.groovy
+++ b/src/test/groovy/PrimitiveDefaultValueTest.groovy
@@ -19,14 +19,8 @@
package groovy
/**
- * @todo GROOVY-1037
- *
- *$Revision 1.0
- *Test for non-initialized fields or variables of the primitive types.
- *
- * @author Pilho Kim
+ * Test for non-initialized fields or variables of the primitive types.
*/
-
class PrimitiveDefaultValueTest extends GroovyTestCase {
private int x
@@ -38,63 +32,65 @@ class PrimitiveDefaultValueTest extends GroovyTestCase {
private boolean flag
private char c
+private static final Character ZERO = '\0'
+
void testThisPrimitiveDefaultValues() {
-this.x == 0
-this.y == 0L
-this.z == 0.0
-this.b == (byte) 0
-this.s == (short) 0
-this.f == 0.0F
-this.flag == false
-this.c == (char) 0
+assertEquals(this.x, 0)
+assertEquals(this.y, 0L)
+assertEquals(this.z, 0.0d)
+assertEquals(this.b, (byte) 0)
+assertEquals(this.s, (short) 0)
+assertEquals(this.f, 0.0f)
+assertFalse(this.flag)
+assertEquals(this.c, ZERO)
}
void testPrimitiveDefaultValues() {
def a = new ClassForPrimitiveDefaultValue()
-a.x == 0
-a.y == 0L
-a.z == 0.0
-a.b == (byte) 0
-a.s == (short) 0
-a.f == 0.0F
-a.flag == false
-a.c == (char) 0
+assertEquals(a.x, 0)
+assertEquals(a.y, 0L)
+assertEquals(a.z, 0.0d)
+assertEquals(a.b, (byte) 0)
+assertEquals(a.s, (short) 0)
+assertEquals(a.f, 0.0f)
+assertFalse(a.flag)
+assertEquals(a.c, ZERO)
}
void testDefaultPrimitiveValuesForAttributes() {
def a = new ClassForPrimitiveDefaultValue()
-a.@x == 0
-a.@y == 0L
-a.@z == 0.0
-a.@b == (byte) 0
-a.@s == (short) 0
-a.@f == 0.0F
-a.@flag == false
-a.@c == (char) 0
+assertEquals(a.@x, 0)
+assertEquals(a.@y, 0L)
+assertEquals(a.@z, 0.0d)
+assertEquals(a.@b, (byte) 0)
+assertEquals(a.@s, (short) 0)
+assertEquals(a.@f, 0.0f)
+assertFalse(a.@flag)
+assertEquals(a.@c, ZERO)
}
void testDefaultPrimitiveValuesForProperties() {
def a = new ClassForPrimitiveDefaultValue()
-a.x1 == 0
-a.y1 == 0L
-a.z1 == 0.0
-a.b1 == (byte) 0
-a.s1 == (short) 0
-a.f1 == 0.0F
-a.flag1 == false
-a.c1 == (char) 0
+assertEquals(a.x1, 0)
+assertEquals(a.y1, 0L)
+assertEquals(a.z1, 0.0d)
+assertEquals(a.b1, (byte) 0)
+assertEquals(a.s1, (short) 0)
+assertEquals(a.f1, 0.0f)
+assertFalse(a.flag1)
+assertEquals(a.c1, ZERO)
}
}
class ClassForPrimitiveDefaultValue {
-int x
-long y
-double z
-byte b
-short s
-float f
-boolean flag
-char c
+public int x
+public long y
+public double z
+public byte b
+public short s
+public float f
+public boolean flag
+public char c
int x1
long y1
groovy git commit: minor refactor: add missing assertions
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 7390d973d -> 984173f3f
minor refactor: add missing assertions
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/984173f3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/984173f3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/984173f3
Branch: refs/heads/GROOVY_2_4_X
Commit: 984173f3ff4f1004be77691153b435891a98bb89
Parents: 7390d97
Author: paulk
Authored: Sun Jun 5 09:34:35 2016 +1000
Committer: paulk
Committed: Sun Jun 5 09:35:47 2016 +1000
--
.../groovy/PrimitiveDefaultValueTest.groovy | 90 ++--
1 file changed, 43 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/984173f3/src/test/groovy/PrimitiveDefaultValueTest.groovy
--
diff --git a/src/test/groovy/PrimitiveDefaultValueTest.groovy
b/src/test/groovy/PrimitiveDefaultValueTest.groovy
index 2520bf9..af84f3b 100644
--- a/src/test/groovy/PrimitiveDefaultValueTest.groovy
+++ b/src/test/groovy/PrimitiveDefaultValueTest.groovy
@@ -19,14 +19,8 @@
package groovy
/**
- * @todo GROOVY-1037
- *
- *$Revision 1.0
- *Test for non-initialized fields or variables of the primitive types.
- *
- * @author Pilho Kim
+ * Test for non-initialized fields or variables of the primitive types.
*/
-
class PrimitiveDefaultValueTest extends GroovyTestCase {
private int x
@@ -38,63 +32,65 @@ class PrimitiveDefaultValueTest extends GroovyTestCase {
private boolean flag
private char c
+private static final Character ZERO = '\0'
+
void testThisPrimitiveDefaultValues() {
-this.x == 0
-this.y == 0L
-this.z == 0.0
-this.b == (byte) 0
-this.s == (short) 0
-this.f == 0.0F
-this.flag == false
-this.c == (char) 0
+assertEquals(this.x, 0)
+assertEquals(this.y, 0L)
+assertEquals(this.z, 0.0d)
+assertEquals(this.b, (byte) 0)
+assertEquals(this.s, (short) 0)
+assertEquals(this.f, 0.0f)
+assertFalse(this.flag)
+assertEquals(this.c, ZERO)
}
void testPrimitiveDefaultValues() {
def a = new ClassForPrimitiveDefaultValue()
-a.x == 0
-a.y == 0L
-a.z == 0.0
-a.b == (byte) 0
-a.s == (short) 0
-a.f == 0.0F
-a.flag == false
-a.c == (char) 0
+assertEquals(a.x, 0)
+assertEquals(a.y, 0L)
+assertEquals(a.z, 0.0d)
+assertEquals(a.b, (byte) 0)
+assertEquals(a.s, (short) 0)
+assertEquals(a.f, 0.0f)
+assertFalse(a.flag)
+assertEquals(a.c, ZERO)
}
void testDefaultPrimitiveValuesForAttributes() {
def a = new ClassForPrimitiveDefaultValue()
-a.@x == 0
-a.@y == 0L
-a.@z == 0.0
-a.@b == (byte) 0
-a.@s == (short) 0
-a.@f == 0.0F
-a.@flag == false
-a.@c == (char) 0
+assertEquals(a.@x, 0)
+assertEquals(a.@y, 0L)
+assertEquals(a.@z, 0.0d)
+assertEquals(a.@b, (byte) 0)
+assertEquals(a.@s, (short) 0)
+assertEquals(a.@f, 0.0f)
+assertFalse(a.@flag)
+assertEquals(a.@c, ZERO)
}
void testDefaultPrimitiveValuesForProperties() {
def a = new ClassForPrimitiveDefaultValue()
-a.x1 == 0
-a.y1 == 0L
-a.z1 == 0.0
-a.b1 == (byte) 0
-a.s1 == (short) 0
-a.f1 == 0.0F
-a.flag1 == false
-a.c1 == (char) 0
+assertEquals(a.x1, 0)
+assertEquals(a.y1, 0L)
+assertEquals(a.z1, 0.0d)
+assertEquals(a.b1, (byte) 0)
+assertEquals(a.s1, (short) 0)
+assertEquals(a.f1, 0.0f)
+assertFalse(a.flag1)
+assertEquals(a.c1, ZERO)
}
}
class ClassForPrimitiveDefaultValue {
-int x
-long y
-double z
-byte b
-short s
-float f
-boolean flag
-char c
+public int x
+public long y
+public double z
+public byte b
+public short s
+public float f
+public boolean flag
+public char c
int x1
long y1
groovy git commit: minor refactor
Repository: groovy Updated Branches: refs/heads/master 3d60dbd79 -> b57f46df4 minor refactor Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b57f46df Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b57f46df Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b57f46df Branch: refs/heads/master Commit: b57f46df4783dbc841017cdf540d3c0e5f353767 Parents: 3d60dbd Author: paulk Authored: Wed Jun 1 13:48:55 2016 +1000 Committer: paulk Committed: Wed Jun 1 13:48:55 2016 +1000 -- src/main/org/codehaus/groovy/ast/ClassNode.java | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/b57f46df/src/main/org/codehaus/groovy/ast/ClassNode.java -- diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java b/src/main/org/codehaus/groovy/ast/ClassNode.java index 37ad787..a093dc1 100644 --- a/src/main/org/codehaus/groovy/ast/ClassNode.java +++ b/src/main/org/codehaus/groovy/ast/ClassNode.java @@ -32,7 +32,18 @@ import org.codehaus.groovy.vmplugin.VMPluginFactory; import org.objectweb.asm.Opcodes; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Set; /** * Represents a class in the AST.
[2/2] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/036c14fa
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/036c14fa
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/036c14fa
Branch: refs/heads/GROOVY_2_4_X
Commit: 036c14fa0ecc883ccc3b931aef40a666e374ed22
Parents: df63a38
Author: paulk
Authored: Wed Jun 1 13:35:39 2016 +1000
Committer: paulk
Committed: Wed Jun 1 13:47:09 2016 +1000
--
src/main/org/codehaus/groovy/ast/ClassNode.java | 45
.../groovy/ast/tools/ClassNodeUtils.java| 41 ++
.../groovy/ast/tools/ParameterUtils.java| 39 +
.../classgen/ClassCompletionVerifier.java | 3 +-
.../groovy/classgen/ExtendedVerifier.java | 19 +
.../classgen/asm/OptimizingStatementWriter.java | 18 +---
6 files changed, 103 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/036c14fa/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index faf4570..6306f5f 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -24,9 +24,11 @@ import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.FieldExpression;
import org.codehaus.groovy.ast.expr.MapExpression;
import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.Statement;
-import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.tools.ClassNodeUtils;
+import org.codehaus.groovy.ast.tools.ParameterUtils;
import org.codehaus.groovy.control.CompilePhase;
import org.codehaus.groovy.transform.ASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
@@ -34,8 +36,18 @@ import org.codehaus.groovy.vmplugin.VMPluginFactory;
import org.objectweb.asm.Opcodes;
import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
/**
* Represents a class in the AST.
@@ -435,7 +447,7 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
} else {
result = new HashMap();
}
-addInterfaceMethods(result);
+ClassNodeUtils.addInterfaceMethods(this, result);
// And add in the methods implemented in this class.
for (MethodNode method : getMethods()) {
@@ -445,19 +457,6 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
return result;
}
-public void addInterfaceMethods(Map methodsMap) {
-// add in unimplemented abstract methods from the interfaces
-for (ClassNode iface : getInterfaces()) {
-Map ifaceMethodsMap =
iface.getDeclaredMethodsMap();
-for (String methSig : ifaceMethodsMap.keySet()) {
-if (!methodsMap.containsKey(methSig)) {
-MethodNode methNode = ifaceMethodsMap.get(methSig);
-methodsMap.put(methSig, methNode);
-}
-}
-}
-}
-
public String getName() {
return redirect().name;
}
@@ -1039,17 +1038,7 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
* @return true if the two arrays are of the same size and have the same
contents
*/
protected boolean parametersEqual(Parameter[] a, Parameter[] b) {
-if (a.length == b.length) {
-boolean answer = true;
-for (int i = 0; i < a.length; i++) {
-if (!a[i].getType().equals(b[i].getType())) {
-answer = false;
-break;
-}
-}
-return answer;
-}
-return false;
+return ParameterUtils.parametersEqual(a, b);
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/036c14fa/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
new file mode 100644
index 000..f3eec90
--- /dev/null
+++ b/src/main/org/
[2/2] groovy git commit: minor refactor
minor refactor
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3d60dbd7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3d60dbd7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3d60dbd7
Branch: refs/heads/master
Commit: 3d60dbd796c6b362c8c590b14c247b9769a8edbf
Parents: 973197f
Author: paulk
Authored: Wed Jun 1 13:35:39 2016 +1000
Committer: paulk
Committed: Wed Jun 1 13:35:39 2016 +1000
--
src/main/org/codehaus/groovy/ast/ClassNode.java | 29 ++
.../groovy/ast/tools/ClassNodeUtils.java| 41
.../groovy/ast/tools/ParameterUtils.java| 39 +++
.../classgen/ClassCompletionVerifier.java | 3 +-
.../groovy/classgen/ExtendedVerifier.java | 19 +
.../classgen/asm/OptimizingStatementWriter.java | 18 +
6 files changed, 90 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/groovy/blob/3d60dbd7/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index 68ac22d..37ad787 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -23,6 +23,8 @@ import org.codehaus.groovy.ast.expr.*;
import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.ast.tools.ClassNodeUtils;
+import org.codehaus.groovy.ast.tools.ParameterUtils;
import org.codehaus.groovy.control.CompilePhase;
import org.codehaus.groovy.transform.ASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
@@ -431,7 +433,7 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
} else {
result = new HashMap();
}
-addInterfaceMethods(result);
+ClassNodeUtils.addInterfaceMethods(this, result);
// And add in the methods implemented in this class.
for (MethodNode method : getMethods()) {
@@ -441,19 +443,6 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
return result;
}
-public void addInterfaceMethods(Map methodsMap) {
-// add in unimplemented abstract methods from the interfaces
-for (ClassNode iface : getInterfaces()) {
-Map ifaceMethodsMap =
iface.getDeclaredMethodsMap();
-for (String methSig : ifaceMethodsMap.keySet()) {
-if (!methodsMap.containsKey(methSig)) {
-MethodNode methNode = ifaceMethodsMap.get(methSig);
-methodsMap.put(methSig, methNode);
-}
-}
-}
-}
-
public String getName() {
return redirect().name;
}
@@ -1047,17 +1036,7 @@ public class ClassNode extends AnnotatedNode implements
Opcodes {
* @return true if the two arrays are of the same size and have the same
contents
*/
protected boolean parametersEqual(Parameter[] a, Parameter[] b) {
-if (a.length == b.length) {
-boolean answer = true;
-for (int i = 0; i < a.length; i++) {
-if (!a[i].getType().equals(b[i].getType())) {
-answer = false;
-break;
-}
-}
-return answer;
-}
-return false;
+return ParameterUtils.parametersEqual(a, b);
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/3d60dbd7/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
--
diff --git a/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
new file mode 100644
index 000..f3eec90
--- /dev/null
+++ b/src/main/org/codehaus/groovy/ast/tools/ClassNodeUtils.java
@@ -0,0 +1,41 @@
+/*
+ * 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
+ * spec
