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/03/06 00:53:52 UTC
[1/3] groovy git commit: add missing header
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 296bf35ef -> fd7601dc4
add missing header
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/22922849
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/22922849
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/22922849
Branch: refs/heads/GROOVY_2_6_X
Commit: 229228499579d620ecb99d4a828462c9d08016c0
Parents: 09d4154
Author: paulk <pa...@asert.com.au>
Authored: Tue Mar 6 07:52:52 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Mar 6 07:52:52 2018 +1000
----------------------------------------------------------------------
.../core/LocalVariableDeclaration_02x.groovy | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/22922849/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy b/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy
index 1e3a2ba..3310e01 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
def (int x, int y) = [1, 2]
assert 1 == x
assert 2 == y
[3/3] groovy git commit: improve error message plus minor refactoring
Posted by pa...@apache.org.
improve error message plus minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fd7601dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fd7601dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fd7601dc
Branch: refs/heads/GROOVY_2_6_X
Commit: fd7601dc47fb0fc2706aee3d2f34c772fed66192
Parents: 96e24c0
Author: paulk <pa...@asert.com.au>
Authored: Tue Mar 6 10:53:34 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Mar 6 10:53:34 2018 +1000
----------------------------------------------------------------------
.../java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/fd7601dc/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
index d4ddc94..b99ffe5 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
@@ -72,7 +72,7 @@ public class CallSiteWriter {
private static String getCreateArraySignature(int numberOfArguments) {
if (numberOfArguments >= SIG_ARRAY_LENGTH) {
throw new IllegalArgumentException(String.format(
- "The max number of arguments is %s, actual got %s",
+ "The max number of supported arguments is %s, but found %s",
SIG_ARRAY_LENGTH, numberOfArguments));
}
if (sig[numberOfArguments] == null) {
@@ -102,8 +102,7 @@ public class CallSiteWriter {
METHOD_OO_DESC = "(Ljava/lang/Object;)Ljava/lang/Object;",
CREATE_CSA_METHOD = "$createCallSiteArray";
public static final String CONSTRUCTOR = "<$constructor$>";
-
- private final List callSites = new ArrayList(32);
+ private final List<String> callSites = new ArrayList<String>(32);
private int callSiteArrayVarIndex = -1;
private final WriterController controller;
[2/3] groovy git commit: Merge remote-tracking branch
'origin/GROOVY_2_6_X' into GROOVY_2_6_X
Posted by pa...@apache.org.
Merge remote-tracking branch 'origin/GROOVY_2_6_X' into GROOVY_2_6_X
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/96e24c09
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/96e24c09
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/96e24c09
Branch: refs/heads/GROOVY_2_6_X
Commit: 96e24c095ead8b9182880ca10324fd003dc169eb
Parents: 2292284 296bf35
Author: paulk <pa...@asert.com.au>
Authored: Tue Mar 6 10:49:00 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Mar 6 10:49:00 2018 +1000
----------------------------------------------------------------------
.../org/codehaus/groovy/classgen/asm/CallSiteWriter.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------