groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [1/2] groovy git commit: Bump ASM API version to ASM6
Date Sat, 17 Feb 2018 20:52:35 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 47753b958 -> bb9809d74


Bump ASM API version to ASM6

(cherry picked from commit ec6b6de)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/70f825ce
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/70f825ce
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/70f825ce

Branch: refs/heads/GROOVY_2_6_X
Commit: 70f825ce9900f90c35e057d3e46beac9ce5948a0
Parents: 47753b9
Author: danielsun1106 <realbluesun@hotmail.com>
Authored: Sun Feb 18 02:52:04 2018 +0800
Committer: danielsun1106 <realbluesun@hotmail.com>
Committed: Sun Feb 18 04:50:10 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/70f825ce/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/70f825ce/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/70f825ce/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/70f825ce/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 207a7ca..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.ASM4, 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/70f825ce/src/test/gls/generics/GenericsTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/gls/generics/GenericsTestBase.java b/src/test/gls/generics/GenericsTestBase.java
index 801806f..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.ASM4,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/70f825ce/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--'


Mime
View raw message