diff options
| author | Paul Phillips <paulp@improving.org> | 2010-11-04 00:07:36 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-11-04 00:07:36 +0000 |
| commit | 379af580e2c8cf0ce5309fc0b31702f79e415abe (patch) | |
| tree | cf741eb0d27624d6130bb5bc7f403ec7fb05af1d /src/continuations | |
| parent | de012b3a6d04f1e7a9fd6fecd403e0492f6ad7c1 (diff) | |
| download | scala-379af580e2c8cf0ce5309fc0b31702f79e415abe.tar.gz scala-379af580e2c8cf0ce5309fc0b31702f79e415abe.tar.bz2 scala-379af580e2c8cf0ce5309fc0b31702f79e415abe.zip | |
Determined that half a dozen ways of checking f...
Determined that half a dozen ways of checking for varargs and
by-name-ness in param lists exceeded the legal limit. Also assessed that
names which are only used as type names would be a lot easier to deal
with if we created them as type names up front. Performed the changes
implied by the preceding along with a partial cleanup on TreeInfo which
one can see hasn't had a good look in a long time. (And still hasn't.)
No review.
Diffstat (limited to 'src/continuations')
| -rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala | 2 | ||||
| -rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala index b9afcda3ec..e916f7c916 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala @@ -303,7 +303,7 @@ abstract class CPSAnnotationChecker extends CPSUtils { for ((a,tp) <- args.zip(formals ::: List.fill(overshoot)(NoType))) yield { tp match { - case TypeRef(_, sym, List(elemtp)) if sym == ByNameParamClass => + case TypeRef(_, ByNameParamClass, List(elemtp)) => Nil // TODO: check conformance?? case _ => List(a) diff --git a/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala b/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala index 936b572caf..3eb4b70ad1 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala @@ -147,7 +147,7 @@ abstract class SelectiveANFTransform extends PluginComponent with Transform with val (stm,expr) = (for ((a,tp) <- args.zip(formals ::: List.fill(overshoot)(NoType))) yield { tp match { - case TypeRef(_, sym, List(elemtp)) if sym == ByNameParamClass => + case TypeRef(_, ByNameParamClass, List(elemtp)) => (Nil, transExpr(a, None, getAnswerTypeAnn(elemtp))) case _ => val (valStm, valExpr, valSpc) = transInlineValue(a, spc) |