luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace Symbol.nameString calls with simpleName(Symbol). Fixes #577. 

nameString is only for printing and has different behavior when scalac is
given -uniqid.
This commit is contained in:
Mark Harrah 2012-10-15 12:42:27 -04:00
parent 88ca4aec64
commit d6072275aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile/interface/API.scala
View File

@ -124,7 +124,7 @@ final class API(val global: CallbackGlobal) extends Compat
} }
} }
else if(sym.isRoot || sym.isRootPackage) Constants.emptyType else if(sym.isRoot || sym.isRootPackage) Constants.emptyType
else new xsbti.api.Projection(simpleType(in, pre), sym.nameString) else new xsbti.api.Projection(simpleType(in, pre), simpleName(sym))
} }
private def reference(sym: Symbol): xsbti.api.ParameterRef = new xsbti.api.ParameterRef(tparamID(sym)) private def reference(sym: Symbol): xsbti.api.ParameterRef = new xsbti.api.ParameterRef(tparamID(sym))
@ -163,7 +163,7 @@ final class API(val global: CallbackGlobal) extends Compat
} }
} }
def parameterS(s: Symbol): xsbti.api.MethodParameter = def parameterS(s: Symbol): xsbti.api.MethodParameter =
makeParameter(s.nameString, s.info, s.info.typeSymbol, s) makeParameter(simpleName(s), s.info, s.info.typeSymbol, s)
// paramSym is only for 2.8 and is to determine if the parameter has a default // paramSym is only for 2.8 and is to determine if the parameter has a default
def makeParameter(name: String, tpe: Type, ts: Symbol, paramSym: Symbol): xsbti.api.MethodParameter = def makeParameter(name: String, tpe: Type, ts: Symbol, paramSym: Symbol): xsbti.api.MethodParameter =