summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-03-31 17:30:26 +0000
committermichelou <michelou@epfl.ch>2006-03-31 17:30:26 +0000
commit315ba402be1881e1c5ec812ffb14aa42c254e167 (patch)
tree13bf02be6ced91596bfcb37e320b3806a9611e72 /src
parentb178e4658b3066b3f2cb2210bc57af9e8de71868 (diff)
downloadscala-315ba402be1881e1c5ec812ffb14aa42c254e167.tar.gz
scala-315ba402be1881e1c5ec812ffb14aa42c254e167.tar.bz2
scala-315ba402be1881e1c5ec812ffb14aa42c254e167.zip
added more functionality to test/clitest
corrected bug in file scala/concurrent/pilib.scala
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/concurrent/pilib.scala6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/library/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala
index 9d8611383d..19cc8f836e 100644
--- a/src/library/scala/concurrent/pilib.scala
+++ b/src/library/scala/concurrent/pilib.scala
@@ -9,7 +9,7 @@
// $Id$
-package scala.concurrent;
+package scala.concurrent
/**
@@ -181,11 +181,9 @@ object pilib {
/** Pi-calculus non-deterministic choice. */
def choice[a](s: GP[a]*): a = {
- val sum = Sum(s.asInstanceOf[List[GP[a]]] map { x => x.untyped });
+ val sum = Sum(s.toList map { x => x.untyped });
synchronized { sums = compare(sum, sums) };
(sum.continue).asInstanceOf[a]
}
-
}
-