Fix traversal and mixin-is-own-parent detection, fixes @Deamon5550

This commit is contained in:
Mumfrey committed 2015-12-22 16:06:37 +00:00
1 parent d605e28da6
commit b0f2db09de
2 files changed
+41 -4

No files matched your search

@@ -692,6 +692,13 @@ public class ClassInfo extends TreeInfo {
public String getName() {
return this.name;
}
/**
* Get the class name (java format)
*/
public String getClassName() {
return this.name.replace('/', '.');
}
/**
* Get the superclass name (binary name)
@@ -880,6 +887,8 @@ public class ClassInfo extends TreeInfo {
public ClassInfo findSuperClass(String superClass) {
return this.findSuperClass(superClass, Traversal.NONE);
}
public static boolean b;
/**
* Search for the specified superclass in this class's hierarchy. If found
@@ -890,6 +899,14 @@ public class ClassInfo extends TreeInfo {
* @return Matched superclass or null if not found
*/
public ClassInfo findSuperClass(String superClass, Traversal traversal) {
if (ClassInfo.OBJECT.name == superClass) {
return null;
}
return this.findSuperClass(superClass, traversal, new HashSet<String>());
}
private ClassInfo findSuperClass(String superClass, Traversal traversal, Set<String> traversed) {
ClassInfo superClassInfo = this.getSuperClass();
if (superClassInfo != null) {
List<ClassInfo> targets = superClassInfo.getTargets();
@@ -898,16 +915,25 @@ public class ClassInfo extends TreeInfo {
return superClassInfo;
}
ClassInfo found = superTarget.findSuperClass(superClass, traversal.next());
ClassInfo found = superTarget.findSuperClass(superClass, traversal.next(), traversed);
if (found != null) {
return found;
}
}
}
if (traversal.canTraverse()) {
for (MixinInfo mixin : this.mixins) {
ClassInfo targetSuper = mixin.getClassInfo().findSuperClass(superClass, traversal);
String mixinClassName = mixin.getClassName();
if (traversed.contains(mixinClassName)) {
continue;
}
traversed.add(mixinClassName);
ClassInfo mixinClass = mixin.getClassInfo();
if (superClass.equals(mixinClass.getName())) {
return mixinClass;
}
ClassInfo targetSuper = mixinClass.findSuperClass(superClass, Traversal.ALL, traversed);
if (targetSuper != null) {
return targetSuper;
}
@@ -377,7 +377,18 @@ class MixinInfo extends TreeInfo implements Comparable<MixinInfo>, IMixinInfo {
continue;
}
if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.IMMEDIATE)) {
if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.SUPER)) {
ClassInfo superClass = ClassInfo.forName(classNode.superName);
if (superClass.isMixin()) {
// If superclass is a mixin, check for hierarchy derp
for (ClassInfo superTarget : superClass.getTargets()) {
if (this.targetClasses.contains(superTarget)) {
throw new InvalidMixinException(this, "Illegal hierarchy detected. Derived mixin " + this + " targets the same class "
+ superTarget.getClassName() + " as its superclass " + superClass.getClassName());
}
}
}
throw new InvalidMixinException(this, "Super class '" + classNode.superName.replace('/', '.') + "' of " + this.name
+ " was not found in the hierarchy of target class '" + targetClass + "'");
}