diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-08-30 01:35:52 -0700 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-08-30 01:35:52 -0700 |
| commit | 3c7b0620f3233f0ec77eea3a8b9e5d9d429ca94e (patch) | |
| tree | fd9000a96280d23a1e7b904ca196d60b9bd7bcfa | |
| parent | c32a622aed0f6fd65f667181093ead477089f261 (diff) | |
| parent | c1e45256edda3d059675e13e77fe3af46f88bc7d (diff) | |
| download | scala-3c7b0620f3233f0ec77eea3a8b9e5d9d429ca94e.tar.gz scala-3c7b0620f3233f0ec77eea3a8b9e5d9d429ca94e.tar.bz2 scala-3c7b0620f3233f0ec77eea3a8b9e5d9d429ca94e.zip | |
Merge pull request #1215 from dgruntz/reflection/tuning
Reflection tuning
| -rw-r--r-- | src/library/scala/reflect/base/Symbols.scala | 16 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/FlagSets.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Mirrors.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Importers.scala | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/library/scala/reflect/base/Symbols.scala b/src/library/scala/reflect/base/Symbols.scala index 294fa19d62..3830264425 100644 --- a/src/library/scala/reflect/base/Symbols.scala +++ b/src/library/scala/reflect/base/Symbols.scala @@ -107,8 +107,8 @@ trait Symbols { self: Universe => /** Does this symbol represent the definition of a type? * Note that every symbol is either a term or a type. - * So for every symbol `sym`, either `sym.isTerm` is true - * or `sym.isType` is true. + * So for every symbol `sym` (except for `NoSymbol`), + * either `sym.isTerm` is true or `sym.isType` is true. */ def isType: Boolean = false @@ -118,9 +118,9 @@ trait Symbols { self: Universe => def asType: TypeSymbol = throw new ScalaReflectionException(s"$this is not a type") /** Does this symbol represent the definition of a term? - * Note that every symbol is either a term or a term. - * So for every symbol `sym`, either `sym.isTerm` is true - * or `sym.isTerm` is true. + * Note that every symbol is either a term or a type. + * So for every symbol `sym` (except for `NoSymbol`), + * either `sym.isTerm` is true or `sym.isTerm` is true. */ def isTerm: Boolean = false @@ -234,10 +234,10 @@ trait Symbols { self: Universe => * `PolyType(ClassInfoType(...))` that describes type parameters, value * parameters, parent types, and members of `C`. */ - def toType: Type + def toType: Type - override def isType = true - override def asType = this + final override def isType = true + final override def asType = this } /** The base API that all term symbols support */ diff --git a/src/reflect/scala/reflect/api/FlagSets.scala b/src/reflect/scala/reflect/api/FlagSets.scala index 36836e84a9..fdd43f1883 100644 --- a/src/reflect/scala/reflect/api/FlagSets.scala +++ b/src/reflect/scala/reflect/api/FlagSets.scala @@ -3,7 +3,7 @@ package api import scala.language.implicitConversions -trait FlagSets { self: Universe => +trait FlagSets extends base.FlagSets { self: Universe => type FlagSet diff --git a/src/reflect/scala/reflect/api/Mirrors.scala b/src/reflect/scala/reflect/api/Mirrors.scala index 7d185d9879..8c4c423221 100644 --- a/src/reflect/scala/reflect/api/Mirrors.scala +++ b/src/reflect/scala/reflect/api/Mirrors.scala @@ -1,7 +1,7 @@ package scala.reflect package api -trait Mirrors { self: Universe => +trait Mirrors extends base.Mirrors { self: Universe => type RuntimeClass >: Null diff --git a/src/reflect/scala/reflect/internal/Importers.scala b/src/reflect/scala/reflect/internal/Importers.scala index d5baad8ab1..4b3eb0cdc4 100644 --- a/src/reflect/scala/reflect/internal/Importers.scala +++ b/src/reflect/scala/reflect/internal/Importers.scala @@ -3,7 +3,7 @@ package internal import scala.collection.mutable.WeakHashMap // SI-6241: move importers to a mirror -trait Importers { self: SymbolTable => +trait Importers extends api.Importers { self: SymbolTable => def mkImporter(from0: api.Universe): Importer { val from: from0.type } = ( if (self eq from0) { |