phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improves pmd jdk8 readiness

Browse Source 
* Upgrade asm so that it understands default method and static methods in interfaces jdk8 class files
* see 9b91690f21 for ASM4 support
This commit is contained in:
Brice Dutheil
2015-03-01 22:09:33 +01:00
parent c50d84ff24
commit 28d1764428
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-core/src/main/java/net/sourceforge/pmd/dcd/asm/TypeSignatureVisitor.java
View File

@ -51,13 +51,13 @@ public class TypeSignatureVisitor extends SignatureVisitor {
} }
public TypeSignatureVisitor() { public TypeSignatureVisitor() {
super(Opcodes.ASM4); super(Opcodes.ASM5);
p = new PrintVisitor(); p = new PrintVisitor();
init(); init();
} }
public TypeSignatureVisitor(PrintVisitor parent) { public TypeSignatureVisitor(PrintVisitor parent) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
p = new PrintVisitor(parent); p = new PrintVisitor(parent);
init(); init();
} }

7
pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java
View File

@ -80,7 +80,7 @@ public class UsageGraphBuilder {
} }
public MyClassVisitor() { public MyClassVisitor() {
super(Opcodes.ASM4); super(Opcodes.ASM5);
p = new PrintVisitor(); p = new PrintVisitor();
} }
@ -206,7 +206,7 @@ public class UsageGraphBuilder {
private final MemberNode usingMemberNode; private final MemberNode usingMemberNode;
public MyMethodVisitor(PrintVisitor parent, MemberNode usingMemberNode) { public MyMethodVisitor(PrintVisitor parent, MemberNode usingMemberNode) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
p = parent; p = parent;
this.usingMemberNode = usingMemberNode; this.usingMemberNode = usingMemberNode;
} }
@ -353,13 +353,14 @@ public class UsageGraphBuilder {
} }
} }
public void visitMethodInsn(int opcode, String owner, String name, String desc) { public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
if (TRACE) { if (TRACE) {
println("visitMethodInsn:"); println("visitMethodInsn:");
printlnIndent("opcode: " + opcode); printlnIndent("opcode: " + opcode);
printlnIndent("owner: " + owner); printlnIndent("owner: " + owner);
printlnIndent("name: " + name); printlnIndent("name: " + name);
printlnIndent("desc: " + desc); printlnIndent("desc: " + desc);
printlnIndent("itf: " + itf);
} }
if (INDEX) { if (INDEX) {
String className = getClassName(owner); String className = getClassName(owner);

12
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
View File

@ -21,7 +21,7 @@ import org.objectweb.asm.signature.SignatureVisitor;
public class PMDASMVisitor extends ClassVisitor { public class PMDASMVisitor extends ClassVisitor {
public PMDASMVisitor() { public PMDASMVisitor() {
super(Opcodes.ASM4); super(Opcodes.ASM5);
} }
private Map<String, String> packages = new HashMap<String, String>(); private Map<String, String> packages = new HashMap<String, String>();
@ -173,7 +173,7 @@ public class PMDASMVisitor extends ClassVisitor {
private PMDASMVisitor parent; private PMDASMVisitor parent;
public PMDFieldVisitor(PMDASMVisitor visitor) { public PMDFieldVisitor(PMDASMVisitor visitor) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
parent = visitor; parent = visitor;
} }
@ -193,7 +193,7 @@ public class PMDASMVisitor extends ClassVisitor {
private PMDASMVisitor parent; private PMDASMVisitor parent;
public PMDAnnotationVisitor(PMDASMVisitor visitor) { public PMDAnnotationVisitor(PMDASMVisitor visitor) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
parent = visitor; parent = visitor;
} }
@ -224,7 +224,7 @@ public class PMDASMVisitor extends ClassVisitor {
private PMDASMVisitor parent; private PMDASMVisitor parent;
public PMDSignatureVisitor(PMDASMVisitor visitor) { public PMDSignatureVisitor(PMDASMVisitor visitor) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
this.parent = visitor; this.parent = visitor;
} }
@ -292,7 +292,7 @@ public class PMDASMVisitor extends ClassVisitor {
private PMDASMVisitor parent; private PMDASMVisitor parent;
public PMDMethodVisitor(PMDASMVisitor visitor) { public PMDMethodVisitor(PMDASMVisitor visitor) {
super(Opcodes.ASM4); super(Opcodes.ASM5);
parent = visitor; parent = visitor;
} }
@ -319,7 +319,7 @@ public class PMDASMVisitor extends ClassVisitor {
parent.addType(Type.getType(desc)); parent.addType(Type.getType(desc));
} }
public void visitMethodInsn(int opcode, String owner, String name, String desc) { public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
parent.parseClassName(owner); parent.parseClassName(owner);
parent.addMethodDesc(desc); parent.addMethodDesc(desc);
} }