You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/03/15 01:43:59 UTC
[1/2] groovy git commit: Add test for "GROOVY-8511:
@PackageScope(METHODS) fails under Parrot Parser due to synthetic public
determination"
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 8989dd164 -> 040b828f3
Add test for "GROOVY-8511: @PackageScope(METHODS) fails under Parrot Parser due to synthetic public determination"
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e26630d2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e26630d2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e26630d2
Branch: refs/heads/GROOVY_2_6_X
Commit: e26630d22c105ab0b71482534ddbd12550157b86
Parents: 8989dd1
Author: sunlan <su...@apache.org>
Authored: Thu Mar 15 09:43:41 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Mar 15 09:43:41 2018 +0800
----------------------------------------------------------------------
.../parser/antlr4/GroovyParserTest.groovy | 1 +
.../test/resources/bugs/BUG-GROOVY-8511.groovy | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e26630d2/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 0d8f370..c99650e 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
@@ -402,5 +402,6 @@ class GroovyParserTest extends GroovyTestCase {
}
doRunAndTest('bugs/BUG-GROOVY-8426.groovy')
+ doTest('bugs/BUG-GROOVY-8511.groovy')
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/e26630d2/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy
new file mode 100644
index 0000000..8aeb874
--- /dev/null
+++ b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+class XX {
+ @groovy.transform.PackageScope
+ int x() {}
+}
+
+@groovy.transform.PackageScope
+int y() {}
[2/2] groovy git commit: Trivial refactoring: remove redundant array
creation
Posted by su...@apache.org.
Trivial refactoring: remove redundant array creation
(cherry picked from commit c518910)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/040b828f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/040b828f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/040b828f
Branch: refs/heads/GROOVY_2_6_X
Commit: 040b828f3d8bee640f2676b7fdcc9de9303bda96
Parents: e26630d
Author: sunlan <su...@apache.org>
Authored: Thu Mar 15 09:37:16 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Mar 15 09:43:54 2018 +0800
----------------------------------------------------------------------
.../groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/040b828f/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
index f09968f..c5a92dc 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
@@ -146,9 +146,9 @@ public class BaseMarkupBuilder extends Builder {
this.prefix = "";
if (tagMap.containsKey(name)) {
- return ((Closure) tagMap.get(name)).call(new Object[]{this, this.pendingNamespaces, this.namespaces, this.namespaceSpecificTags, prefix, attrs, body, this.out});
+ return ((Closure) tagMap.get(name)).call(this, this.pendingNamespaces, this.namespaces, this.namespaceSpecificTags, prefix, attrs, body, this.out);
} else {
- return defaultTagClosure.call(new Object[]{name, this, this.pendingNamespaces, this.namespaces, this.namespaceSpecificTags, prefix, attrs, body, this.out});
+ return defaultTagClosure.call(name, this, this.pendingNamespaces, this.namespaces, this.namespaceSpecificTags, prefix, attrs, body, this.out);
}
}