diff options
author | Paul Phillips <paulp@improving.org> | 2013-09-27 09:20:48 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-09-27 09:23:49 -0700 |
commit | 9ea3a4ac2cb36ee8519deab04fd1bd6be81a89cb (patch) | |
tree | 6b962aa33f7f12043e0e4153cb832807a92ea4b0 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
parent | 1a3c16fd36407bb2308bbb84739601544ac4a2e5 (diff) | |
download | scala-9ea3a4ac2cb36ee8519deab04fd1bd6be81a89cb.tar.gz scala-9ea3a4ac2cb36ee8519deab04fd1bd6be81a89cb.tar.bz2 scala-9ea3a4ac2cb36ee8519deab04fd1bd6be81a89cb.zip |
SI-6762 rename emptyValDef to noSelfType.
Looks like emptyValDef.isEmpty was already changed to return
false, so now all that's left is a name which means something.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index cd2b9b3a97..315496e5f6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -49,7 +49,7 @@ trait Contexts { self: Analyzer => private lazy val startContext = { NoContext.make( - Template(List(), emptyValDef, List()) setSymbol global.NoSymbol setType global.NoType, + Template(List(), noSelfType, List()) setSymbol global.NoSymbol setType global.NoType, rootMirror.RootClass, rootMirror.RootClass.info.decls) } @@ -615,7 +615,7 @@ trait Contexts { self: Analyzer => private def treeIdString = if (settings.uniqid.value) "#" + System.identityHashCode(tree).toString.takeRight(3) else "" private def treeString = tree match { case x: Import => "" + x - case Template(parents, `emptyValDef`, body) => + case Template(parents, `noSelfType`, body) => val pstr = if ((parents eq null) || parents.isEmpty) "Nil" else parents mkString " " val bstr = if (body eq null) "" else body.length + " stats" s"""Template($pstr, _, $bstr)""" |