You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/08/19 09:54:41 UTC
[1/2] groovy git commit: Revert "grammar correction"
Repository: groovy
Updated Branches:
refs/heads/master 7b7ff8076 -> d2a66120d
Revert "grammar correction"
This reverts commit 7b7ff8076e7678b0295514d69df680c3cc0e94cf.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/15c7fef8
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/15c7fef8
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/15c7fef8
Branch: refs/heads/master
Commit: 15c7fef87c6412b9b6496ae12ea131621adf91de
Parents: 7b7ff80
Author: Paul King <pa...@asert.com.au>
Authored: Sun Aug 19 19:53:45 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Aug 19 19:53:45 2018 +1000
----------------------------------------------------------------------
.../org/codehaus/groovy/ast/decompiled/Annotations.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/15c7fef8/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java b/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java
index 297dbb0..2974d00 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/Annotations.java
@@ -48,22 +48,14 @@ class Annotations {
AnnotationNode node = new DecompiledAnnotationNode(classNode);
for (Map.Entry<String, Object> entry : annotation.members.entrySet()) {
- addMemberIfFound(resolver, node, entry);
+ node.addMember(entry.getKey(), annotationValueToExpression(entry.getValue(), resolver));
}
return node;
}
- private static void addMemberIfFound(AsmReferenceResolver resolver, AnnotationNode node, Map.Entry<String, Object> entry) {
- Expression value = annotationValueToExpression(entry.getValue(), resolver);
- if (value != null) {
- node.addMember(entry.getKey(), value);
- }
- }
-
private static Expression annotationValueToExpression(Object value, AsmReferenceResolver resolver) {
if (value instanceof TypeWrapper) {
- ClassNode type = resolver.resolveClassNullable(Type.getType(((TypeWrapper) value).desc).getClassName());
- return type != null ? new ClassExpression(type) : null;
+ return new ClassExpression(resolver.resolveType(Type.getType(((TypeWrapper) value).desc)));
}
if (value instanceof EnumConstantWrapper) {
[2/2] groovy git commit: grammar correction
Posted by pa...@apache.org.
grammar correction
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d2a66120
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d2a66120
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d2a66120
Branch: refs/heads/master
Commit: d2a66120d078ad4cf256fc2af452e603fb020ea4
Parents: 15c7fef
Author: Paul King <pa...@asert.com.au>
Authored: Sun Aug 19 19:54:30 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Aug 19 19:54:30 2018 +1000
----------------------------------------------------------------------
.../src/spec/test/builder/AntBuilderSpecTest.groovy | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/d2a66120/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
index 4f0dc7d..a62e366 100644
--- a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
+++ b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
@@ -67,7 +67,7 @@ class AntBuilderSpecTest extends GroovyTestCase {
}
}
// tag::copy_files[]
- // lets just call one task
+ // let's just call one task
ant.echo("hello")
// here is an example of a block of Ant inside GroovyMarkup
@@ -83,7 +83,7 @@ class AntBuilderSpecTest extends GroovyTestCase {
echo("done")
}
- // now lets do some normal Groovy again
+ // now let's do some normal Groovy again
def file = new File(ant.project.baseDir,"target/AntTest/groovy/util/AntTest.groovy")
assert file.exists()
// end::copy_files[]
@@ -104,14 +104,14 @@ class AntBuilderSpecTest extends GroovyTestCase {
}
}
// tag::filescanner[]
- // lets create a scanner of filesets
+ // let's create a scanner of filesets
def scanner = ant.fileScanner {
fileset(dir:"src/test") {
include(name:"**/Ant*.groovy")
}
}
- // now lets iterate over
+ // now let's iterate over
def found = false
for (f in scanner) {
println("Found file $f")
@@ -127,7 +127,7 @@ class AntBuilderSpecTest extends GroovyTestCase {
void testExecuteJUnit() {
doInTmpDir {ant, baseDir ->
// tag::run_junit[]
- // lets create a scanner of filesets
+ // let's create a scanner of filesets
ant.junit {
test(name:'groovy.util.SomethingThatDoesNotExist')
}