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/02/17 20:34:21 UTC
[1/2] groovy git commit: Bumpt ASM API version to ASM6
Repository: groovy
Updated Branches:
refs/heads/master 302be69d1 -> 709c0d942
Bumpt ASM API version to ASM6
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ec6b6de6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ec6b6de6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ec6b6de6
Branch: refs/heads/master
Commit: ec6b6de6fd52889ad2cc881771744572a46f41ae
Parents: 302be69
Author: danielsun1106 <re...@hotmail.com>
Authored: Sun Feb 18 02:52:04 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Sun Feb 18 02:52:04 2018 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java | 4 ++--
.../codehaus/groovy/ast/decompiled/FormalParameterParser.java | 2 +-
.../org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java | 2 +-
.../java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java | 2 +-
src/test/gls/generics/GenericsTestBase.java | 2 +-
.../codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java b/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java
index 933f1b5..cc9c2f0 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java
@@ -94,7 +94,7 @@ public abstract class AsmDecompiler {
private ClassStub result;
public DecompilingVisitor() {
- super(Opcodes.ASM5);
+ super(Opcodes.ASM6);
}
@Override
@@ -179,7 +179,7 @@ public abstract class AsmDecompiler {
private abstract static class AnnotationReader extends AnnotationVisitor {
public AnnotationReader() {
- super(Opcodes.ASM5);
+ super(Opcodes.ASM6);
}
abstract void visitAttribute(String name, Object value);
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java b/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java
index 98277d8..a5fc1b5 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java
@@ -37,7 +37,7 @@ abstract class FormalParameterParser extends SignatureVisitor {
private final List<GenericsType> typeParameters = new ArrayList<GenericsType>();
public FormalParameterParser(AsmReferenceResolver resolver) {
- super(Opcodes.ASM5);
+ super(Opcodes.ASM6);
this.resolver = resolver;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java b/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java
index 7d971ed..718429e 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java
@@ -36,7 +36,7 @@ abstract class TypeSignatureParser extends SignatureVisitor {
private final AsmReferenceResolver resolver;
public TypeSignatureParser(AsmReferenceResolver resolver) {
- super(Opcodes.ASM5);
+ super(Opcodes.ASM6);
this.resolver = resolver;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index 0e1f6cc..dfec531 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -142,7 +142,7 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes {
final ClassLoader proxyLoader,
final boolean emptyBody,
final Class delegateClass) {
- super(Opcodes.ASM5, new ClassWriter(0));
+ super(Opcodes.ASM6, new ClassWriter(0));
this.loader = proxyLoader != null ? createInnerLoader(proxyLoader, interfaces) : findClassLoader(superClass, interfaces);
this.visitedMethods = new LinkedHashSet<Object>();
this.delegatedClosures = closureMap.isEmpty() ? EMPTY_DELEGATECLOSURE_MAP : new HashMap<String, Boolean>();
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/test/gls/generics/GenericsTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/gls/generics/GenericsTestBase.java b/src/test/gls/generics/GenericsTestBase.java
index dc5fc94..9b0f220 100644
--- a/src/test/gls/generics/GenericsTestBase.java
+++ b/src/test/gls/generics/GenericsTestBase.java
@@ -57,7 +57,7 @@ public abstract class GenericsTestBase extends GroovyTestCase {
}
private class GenericsTester extends ClassVisitor {
public GenericsTester(ClassVisitor cv) {
- super(Opcodes.ASM5,cv);
+ super(Opcodes.ASM6,cv);
}
public void visit(int version, int access, String name,
String signature, String superName, String[] interfaces) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/ec6b6de6/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy b/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
index 123e61a..ca88074 100644
--- a/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
+++ b/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
@@ -118,7 +118,7 @@ abstract class AbstractBytecodeTestCase extends GroovyTestCase {
InstructionSequence sequence
def output = new StringBuilderWriter()
def tcf;
- tcf = new TraceClassVisitor(new ClassVisitor(Opcodes.ASM4) {
+ tcf = new TraceClassVisitor(new ClassVisitor(Opcodes.ASM6) {
MethodVisitor visitMethod(int access, String name, String desc, String signature, String... exceptions) {
if (options.method == name) {
tcf.p.text << '--BEGIN--'
[2/2] groovy git commit: Represent built-in type with
`VariableExpression`
Posted by su...@apache.org.
Represent built-in type with `VariableExpression`
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/709c0d94
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/709c0d94
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/709c0d94
Branch: refs/heads/master
Commit: 709c0d94208f0f31187a4c5ea810565aaab9ad4a
Parents: ec6b6de
Author: danielsun1106 <re...@hotmail.com>
Authored: Sun Feb 18 04:00:09 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Sun Feb 18 04:30:12 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/groovy/parser/antlr4/AstBuilder.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/709c0d94/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index f1f256e..e3c87eb 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -2348,7 +2348,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return configureAST(methodCallExpression, ctx);
}
- if (baseExpr instanceof ClassExpression) { // void and primitive type AST node must be an instance of ClassExpression
+ if (baseExpr instanceof VariableExpression) { // void and primitive type AST node must be an instance of VariableExpression
String baseExprText = baseExpr.getText();
if (VOID_STR.equals(baseExprText)) { // e.g. void()
return configureAST(createCallMethodCallExpression(this.createConstantExpression(baseExpr), argumentsExpr), ctx);
@@ -3122,7 +3122,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
@Override
- public ClassExpression visitBuiltInTypePrmrAlt(BuiltInTypePrmrAltContext ctx) {
+ public VariableExpression visitBuiltInTypePrmrAlt(BuiltInTypePrmrAltContext ctx) {
return configureAST(this.visitBuiltInType(ctx.builtInType()), ctx);
}
@@ -3366,7 +3366,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
*/
@Override
- public ClassExpression visitBuiltInType(BuiltInTypeContext ctx) {
+ public VariableExpression visitBuiltInType(BuiltInTypeContext ctx) {
String text;
if (asBoolean(ctx.VOID())) {
text = ctx.VOID().getText();
@@ -3376,7 +3376,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("Unsupported built-in type: " + ctx, ctx);
}
- return configureAST(new ClassExpression(ClassHelper.make(text)), ctx);
+ return configureAST(new VariableExpression(text), ctx);
}