@@ -214,9 +214,9 @@ private[async] trait TransformUtils {
214214 */
215215 private def mapArguments [A ](args : List [Tree ])(f : (Tree , Int ) => (A , Tree )): (List [A ], List [Tree ]) = {
216216 args match {
217- case args :+ Typed (tree, Ident (tpnme .WILDCARD_STAR )) =>
217+ case args :+ Typed (tree, Ident (typeNames .WILDCARD_STAR )) =>
218218 val (a, argExprs :+ lastArgExpr) = (args :+ tree).zipWithIndex.map(f.tupled).unzip
219- val exprs = argExprs :+ atPos(lastArgExpr.pos.makeTransparent)(Typed (lastArgExpr, Ident (tpnme .WILDCARD_STAR )))
219+ val exprs = argExprs :+ atPos(lastArgExpr.pos.makeTransparent)(Typed (lastArgExpr, Ident (typeNames .WILDCARD_STAR )))
220220 (a, exprs)
221221 case args =>
222222 args.zipWithIndex.map(f.tupled).unzip
@@ -253,7 +253,7 @@ private[async] trait TransformUtils {
253253 }
254254
255255 def emptyConstructor : DefDef = {
256- val emptySuperCall = Apply (Select (Super (This (tpnme .EMPTY ), tpnme .EMPTY ), nme.CONSTRUCTOR ), Nil )
256+ val emptySuperCall = Apply (Select (Super (This (typeNames .EMPTY ), typeNames .EMPTY ), nme.CONSTRUCTOR ), Nil )
257257 DefDef (NoMods , nme.CONSTRUCTOR , List (), List (List ()), TypeTree (), Block (List (emptySuperCall), Literal (Constant (()))))
258258 }
259259
@@ -557,8 +557,8 @@ private[async] trait TransformUtils {
557557 val ACCESSOR = (1L << 27 ).asInstanceOf [FlagSet ]
558558 val STABLE = (1L << 22 ).asInstanceOf [FlagSet ]
559559 val field = ValDef (Modifiers (Flag .MUTABLE | Flag .PRIVATE | Flag .LOCAL ), name + " " , TypeTree (tpt), init)
560- val getter = DefDef (Modifiers (ACCESSOR | STABLE ), name, Nil , Nil , TypeTree (tpt), Select (This (tpnme .EMPTY ), field.name))
561- val setter = DefDef (Modifiers (ACCESSOR ), name + " _=" , Nil , List (List (ValDef (NoMods , TermName (" x" ), TypeTree (tpt), EmptyTree ))), TypeTree (definitions.UnitTpe ), Assign (Select (This (tpnme .EMPTY ), field.name), Ident (TermName (" x" ))))
560+ val getter = DefDef (Modifiers (ACCESSOR | STABLE ), name, Nil , Nil , TypeTree (tpt), Select (This (typeNames .EMPTY ), field.name))
561+ val setter = DefDef (Modifiers (ACCESSOR ), name + " _=" , Nil , List (List (ValDef (NoMods , TermName (" x" ), TypeTree (tpt), EmptyTree ))), TypeTree (definitions.UnitTpe ), Assign (Select (This (typeNames .EMPTY ), field.name), Ident (TermName (" x" ))))
562562 field :: getter :: setter :: Nil
563563 } else {
564564 val result = ValDef (NoMods , name, TypeTree (tpt), init)
0 commit comments