Skip to content

Commit 47245f5

Browse files
paulppaulp
committed
Remove Name -> TermName implicit.
And simplify the name implicits.
1 parent 08e717e commit 47245f5

File tree

25 files changed

+78
-88
lines changed

25 files changed

+78
-88
lines changed

‎src/compiler/scala/reflect/reify/codegen/GenSymbols.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ trait GenSymbols {
143143
val reification = reificode(sym)
144144
import reification.{name, binding}
145145
val tree = reification.tree updateAttachment ReifyBindingAttachment(binding)
146-
state.symtab += (sym, name, tree)
146+
state.symtab += (sym, name.toTermName, tree)
147147
}
148148
fromSymtab
149149
}

‎src/compiler/scala/reflect/reify/phases/Reshape.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ trait Reshape {
254254
val flags1 = (flags0 & GetterFlags) & ~(STABLE | ACCESSOR | METHOD)
255255
val mods1 = Modifiers(flags1, privateWithin0, annotations0) setPositions mods0.positions
256256
val mods2 = toPreTyperModifiers(mods1, ddef.symbol)
257-
ValDef(mods2, name1, tpt0, extractRhs(rhs0))
257+
ValDef(mods2, name1.toTermName, tpt0, extractRhs(rhs0))
258258
}
259259

260260
private def trimAccessors(deff: Tree, stats: List[Tree]): List[Tree] = {
@@ -293,7 +293,7 @@ trait Reshape {
293293
}
294294
val mods2 = toPreTyperModifiers(mods1, vdef.symbol)
295295
val name1 = nme.dropLocalSuffix(name)
296-
val vdef1 = ValDef(mods2, name1, tpt, rhs)
296+
val vdef1 = ValDef(mods2, name1.toTermName, tpt, rhs)
297297
if (reifyDebug) println("resetting visibility of field: %s => %s".format(vdef, vdef1))
298298
Some(vdef1) // no copyAttrs here, because new ValDef and old symbols are now out of sync
299299
case ddef: DefDef if !ddef.mods.isLazy =>

‎src/compiler/scala/tools/nsc/ast/TreeDSL.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ trait TreeDSL {
181181
self: VODDStart =>
182182

183183
type ResultTreeType = ValDef
184-
def mkTree(rhs: Tree): ValDef = ValDef(mods, name, tpt, rhs)
184+
def mkTree(rhs: Tree): ValDef = ValDef(mods, name.toTermName, tpt, rhs)
185185
}
186186
trait DefCreator {
187187
self: VODDStart =>

‎src/compiler/scala/tools/nsc/ast/TreeGen.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
7474
val extraFlags = if (inClass) PrivateLocal | SYNTHETIC else 0
7575

7676
val mval = (
77-
accessor.owner.newVariable(nme.moduleVarName(accessor.name), accessor.pos.focus, MODULEVAR | extraFlags)
77+
accessor.owner.newVariable(nme.moduleVarName(accessor.name.toTermName), accessor.pos.focus, MODULEVAR | extraFlags)
7878
setInfo accessor.tpe.finalResultType
7979
addAnnotation VolatileAttr
8080
)
@@ -210,7 +210,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
210210
*/
211211
private def mkPackedValDef(expr: Tree, owner: Symbol, name: Name): (ValDef, () => Ident) = {
212212
val packedType = typer.packedType(expr, owner)
213-
val sym = owner.newValue(name, expr.pos.makeTransparent, SYNTHETIC) setInfo packedType
213+
val sym = owner.newValue(name.toTermName, expr.pos.makeTransparent, SYNTHETIC) setInfo packedType
214214

215215
(ValDef(sym, expr), () => Ident(sym) setPos sym.pos.focus setType expr.tpe)
216216
}

‎src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,10 @@ self =>
701701
tree match {
702702
case Ident(name) =>
703703
removeAsPlaceholder(name)
704-
makeParam(name, TypeTree() setPos o2p(tree.pos.endOrPoint))
704+
makeParam(name.toTermName, TypeTree() setPos o2p(tree.pos.endOrPoint))
705705
case Typed(Ident(name), tpe) if tpe.isType => // get the ident!
706706
removeAsPlaceholder(name)
707-
makeParam(name, tpe)
707+
makeParam(name.toTermName, tpe)
708708
case _ =>
709709
syntaxError(tree.pos, "not a legal formal parameter", false)
710710
makeParam(nme.ERROR, errorTypeTree setPos o2p(tree.pos.endOrPoint))
@@ -783,7 +783,7 @@ self =>
783783
val rPos = top.pos
784784
val end = if (rPos.isDefined) rPos.endOrPoint else opPos.endOrPoint
785785
top = atPos(start, opinfo.offset, end) {
786-
makeBinop(isExpr, opinfo.operand, opinfo.operator, top, opPos)
786+
makeBinop(isExpr, opinfo.operand, opinfo.operator.toTermName, top, opPos)
787787
}
788788
}
789789
top
@@ -1306,7 +1306,7 @@ self =>
13061306
val cond = condExpr()
13071307
newLinesOpt()
13081308
val body = expr()
1309-
makeWhile(lname, cond, body)
1309+
makeWhile(lname.toTermName, cond, body)
13101310
}
13111311
}
13121312
parseWhile
@@ -1318,7 +1318,7 @@ self =>
13181318
if (isStatSep) in.nextToken()
13191319
accept(WHILE)
13201320
val cond = condExpr()
1321-
makeDoWhile(lname, body, cond)
1321+
makeDoWhile(lname.toTermName, body, cond)
13221322
}
13231323
}
13241324
parseDo
@@ -1477,7 +1477,7 @@ self =>
14771477
def prefixExpr(): Tree = {
14781478
if (isUnaryOp) {
14791479
atPos(in.offset) {
1480-
val name = nme.toUnaryName(rawIdent())
1480+
val name = nme.toUnaryName(rawIdent().toTermName)
14811481
if (name == nme.UNARY_- && isNumericLit)
14821482
simpleExprRest(atPos(in.offset)(literal(isNegated = true)), canApply = true)
14831483
else
@@ -1515,7 +1515,7 @@ self =>
15151515
val pname = freshName("x$")
15161516
in.nextToken()
15171517
val id = atPos(start) (Ident(pname))
1518-
val param = atPos(id.pos.focus){ makeSyntheticParam(pname) }
1518+
val param = atPos(id.pos.focus){ makeSyntheticParam(pname.toTermName) }
15191519
placeholderParams = param :: placeholderParams
15201520
id
15211521
case LPAREN =>
@@ -2136,7 +2136,7 @@ self =>
21362136
expr()
21372137
} else EmptyTree
21382138
atPos(start, if (name == nme.ERROR) start else nameOffset) {
2139-
ValDef((mods | implicitmod | bynamemod) withAnnotations annots, name, tpt, default)
2139+
ValDef((mods | implicitmod | bynamemod) withAnnotations annots, name.toTermName, tpt, default)
21402140
}
21412141
}
21422142
def paramClause(): List[ValDef] = {
@@ -2696,7 +2696,7 @@ self =>
26962696
atPos(start, if (name == nme.ERROR) start else nameOffset) {
26972697
val mods1 = if (in.token == SUBTYPE) mods | Flags.DEFERRED else mods
26982698
val template = templateOpt(mods1, name, NoMods, Nil, tstart)
2699-
ModuleDef(mods1, name, template)
2699+
ModuleDef(mods1, name.toTermName, template)
27002700
}
27012701
}
27022702

‎src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ trait MemberHandlers {
149149
}
150150

151151
class ModuleHandler(module: ModuleDef) extends MemberDefHandler(module) {
152-
override def definesTerm = Some(name)
152+
override def definesTerm = Some(name.toTermName)
153153
override def definesValue = true
154154

155155
override def resultExtractionCode(req: Request) = codegenln("defined module ", name)

‎src/compiler/scala/tools/nsc/javac/JavaParsers.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
125125
def makeSyntheticParam(count: Int, tpt: Tree): ValDef =
126126
makeParam(nme.syntheticParamName(count), tpt)
127127
def makeParam(name: String, tpt: Tree): ValDef =
128-
makeParam(newTypeName(name), tpt)
128+
makeParam(name: TermName, tpt)
129129
def makeParam(name: TermName, tpt: Tree): ValDef =
130130
ValDef(Modifiers(Flags.JAVA | Flags.PARAM), name, tpt, EmptyTree)
131131

@@ -448,7 +448,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
448448
AppliedTypeTree(scalaDot(tpnme.JAVA_REPEATED_PARAM_CLASS_NAME), List(t))
449449
}
450450
}
451-
varDecl(in.currentPos, Modifiers(Flags.JAVA | Flags.PARAM), t, ident())
451+
varDecl(in.currentPos, Modifiers(Flags.JAVA | Flags.PARAM), t, ident().toTermName)
452452
}
453453

454454
def optThrows() {
@@ -542,18 +542,18 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
542542
* these potential definitions are real or not.
543543
*/
544544
def fieldDecls(pos: Position, mods: Modifiers, tpt: Tree, name: Name): List[Tree] = {
545-
val buf = ListBuffer[Tree](varDecl(pos, mods, tpt, name))
545+
val buf = ListBuffer[Tree](varDecl(pos, mods, tpt, name.toTermName))
546546
val maybe = new ListBuffer[Tree] // potential variable definitions.
547547
while (in.token == COMMA) {
548548
in.nextToken
549549
if (in.token == IDENTIFIER) { // if there's an ident after the comma ...
550550
val name = ident()
551551
if (in.token == ASSIGN || in.token == SEMI) { // ... followed by a `=` or `;`, we know it's a real variable definition
552552
buf ++= maybe
553-
buf += varDecl(in.currentPos, mods, tpt.duplicate, name)
553+
buf += varDecl(in.currentPos, mods, tpt.duplicate, name.toTermName)
554554
maybe.clear()
555555
} else if (in.token == COMMA) { // ... if there's a comma after the ident, it could be a real vardef or not.
556-
maybe += varDecl(in.currentPos, mods, tpt.duplicate, name)
556+
maybe += varDecl(in.currentPos, mods, tpt.duplicate, name.toTermName)
557557
} else { // ... if there's something else we were still in the initializer of the
558558
// previous var def; skip to next comma or semicolon.
559559
skipTo(COMMA, SEMI)
@@ -830,7 +830,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
830830
// The STABLE flag is to signal to namer that this was read from a
831831
// java enum, and so should be given a Constant type (thereby making
832832
// it usable in annotations.)
833-
ValDef(Modifiers(Flags.STABLE | Flags.JAVA | Flags.STATIC), name, enumType, blankExpr)
833+
ValDef(Modifiers(Flags.STABLE | Flags.JAVA | Flags.STATIC), name.toTermName, enumType, blankExpr)
834834
}
835835
}
836836

‎src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ abstract class ClassfileParser {
252252
} else {
253253
log("Couldn't find " + name + ": " + tpe + " inside: \n" + ownerTpe)
254254
f = tpe match {
255-
case MethodType(_, _) => owner.newMethod(name, owner.pos)
256-
case _ => owner.newVariable(name, owner.pos)
255+
case MethodType(_, _) => owner.newMethod(name.toTermName, owner.pos)
256+
case _ => owner.newVariable(name.toTermName, owner.pos)
257257
}
258258
f setInfo tpe
259259
log("created fake member " + f.fullName)
@@ -282,7 +282,7 @@ abstract class ClassfileParser {
282282
if (in.buf(start).toInt != CONSTANT_NAMEANDTYPE) errorBadTag(start)
283283
val name = getName(in.getChar(start + 1).toInt)
284284
// create a dummy symbol for method types
285-
val dummySym = ownerTpe.typeSymbol.newMethod(name, ownerTpe.typeSymbol.pos)
285+
val dummySym = ownerTpe.typeSymbol.newMethod(name.toTermName, ownerTpe.typeSymbol.pos)
286286
var tpe = getType(dummySym, in.getChar(start + 3).toInt)
287287

288288
// fix the return type, which is blindly set to the class currently parsed
@@ -457,7 +457,7 @@ abstract class ClassfileParser {
457457
ss = name.subName(start, end)
458458
sym = owner.info.decls lookup ss
459459
if (sym == NoSymbol) {
460-
sym = owner.newPackage(ss) setInfo completer
460+
sym = owner.newPackage(ss.toTermName) setInfo completer
461461
sym.moduleClass setInfo completer
462462
owner.info.decls enter sym
463463
}
@@ -604,7 +604,7 @@ abstract class ClassfileParser {
604604
} else {
605605
val name = pool.getName(in.nextChar)
606606
val info = pool.getType(in.nextChar)
607-
val sym = getOwner(jflags).newValue(name, NoPosition, sflags)
607+
val sym = getOwner(jflags).newValue(name.toTermName, NoPosition, sflags)
608608
val isEnum = (jflags & JAVA_ACC_ENUM) != 0
609609

610610
sym setInfo {
@@ -639,7 +639,7 @@ abstract class ClassfileParser {
639639
in.skip(4); skipAttributes()
640640
} else {
641641
val name = pool.getName(in.nextChar)
642-
val sym = getOwner(jflags).newMethod(name, NoPosition, sflags)
642+
val sym = getOwner(jflags).newMethod(name.toTermName, NoPosition, sflags)
643643
var info = pool.getType(sym, (in.nextChar))
644644
if (name == nme.CONSTRUCTOR)
645645
info match {

‎src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ abstract class ICodeReader extends ClassfileParser {
8080
val jflags = in.nextChar
8181
val name = pool getName in.nextChar
8282
val owner = getOwner(jflags)
83-
val dummySym = owner.newMethod(name, owner.pos, toScalaMethodFlags(jflags))
83+
val dummySym = owner.newMethod(name.toTermName, owner.pos, toScalaMethodFlags(jflags))
8484

8585
try {
8686
val ch = in.nextChar
@@ -94,7 +94,7 @@ abstract class ICodeReader extends ClassfileParser {
9494
if (sym == NoSymbol)
9595
sym = owner.info.findMember(newTermName(name + nme.LOCAL_SUFFIX_STRING), 0, 0, false).suchThat(_.tpe =:= tpe)
9696
if (sym == NoSymbol) {
97-
sym = if (field) owner.newValue(name, owner.pos, toScalaFieldFlags(jflags)) else dummySym
97+
sym = if (field) owner.newValue(name.toTermName, owner.pos, toScalaFieldFlags(jflags)) else dummySym
9898
sym setInfoAndEnter tpe
9999
log(s"ICodeReader could not locate ${name.decode} in $owner. Created ${sym.defString}.")
100100
}

‎src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,7 @@ abstract class TypeParser {
608608
if(method.IsSpecialName) {
609609
val paramsArity = method.GetParameters().size
610610
// handle operator overload, otherwise handle as any static method
611-
val operName = operatorOverload(name, paramsArity)
612-
if (operName.isDefined) { return operName.get; }
611+
operatorOverload(name, paramsArity) foreach (x => return x.toTermName)
613612
}
614613
return newTermName(name);
615614
}

0 commit comments

Comments
 (0)