diff options
author | Martin Odersky <odersky@gmail.com> | 2013-01-17 11:28:44 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-01-17 11:28:44 +0100 |
commit | 7ec55667d7d206cdf3de6d629cace47996a796bb (patch) | |
tree | 9b64053da3aa164d8c7ddad715a15e68503f28dd /src | |
parent | dc90608f2646be48eaf643ae7c19604b6333189c (diff) | |
download | dotty-7ec55667d7d206cdf3de6d629cace47996a796bb.tar.gz dotty-7ec55667d7d206cdf3de6d629cace47996a796bb.tar.bz2 dotty-7ec55667d7d206cdf3de6d629cace47996a796bb.zip |
Renamed hasFlag… operations to contains/intersects
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/core/Denotations.scala | 4 | ||||
-rw-r--r-- | src/dotty/tools/dotc/core/Flags.scala | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala index 63f2976b6..bbbbaa74b 100644 --- a/src/dotty/tools/dotc/core/Denotations.scala +++ b/src/dotty/tools/dotc/core/Denotations.scala @@ -171,7 +171,7 @@ object Denotations { * someone does a findMember on a subclass. */ def enter(sym: Symbol)(implicit ctx: Context) = { - require(!flags.hasFlagIn(Frozen)) + require(!(flags intersects Frozen)) decls enter sym if (definedFingerPrintCache != null) includeName(definedFingerPrintCache, sym.name) @@ -184,7 +184,7 @@ object Denotations { * someone does a findMember on a subclass. */ def delete(sym: Symbol)(implicit ctx: Context) = { - require((flags & Frozen) == Flags.Empty) + require(!(flags intersects Frozen)) decls unlink sym if (definedFingerPrintCache != null) computeDefinedFingerPrint diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index 6bf0c1db8..f4a111632 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -23,27 +23,27 @@ object Flags { def & (that: FlagSet) = FlagSet(bits & that.bits) - def hasFlagIn(flags: FlagSet) = { + def intersects(flags: FlagSet) = { val fs = bits & flags.bits (fs & TYPEFLAGS) != 0 && fs > TYPEFLAGS } - def hasFlagIn(flags: FlagSet, butNotIn: FlagSet) = { + def intersects(flags: FlagSet, butNot: FlagSet) = { val fs = bits & flags.bits (fs & TYPEFLAGS) != 0 && fs > TYPEFLAGS && - (bits & butNotIn.bits) == 0 + (bits & butNot.bits) == 0 } - def hasAllFlags(flags: FlagSet) = { + def contains(flags: FlagSet) = { val fs = bits & flags.bits (fs & TYPEFLAGS) != 0 && (fs >> TYPESHIFT) == (flags.bits >> TYPESHIFT) } - def hasAllFlags(flags: FlagSet, butNotIn: FlagSet) = { - val fs = bits & (flags.bits | butNotIn.bits) + def contains(flags: FlagSet, butNot: FlagSet) = { + val fs = bits & (flags.bits | butNot.bits) (fs & TYPEFLAGS) != 0 && (fs >> TYPESHIFT) == (flags.bits >> TYPESHIFT) } |