diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/annotation/bridge.scala | 13 | ||||
| -rwxr-xr-x | src/library/scala/reflect/generic/Scopes.scala | 2 | ||||
| -rwxr-xr-x | src/library/scala/reflect/generic/Symbols.scala | 2 | ||||
| -rwxr-xr-x | src/library/scala/reflect/generic/Types.scala | 7 |
4 files changed, 19 insertions, 5 deletions
diff --git a/src/library/scala/annotation/bridge.scala b/src/library/scala/annotation/bridge.scala new file mode 100644 index 0000000000..690370854e --- /dev/null +++ b/src/library/scala/annotation/bridge.scala @@ -0,0 +1,13 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +package scala.annotation + +/** If this annotation is present on a method, it will be treated as a bridge method. + */ +private[scala] class bridge extends annotation.StaticAnnotation diff --git a/src/library/scala/reflect/generic/Scopes.scala b/src/library/scala/reflect/generic/Scopes.scala index 9f8a8ecd19..9aff63d958 100755 --- a/src/library/scala/reflect/generic/Scopes.scala +++ b/src/library/scala/reflect/generic/Scopes.scala @@ -4,7 +4,7 @@ package generic trait Scopes { self: Universe => abstract class AbsScope extends Iterable[Symbol] { - def enter(sym: Symbol): Symbol + private[reflect] def enter(sym: Symbol): Symbol } type Scope <: AbsScope diff --git a/src/library/scala/reflect/generic/Symbols.scala b/src/library/scala/reflect/generic/Symbols.scala index 49cf7df1ef..3614bfdeb4 100755 --- a/src/library/scala/reflect/generic/Symbols.scala +++ b/src/library/scala/reflect/generic/Symbols.scala @@ -27,7 +27,7 @@ trait Symbols { self: Universe => /** The name of the symbol before decoding, e.g. `\$eq\$eq` instead of `==`. */ - def encodedName: String + def encodedName: String = name.toString /** The decoded name of the symbol, e.g. `==` instead of `\$eq\$eq`. */ diff --git a/src/library/scala/reflect/generic/Types.scala b/src/library/scala/reflect/generic/Types.scala index 6dcd90e66c..c0eded6ab7 100755 --- a/src/library/scala/reflect/generic/Types.scala +++ b/src/library/scala/reflect/generic/Types.scala @@ -36,20 +36,21 @@ trait Types { self: Universe => } type Type >: Null <: AbsType + type SingletonType >: Null <: Type val NoType: Type val NoPrefix: Type - type ThisType <: Type + type ThisType <: SingletonType val ThisType: ThisTypeExtractor type TypeRef <: Type val TypeRef: TypeRefExtractor - type SingleType <: Type + type SingleType <: SingletonType val SingleType: SingleTypeExtractor - type SuperType <: Type + type SuperType <: SingletonType val SuperType: SuperTypeExtractor type TypeBounds <: Type |