diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-08-21 11:16:59 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-08-21 11:16:59 +0200 |
| commit | 02394593cf6ed5c092c398cdb1908ea5b0928d6a (patch) | |
| tree | 6e26b7daaaae2ca12038e30340995c145c22bbd1 /src/dotty/tools/dotc/core/Denotations.scala | |
| parent | f19ea205446ec1d5e356097c56312829e31dfc13 (diff) | |
| download | dotty-02394593cf6ed5c092c398cdb1908ea5b0928d6a.tar.gz dotty-02394593cf6ed5c092c398cdb1908ea5b0928d6a.tar.bz2 dotty-02394593cf6ed5c092c398cdb1908ea5b0928d6a.zip | |
Fixes to import handling and adaptation and implicits
Diffstat (limited to 'src/dotty/tools/dotc/core/Denotations.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Denotations.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala index 272b6f505..208c59213 100644 --- a/src/dotty/tools/dotc/core/Denotations.scala +++ b/src/dotty/tools/dotc/core/Denotations.scala @@ -159,7 +159,7 @@ object Denotations { def suchThat(p: Symbol => Boolean): SingleDenotation /** Does this denotation have an alternative that satisfies the predicate `p`? */ - def hasAltWith(p: Symbol => Boolean): Boolean + def hasAltWith(p: SingleDenotation => Boolean): Boolean /** The denotation made up from the alternatives of this denotation that * are accessible from prefix `pre`, or NoDenotation if no accessible alternative exists. @@ -352,7 +352,7 @@ object Denotations { else sd1 else sd2 } - def hasAltWith(p: Symbol => Boolean): Boolean = + def hasAltWith(p: SingleDenotation => Boolean): Boolean = denot1.hasAltWith(p) || denot2.hasAltWith(p) def accessibleFrom(pre: Type, superAccess: Boolean)(implicit ctx: Context): Denotation = { val d1 = denot1 accessibleFrom (pre, superAccess) @@ -400,8 +400,8 @@ object Denotations { def suchThat(p: Symbol => Boolean): SingleDenotation = if (p(symbol)) this else NoDenotation - def hasAltWith(p: Symbol => Boolean): Boolean = - p(symbol) + def hasAltWith(p: SingleDenotation => Boolean): Boolean = + p(this) def accessibleFrom(pre: Type, superAccess: Boolean)(implicit ctx: Context): Denotation = if (symbol isAccessibleFrom (pre, superAccess)) this else NoDenotation |