[Jython-checkins] jython: Move all ASM API references to ASM7.

[jeff.allen]

https://hg.python.org/jython/rev/37365325d253
changeset:   8217:37365325d253
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Wed Jan 09 17:28:41 2019 +0000
summary:
  Move all ASM API references to ASM7.

This addresses a failure to recognise java.util.regex.Pattern and Matcher as
public when scanning packages. Changes elsewhere are for consistency.

files:
  src/org/python/compiler/Code.java                                 |  2 +-
  src/org/python/core/AnnotationReader.java                         |  4 ++--
  src/org/python/core/packagecache/PackageManager.java              |  2 +-
  src/org/python/expose/generate/ExposedFieldFinder.java            |  2 +-
  src/org/python/expose/generate/ExposedMethodFinder.java           |  2 +-
  src/org/python/expose/generate/ExposedTypeProcessor.java          |  4 ++--
  src/org/python/expose/generate/RestrictiveAnnotationVisitor.java  |  2 +-
  src/org/python/modules/jffi/SkinnyMethodAdapter.java              |  2 +-
  tests/java/org/python/expose/generate/ExposeMethodFinderTest.java |  2 +-
  9 files changed, 11 insertions(+), 11 deletions(-)


diff --git a/src/org/python/compiler/Code.java b/src/org/python/compiler/Code.java
--- a/src/org/python/compiler/Code.java
+++ b/src/org/python/compiler/Code.java
@@ -22,7 +22,7 @@
     //XXX: I'd really like to get sig and access out of here since MethodVistitor
     //     should already have this information.
     public Code(MethodVisitor mv, String sig, int access) {
-        super(ASM5);
+        super(ASM7);
         this.mv = mv;
         this.sig = sig;
         nlocals = -sigSize(sig, false);
diff --git a/src/org/python/core/AnnotationReader.java b/src/org/python/core/AnnotationReader.java
--- a/src/org/python/core/AnnotationReader.java
+++ b/src/org/python/core/AnnotationReader.java
@@ -36,7 +36,7 @@
      * @throws IOException - if the classfile is malformed.
      */
     public AnnotationReader(byte[] data) throws IOException {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
         ClassReader r;
         try {
             r = new ClassReader(data);
@@ -52,7 +52,7 @@
         nextVisitIsVersion = desc.equals("Lorg/python/compiler/APIVersion;");
         nextVisitIsMTime = desc.equals("Lorg/python/compiler/MTime;");
         nextVisitIsFilename = desc.equals("Lorg/python/compiler/Filename;");
-        return new AnnotationVisitor(Opcodes.ASM5) {
+        return new AnnotationVisitor(Opcodes.ASM7) {
 
         	public void visit(String name, Object value) {
         		if (nextVisitIsVersion) {
diff --git a/src/org/python/core/packagecache/PackageManager.java b/src/org/python/core/packagecache/PackageManager.java
--- a/src/org/python/core/packagecache/PackageManager.java
+++ b/src/org/python/core/packagecache/PackageManager.java
@@ -180,7 +180,7 @@
         private int class_access;
 
         public AccessVisitor() throws IOException {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM7);
         }
 
         @Override
diff --git a/src/org/python/expose/generate/ExposedFieldFinder.java b/src/org/python/expose/generate/ExposedFieldFinder.java
--- a/src/org/python/expose/generate/ExposedFieldFinder.java
+++ b/src/org/python/expose/generate/ExposedFieldFinder.java
@@ -14,7 +14,7 @@
     private String doc;
 
     public ExposedFieldFinder(String name, FieldVisitor delegate) {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
         fieldName = name;
         this.delegate = delegate;
     }
diff --git a/src/org/python/expose/generate/ExposedMethodFinder.java b/src/org/python/expose/generate/ExposedMethodFinder.java
--- a/src/org/python/expose/generate/ExposedMethodFinder.java
+++ b/src/org/python/expose/generate/ExposedMethodFinder.java
@@ -35,7 +35,7 @@
                                String desc,
                                String[] exceptions,
                                MethodVisitor delegate) {
-        super(Opcodes.ASM5, delegate);
+        super(Opcodes.ASM7, delegate);
         this.typeName = typeName;
         this.onType = onType;
         this.access = access;
diff --git a/src/org/python/expose/generate/ExposedTypeProcessor.java b/src/org/python/expose/generate/ExposedTypeProcessor.java
--- a/src/org/python/expose/generate/ExposedTypeProcessor.java
+++ b/src/org/python/expose/generate/ExposedTypeProcessor.java
@@ -114,7 +114,7 @@
         private boolean generatedStaticBlock;
 
         private TypeProcessor(ClassVisitor cv) {
-            super(Opcodes.ASM5, cv);
+            super(Opcodes.ASM7, cv);
         }
 
         @Override
@@ -228,7 +228,7 @@
                                                                            desc,
                                                                            signature,
                                                                            exceptions);
-                return new MethodVisitor(Opcodes.ASM5, passthroughVisitor) {
+                return new MethodVisitor(Opcodes.ASM7, passthroughVisitor) {
 
                     @Override
                     public void visitCode() {
diff --git a/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java b/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
--- a/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
+++ b/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
@@ -10,7 +10,7 @@
 public class RestrictiveAnnotationVisitor extends AnnotationVisitor {
 
     public RestrictiveAnnotationVisitor() {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
     }
 
     public AnnotationVisitor visitAnnotation(String name, String desc) {
diff --git a/src/org/python/modules/jffi/SkinnyMethodAdapter.java b/src/org/python/modules/jffi/SkinnyMethodAdapter.java
--- a/src/org/python/modules/jffi/SkinnyMethodAdapter.java
+++ b/src/org/python/modules/jffi/SkinnyMethodAdapter.java
@@ -31,7 +31,7 @@
     private ClassVisitor cv;
     
     public SkinnyMethodAdapter(ClassVisitor cv, int flags, String name, String signature, String something, String[] exceptions) {
-    	super(ASM4);
+    	super(ASM7);
         setMethodVisitor(cv.visitMethod(flags, name, signature, something, exceptions));
         this.cv = cv;
         this.name = name;
diff --git a/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java b/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
--- a/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
+++ b/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
@@ -16,7 +16,7 @@
                                        methodName,
                                        descriptor,
                                        null,
-                                       new MethodVisitor(Opcodes.ASM4) {}) {
+                                       new MethodVisitor(Opcodes.ASM7) {}) {
 
             @Override
             public void handleResult(InstanceMethodExposer exposer) {

-- 
Repository URL: https://hg.python.org/jython