diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-01-21 10:40:46 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-01-21 10:40:46 +0100 |
| commit | a1c99ffc7b0c53f4a95bd8fe934e65f4a03002d6 (patch) | |
| tree | 9b05f6a5e6136c0efba8e54d0e0c9cd65a3ef0f6 /src/compiler | |
| parent | 14ef1090325c3b85aa8c2dd7911445ec7e934743 (diff) | |
| download | scala-a1c99ffc7b0c53f4a95bd8fe934e65f4a03002d6.tar.gz scala-a1c99ffc7b0c53f4a95bd8fe934e65f4a03002d6.tar.bz2 scala-a1c99ffc7b0c53f4a95bd8fe934e65f4a03002d6.zip | |
wip
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 354b8caaa3..86c014a181 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -828,8 +828,14 @@ trait Namers extends MethodSynthesis { if (inheritsSelf || tp.isError) AnyRefClass.tpe else tp } - - val parents = typer.parentTypes(templ) map checkParent + + var parents = typer.parentTypes(templ) map checkParent + if (clazz.hasAnnotation(ScalaInlineClass)) { + if (!(parents exists (_.typeSymbol == NotNullClass))) + parents = parents :+ NotNullClass.tpe + clazz setFlag FINAL + } + enterSelf(templ.self) val decls = new Scope |