@@ -32,18 +32,18 @@ private[async] trait TransformUtils {
32
32
}
33
33
34
34
object name {
35
- def matchRes = maybeFresh (baseNames.matchRes)
36
- def ifRes = maybeFresh (baseNames.ifRes)
37
- def bindSuffix = maybeFresh( baseNames.bindSuffix)
38
- def completed = maybeFresh( baseNames.completed)
35
+ val matchRes = newTermName (baseNames.matchRes)
36
+ val ifRes = newTermName (baseNames.ifRes)
37
+ def bindSuffix = baseNames.bindSuffix
38
+ def completed = baseNames.completed
39
39
40
40
val state = maybeFresh(baseNames.state)
41
41
val result = baseNames.result
42
42
val execContext = maybeFresh(baseNames.execContext)
43
43
val tr = maybeFresh(baseNames.tr)
44
44
val t = maybeFresh(baseNames.t)
45
45
46
- val await = " await"
46
+ val await = newTermName( " await" )
47
47
val resume = newTermName(" resume" )
48
48
val apply = newTermName(" apply" )
49
49
val stateMachine = newTermName(fresh(" stateMachine" ))
@@ -162,10 +162,10 @@ private[async] trait TransformUtils {
162
162
(i, j) => util.Try (byNamess(i)(j)).getOrElse(false )
163
163
}
164
164
}
165
- private def argName (fun : Tree ): ((Int , Int ) => String ) = {
165
+ private def argName (fun : Tree ): ((Int , Int ) => TermName ) = {
166
166
val paramss = fun.tpe.paramss
167
- val namess = paramss.map(_.map(_.name.toString ))
168
- (i, j) => util.Try (namess(i)(j)).getOrElse(s " arg_ ${i}_ ${j}" )
167
+ val namess = paramss.map(_.map(_.name.toTermName ))
168
+ (i, j) => util.Try (namess(i)(j)).getOrElse(TermName ( s " arg_ ${i}_ ${j}" ) )
169
169
}
170
170
171
171
object defn {
@@ -246,7 +246,7 @@ private[async] trait TransformUtils {
246
246
}
247
247
}
248
248
249
- case class Arg (expr : Tree , isByName : Boolean , argName : String )
249
+ case class Arg (expr : Tree , isByName : Boolean , argName : TermName )
250
250
251
251
/**
252
252
* Transform a list of argument lists, producing the transformed lists, and lists of auxillary
@@ -261,7 +261,7 @@ private[async] trait TransformUtils {
261
261
*/
262
262
def mapArgumentss [A ](fun : Tree , argss : List [List [Tree ]])(f : Arg => (A , Tree )): (List [List [A ]], List [List [Tree ]]) = {
263
263
val isByNamess : (Int , Int ) => Boolean = isByName(fun)
264
- val argNamess : (Int , Int ) => String = argName(fun)
264
+ val argNamess : (Int , Int ) => TermName = argName(fun)
265
265
argss.zipWithIndex.map { case (args, i) =>
266
266
mapArguments[A ](args) {
267
267
(tree, j) => f(Arg (tree, isByNamess(i, j), argNamess(i, j)))
0 commit comments