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/reflect/reify | |
| 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/reflect/reify')
| -rw-r--r-- | src/compiler/scala/reflect/reify/codegen/GenTrees.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/reify/phases/Reshape.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/reify/utils/Extractors.scala | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/reflect/reify/codegen/GenTrees.scala b/src/compiler/scala/reflect/reify/codegen/GenTrees.scala index 9de8451873..a09acc04b8 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenTrees.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenTrees.scala @@ -71,8 +71,8 @@ trait GenTrees { def reifyTreeSyntactically(tree: Tree) = tree match { case global.EmptyTree => reifyMirrorObject(EmptyTree) - case global.emptyValDef => - mirrorSelect(nme.emptyValDef) + case global.noSelfType => + mirrorSelect(nme.noSelfType) case global.pendingSuperCall => mirrorSelect(nme.pendingSuperCall) case Literal(const @ Constant(_)) => diff --git a/src/compiler/scala/reflect/reify/phases/Reshape.scala b/src/compiler/scala/reflect/reify/phases/Reshape.scala index 7610df67dc..fff6978653 100644 --- a/src/compiler/scala/reflect/reify/phases/Reshape.scala +++ b/src/compiler/scala/reflect/reify/phases/Reshape.scala @@ -169,7 +169,7 @@ trait Reshape { private def toPreTyperCompoundTypeTree(ctt: CompoundTypeTree): Tree = { val CompoundTypeTree(tmpl @ Template(parents, self, stats)) = ctt if (stats.nonEmpty) CannotReifyCompoundTypeTreeWithNonEmptyBody(ctt) - assert(self eq emptyValDef, self) + assert(self eq noSelfType, self) val att = tmpl.attachments.get[CompoundTypeTreeOriginalAttachment] val CompoundTypeTreeOriginalAttachment(parents1, stats1) = att.getOrElse(CompoundTypeTreeOriginalAttachment(parents, stats)) CompoundTypeTree(Template(parents1, self, stats1)) diff --git a/src/compiler/scala/reflect/reify/utils/Extractors.scala b/src/compiler/scala/reflect/reify/utils/Extractors.scala index 9af8f2de2a..d052127956 100644 --- a/src/compiler/scala/reflect/reify/utils/Extractors.scala +++ b/src/compiler/scala/reflect/reify/utils/Extractors.scala @@ -75,12 +75,12 @@ trait Extractors { newTypeName(global.currentUnit.fresh.newName(flavor.toString)), List(), Template(List(Ident(reifierBase)), - emptyValDef, + noSelfType, List( DefDef(NoMods, nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), nme.CONSTRUCTOR), List())), Literal(Constant(())))), DefDef(NoMods, reifierName, - List(TypeDef(Modifiers(PARAM), tparamu, List(), TypeBoundsTree(Ident(NothingClass), CompoundTypeTree(Template(List(Ident(reifierUniverse), Ident(SingletonClass)), emptyValDef, List()))))), + List(TypeDef(Modifiers(PARAM), tparamu, List(), TypeBoundsTree(Ident(NothingClass), CompoundTypeTree(Template(List(Ident(reifierUniverse), Ident(SingletonClass)), noSelfType, List()))))), List(List(ValDef(Modifiers(PARAM), nme.MIRROR_UNTYPED, AppliedTypeTree(Ident(MirrorClass), List(Ident(tparamu))), EmptyTree))), reifierTpt, reifierBody)))) Block(tpec, ApplyConstructor(Ident(tpec.name), List())) |