diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-06 10:44:39 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-06 11:44:05 -0700 |
| commit | b5a01906f6ad15745710e461af0676dc0506814f (patch) | |
| tree | 8a147007262b9e1738ce5cb078361aead90edb7c /src/compiler/scala/reflect/internal/Trees.scala | |
| parent | 19bb1732646c77e58fd63490afdca066afd5ec15 (diff) | |
| download | scala-b5a01906f6ad15745710e461af0676dc0506814f.tar.gz scala-b5a01906f6ad15745710e461af0676dc0506814f.tar.bz2 scala-b5a01906f6ad15745710e461af0676dc0506814f.zip | |
Moving flags around for performance.
Also trimmed some cruft which had accrued in recent work.
Diffstat (limited to 'src/compiler/scala/reflect/internal/Trees.scala')
| -rw-r--r-- | src/compiler/scala/reflect/internal/Trees.scala | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala index 1a40e0105c..c0d6f54b1a 100644 --- a/src/compiler/scala/reflect/internal/Trees.scala +++ b/src/compiler/scala/reflect/internal/Trees.scala @@ -42,7 +42,6 @@ trait Trees extends api.Trees { self: SymbolTable => } /* Abstract types from HasFlags. */ - type FlagsType = Long type AccessBoundaryType = Name type AnnotationType = Tree @@ -57,11 +56,7 @@ trait Trees extends api.Trees { self: SymbolTable => def hasAccessBoundary = privateWithin != tpnme.EMPTY def hasAllFlags(mask: Long): Boolean = (flags & mask) == mask def hasFlag(flag: Long) = (flag & flags) != 0L - def hasFlagsToString(mask: Long): String = flagsToString( - flags & mask, - if (hasAccessBoundary) privateWithin.toString else "" - ) - def defaultFlagString = hasFlagsToString(-1L) + def & (flag: Long): Modifiers = { val flags1 = flags & flag if (flags1 == flags) this @@ -91,7 +86,7 @@ trait Trees extends api.Trees { self: SymbolTable => override def mapAnnotations(f: List[Tree] => List[Tree]): Modifiers = Modifiers(flags, privateWithin, f(annotations)) setPositions positions - override def toString = "Modifiers(%s, %s, %s)".format(defaultFlagString, annotations mkString ", ", positions) + override def toString = "Modifiers(%s, %s, %s)".format(flagString, annotations mkString ", ", positions) } def Modifiers(flags: Long, privateWithin: Name): Modifiers = Modifiers(flags, privateWithin, List()) |