luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better cycle handling in SameAPI

This commit is contained in:
Mark Harrah 2011-03-08 17:51:14 -05:00
parent 37f793be6e
commit 0935fba0b5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compile/api/SameAPI.scala
View File

@ -89,7 +89,7 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include
{ {
import SameAPI._ import SameAPI._
private val pending = new mutable.HashSet[(Structure, Structure)] private val pending = new mutable.HashSet[AnyRef]
private[this] val debugEnabled = java.lang.Boolean.getBoolean("xsbt.api.debug") private[this] val debugEnabled = java.lang.Boolean.getBoolean("xsbt.api.debug")
def debug(flag: Boolean, msg: => String): Boolean = def debug(flag: Boolean, msg: => String): Boolean =
{ {
@ -161,11 +161,15 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include
/** Checks that the two definitions are the same, other than their name.*/ /** Checks that the two definitions are the same, other than their name.*/
def sameDefinitionContent(a: Definition, b: Definition): Boolean = def sameDefinitionContent(a: Definition, b: Definition): Boolean =
samePending(a,b)(sameDefinitionContentDirect)
def sameDefinitionContentDirect(a: Definition, b: Definition): Boolean =
{
//a.name == b.name && //a.name == b.name &&
debug(sameAccess(a.access, b.access), "Access differed") && debug(sameAccess(a.access, b.access), "Access differed") &&
debug(sameModifiers(a.modifiers, b.modifiers), "Modifiers differed") && debug(sameModifiers(a.modifiers, b.modifiers), "Modifiers differed") &&
debug(sameAnnotations(a.annotations, b.annotations), "Annotations differed") && debug(sameAnnotations(a.annotations, b.annotations), "Annotations differed") &&
debug(sameDefinitionSpecificAPI(a, b), "Definition-specific differed") debug(sameDefinitionSpecificAPI(a, b), "Definition-specific differed")
}
def sameAccess(a: Access, b: Access): Boolean = def sameAccess(a: Access, b: Access): Boolean =
(a, b) match (a, b) match
@ -301,6 +305,8 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include
} }
def sameType(a: Type, b: Type): Boolean = def sameType(a: Type, b: Type): Boolean =
samePending(a,b)(sameTypeDirect)
def sameTypeDirect(a: Type, b: Type): Boolean =
(a, b) match (a, b) match
{ {
case (sa: SimpleType, sb: SimpleType) => debug(sameSimpleType(sa, sb), "Different simple types: " + DefaultShowAPI(sa) + " and " + DefaultShowAPI(sb)) case (sa: SimpleType, sb: SimpleType) => debug(sameSimpleType(sa, sb), "Different simple types: " + DefaultShowAPI(sa) + " and " + DefaultShowAPI(sb))
@ -325,11 +331,10 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include
sameSimpleType(a.baseType, b.baseType) && sameSimpleType(a.baseType, b.baseType) &&
sameAnnotations(a.annotations, b.annotations) sameAnnotations(a.annotations, b.annotations)
def sameStructure(a: Structure, b: Structure): Boolean = def sameStructure(a: Structure, b: Structure): Boolean =
if(pending add ((a,b)) ) samePending(a,b)(sameStructureDirect)
try { sameStructureDirect(a,b) } private[this] def samePending[T](a: T, b: T)(f: (T,T) => Boolean): Boolean =
finally { pending -= ((a,b)) } if(pending add ((a,b)) ) f(a,b) else true
else
true
def sameStructureDirect(a: Structure, b: Structure): Boolean = def sameStructureDirect(a: Structure, b: Structure): Boolean =
sameSeq(a.parents, b.parents)(sameType) && sameSeq(a.parents, b.parents)(sameType) &&
sameMembers(a.declared, b.declared) && sameMembers(a.declared, b.declared) &&