diff options
Diffstat (limited to 'src/continuations/plugin')
| -rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala | 16 | ||||
| -rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala index 6f5284f75f..3a1dc87a6a 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala @@ -29,14 +29,14 @@ trait CPSUtils { val shiftUnitR = newTermName("shiftUnitR") } - lazy val MarkerCPSSym = definitions.getRequiredClass("scala.util.continuations.cpsSym") - lazy val MarkerCPSTypes = definitions.getRequiredClass("scala.util.continuations.cpsParam") - lazy val MarkerCPSSynth = definitions.getRequiredClass("scala.util.continuations.cpsSynth") - lazy val MarkerCPSAdaptPlus = definitions.getRequiredClass("scala.util.continuations.cpsPlus") - lazy val MarkerCPSAdaptMinus = definitions.getRequiredClass("scala.util.continuations.cpsMinus") - - lazy val Context = definitions.getRequiredClass("scala.util.continuations.ControlContext") - lazy val ModCPS = definitions.getRequiredModule("scala.util.continuations") + lazy val MarkerCPSSym = rootMirror.getRequiredClass("scala.util.continuations.cpsSym") + lazy val MarkerCPSTypes = rootMirror.getRequiredClass("scala.util.continuations.cpsParam") + lazy val MarkerCPSSynth = rootMirror.getRequiredClass("scala.util.continuations.cpsSynth") + lazy val MarkerCPSAdaptPlus = rootMirror.getRequiredClass("scala.util.continuations.cpsPlus") + lazy val MarkerCPSAdaptMinus = rootMirror.getRequiredClass("scala.util.continuations.cpsMinus") + + lazy val Context = rootMirror.getRequiredClass("scala.util.continuations.ControlContext") + lazy val ModCPS = rootMirror.getRequiredModule("scala.util.continuations") lazy val MethShiftUnit = definitions.getMember(ModCPS, cpsNames.shiftUnit) lazy val MethShiftUnit0 = definitions.getMember(ModCPS, cpsNames.shiftUnit0) diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala index dcb7cd601f..54a0079f40 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala @@ -347,7 +347,7 @@ abstract class SelectiveCPSTransform extends PluginComponent with // val <lhs> = ctx.getTrivialValue; ... <--- TODO: try/catch ??? don't bother for the moment... // else // ctx.flatMap { <lhs> => ... } - val ctxSym = currentOwner.newValue(vd.symbol.name append cpsNames.shiftSuffix).setInfo(rhs1.tpe) + val ctxSym = currentOwner.newValue(newTermName("" + vd.symbol.name + cpsNames.shiftSuffix)).setInfo(rhs1.tpe) val ctxDef = localTyper.typed(ValDef(ctxSym, rhs1)) def ctxRef = localTyper.typed(Ident(ctxSym)) val argSym = currentOwner.newValue(vd.symbol.name).setInfo(tpe) |