diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-01-15 16:58:28 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-01-15 16:58:28 +0000 |
commit | 3e1241caeca9af5b05922d38bed1b0480e6da56d (patch) | |
tree | 56ab1c1e104498ce49ef57c86dd453143955b48d /src/scalap | |
parent | b0e6451e78740747da641d3c4b7f524f102810f9 (diff) | |
download | scala-3e1241caeca9af5b05922d38bed1b0480e6da56d.tar.gz scala-3e1241caeca9af5b05922d38bed1b0480e6da56d.tar.bz2 scala-3e1241caeca9af5b05922d38bed1b0480e6da56d.zip |
Reverted over-zealous replacement of 'PartialFu...
Reverted over-zealous replacement of 'PartialFunction' with '=>?'.
Diffstat (limited to 'src/scalap')
-rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/Rule.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala index f65c688aa7..1500b81050 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala @@ -56,9 +56,9 @@ trait Rule[-In, +Out, +A, +X] extends (In => Result[Out, A, X]) { def ^^[B](fa2b : A => B) = map(fa2b) - def ^^?[B](pf : A =>? B) = filter (pf.isDefinedAt(_)) ^^ pf + def ^^?[B](pf : PartialFunction[A, B]) = filter (pf.isDefinedAt(_)) ^^ pf - def ??(pf : A =>? Any) = filter (pf.isDefinedAt(_)) + def ??(pf : PartialFunction[A, Any]) = filter (pf.isDefinedAt(_)) def -^[B](b : B) = map { any => b } @@ -73,7 +73,7 @@ trait Rule[-In, +Out, +A, +X] extends (In => Result[Out, A, X]) { def >->[Out2, B, X2 >: X](fa2resultb : A => Result[Out2, B, X2]) = flatMap { a => any => fa2resultb(a) } - def >>?[Out2, B, X2 >: X](pf : A =>? Rule[Out, Out2, B, X2]) = filter(pf isDefinedAt _) flatMap pf + def >>?[Out2, B, X2 >: X](pf : PartialFunction[A, Rule[Out, Out2, B, X2]]) = filter(pf isDefinedAt _) flatMap pf def >>&[B, X2 >: X](fa2ruleb : A => Out => Result[Any, B, X2]) = flatMap { a => out => fa2ruleb(a)(out) mapOut { any => out } } |