merge Pkg into Private

this better represents the original source
This commit is contained in:
Mark Harrah 2010-09-17 21:29:29 -04:00
parent ec3a0ba375
commit 4db2c1df6a
4 changed files with 2 additions and 6 deletions

View File

@ -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 =

View File

@ -78,7 +78,6 @@ trait ShowBase
{
case p: Protected => "protected"
case p: Private => "private"
case p: Pkg => "package"
})
+ sq.show(q.qualifier) )
}

View File

@ -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)
}
}

View File

@ -11,7 +11,6 @@ Access
qualifier: Qualifier
Protected
Private
Pkg
Qualifier
Unqualified