mirror of https://github.com/sbt/sbt.git
merge Pkg into Private
this better represents the original source
This commit is contained in:
parent
ec3a0ba375
commit
4db2c1df6a
|
|
@ -171,7 +171,6 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include
|
|||
case (_: Public, _: Public) => true
|
||||
case (qa: Protected, qb: Protected) => sameQualifier(qa, qb)
|
||||
case (qa: Private, qb: Private) => sameQualifier(qa, qb)
|
||||
case (qa: Pkg, qb: Pkg) => sameQualifier(qa, qb)
|
||||
case _ => debug(false, "Different access categories")
|
||||
}
|
||||
def sameQualifier(a: Qualified, b: Qualified): Boolean =
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ trait ShowBase
|
|||
{
|
||||
case p: Protected => "protected"
|
||||
case p: Private => "private"
|
||||
case p: Pkg => "package"
|
||||
})
|
||||
+ sq.show(q.qualifier) )
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,9 +198,8 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend
|
|||
{
|
||||
val within = c.privateWithin
|
||||
val qualifier = if(within == NoSymbol) Constants.unqualified else new xsbti.api.IdQualifier(fullName(within))
|
||||
if(c.hasFlag(Flags.PRIVATE)) new xsbti.api.Private(qualifier)
|
||||
else if(c.hasFlag(Flags.PROTECTED)) new xsbti.api.Protected(qualifier)
|
||||
else new xsbti.api.Pkg(qualifier)
|
||||
if(c.hasFlag(Flags.PROTECTED)) new xsbti.api.Protected(qualifier)
|
||||
else new xsbti.api.Private(qualifier)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ Access
|
|||
qualifier: Qualifier
|
||||
Protected
|
||||
Private
|
||||
Pkg
|
||||
|
||||
Qualifier
|
||||
Unqualified
|
||||
|
|
|
|||
Loading…
Reference in New Issue