diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2012-10-03 23:15:24 +0200 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2012-10-03 23:56:16 +0200 |
commit | d6bbf9bb9c8d0bd74abe47a1c2f4be66e0c19c03 (patch) | |
tree | ad72bc69fc1c3d43a082ab4a5bae124746de2b58 /src | |
parent | fb515bca0549cbc84a40b23889d1f038bcb0ef3a (diff) | |
download | scala-d6bbf9bb9c8d0bd74abe47a1c2f4be66e0c19c03.tar.gz scala-d6bbf9bb9c8d0bd74abe47a1c2f4be66e0c19c03.tar.bz2 scala-d6bbf9bb9c8d0bd74abe47a1c2f4be66e0c19c03.zip |
removes EmptyTermName and EmptyTypeName
We have nme.EMPTY and tpnme.EMPTY for that.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/reflect/reify/utils/SymbolTables.scala | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/api/Names.scala | 8 | ||||
-rw-r--r-- | src/reflect/scala/reflect/api/Trees.scala | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala index 3ec43c863d..dbb0836e0a 100644 --- a/src/compiler/scala/reflect/reify/utils/SymbolTables.scala +++ b/src/compiler/scala/reflect/reify/utils/SymbolTables.scala @@ -28,7 +28,7 @@ trait SymbolTables { symtab.get(sym) match { case Some(FreeDef(_, name, _, _, _)) => name case Some(SymDef(_, name, _, _)) => name - case None => EmptyTermName + case None => nme.EMPTY } def symAliases(sym: Symbol): List[TermName] = diff --git a/src/reflect/scala/reflect/api/Names.scala b/src/reflect/scala/reflect/api/Names.scala index e8665ca736..6cb226c32f 100644 --- a/src/reflect/scala/reflect/api/Names.scala +++ b/src/reflect/scala/reflect/api/Names.scala @@ -75,12 +75,4 @@ trait Names { /** Creates a new type name. */ def newTypeName(s: String): TypeName - - /** Wraps the empty string. Can be used as the null object for term name. - */ - def EmptyTermName: TermName = newTermName("") - - /** Wraps the empty string. Can be used as the null object for type name. - */ - def EmptyTypeName: TypeName = EmptyTermName.toTypeName } diff --git a/src/reflect/scala/reflect/api/Trees.scala b/src/reflect/scala/reflect/api/Trees.scala index 1f15ee6070..63a06ab2e8 100644 --- a/src/reflect/scala/reflect/api/Trees.scala +++ b/src/reflect/scala/reflect/api/Trees.scala @@ -1967,12 +1967,12 @@ trait Trees { self: Universe => val Modifiers: ModifiersCreator abstract class ModifiersCreator { - def apply(): Modifiers = Modifiers(NoFlags, EmptyTypeName, List()) + def apply(): Modifiers = Modifiers(NoFlags, tpnme.EMPTY, List()) def apply(flags: FlagSet, privateWithin: Name, annotations: List[Tree]): Modifiers } def Modifiers(flags: FlagSet, privateWithin: Name): Modifiers = Modifiers(flags, privateWithin, List()) - def Modifiers(flags: FlagSet): Modifiers = Modifiers(flags, EmptyTypeName) + def Modifiers(flags: FlagSet): Modifiers = Modifiers(flags, tpnme.EMPTY) /** ... */ lazy val NoMods = Modifiers() |