diff options
author | Martin Odersky <odersky@gmail.com> | 2003-11-18 15:58:29 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2003-11-18 15:58:29 +0000 |
commit | 34806cbc476135ae4c42402c26eea9c897e108fe (patch) | |
tree | 2c7eee812dd2ae2b079f85891f7f9b92f1d1671f /test/files/run | |
parent | 5fb655da1e4efa67f2b2fccdf87a45c0d88090e7 (diff) | |
download | scala-34806cbc476135ae4c42402c26eea9c897e108fe.tar.gz scala-34806cbc476135ae4c42402c26eea9c897e108fe.tar.bz2 scala-34806cbc476135ae4c42402c26eea9c897e108fe.zip |
*** empty log message ***
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/Course-2002-08.scala | 6 | ||||
-rw-r--r-- | test/files/run/Course-2002-09.scala | 4 | ||||
-rw-r--r-- | test/files/run/Course-2002-13.scala | 2 | ||||
-rw-r--r-- | test/files/run/lisp.scala | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/test/files/run/Course-2002-08.scala b/test/files/run/Course-2002-08.scala index f94b42ebc0..86b8c4f559 100644 --- a/test/files/run/Course-2002-08.scala +++ b/test/files/run/Course-2002-08.scala @@ -136,7 +136,7 @@ object M3 { object M4 { def test = { - for (val i <- range(1, 4)) do { System.out.print(i + " ") }; + for (val i <- range(1, 4)) { System.out.print(i + " ") }; System.out.println(); System.out.println(for (val i <- range(1, 4)) yield i); System.out.println(); @@ -561,8 +561,8 @@ class Main() extends CircuitSimulator() { demux(in, ctrl.reverse, out.reverse); probe("in", in); - for (val Pair(x,c) <- range(0,n) zip ctrl) do { probe("ctrl" + x, c) } - for (val Pair(x,o) <- range(0,outNum) zip out) do { probe("out" + x, o) } + for (val Pair(x,c) <- range(0,n) zip ctrl) { probe("ctrl" + x, c) } + for (val Pair(x,o) <- range(0,outNum) zip out) { probe("out" + x, o) } in.setSignal(true); run; diff --git a/test/files/run/Course-2002-09.scala b/test/files/run/Course-2002-09.scala index 4238402263..b984fbf9d2 100644 --- a/test/files/run/Course-2002-09.scala +++ b/test/files/run/Course-2002-09.scala @@ -108,7 +108,7 @@ class Quantity() { if (v != v1) error("Error! contradiction: " + v + " and " + v1); case None() => informant = setter; value = Some(v); - for (val c <- constraints; !(c == informant)) do { + for (val c <- constraints; !(c == informant)) { c.newValue; } } @@ -117,7 +117,7 @@ class Quantity() { def forgetValue(retractor: Constraint): Unit = { if (retractor == informant) { value = None(); - for (val c <- constraints; !(c == informant)) do c.dropValue; + for (val c <- constraints; !(c == informant)) c.dropValue; } } def forgetValue: Unit = forgetValue(NoConstraint); diff --git a/test/files/run/Course-2002-13.scala b/test/files/run/Course-2002-13.scala index 541008bb1b..3a6b7c8718 100644 --- a/test/files/run/Course-2002-13.scala +++ b/test/files/run/Course-2002-13.scala @@ -166,7 +166,7 @@ object Programs { (lhs.tyvars ::: (rhs flatMap (t => t.tyvars))).removeDuplicates; def newInstance = { var s: Subst = List(); - for (val a <- tyvars) do { s = Binding(a, newVar(a)) :: s } + for (val a <- tyvars) { s = Binding(a, newVar(a)) :: s } Clause(lhs map s, rhs map (t => t map s)) } override def toString() = diff --git a/test/files/run/lisp.scala b/test/files/run/lisp.scala index 2eb58528ab..847a112fe0 100644 --- a/test/files/run/lisp.scala +++ b/test/files/run/lisp.scala @@ -148,14 +148,14 @@ object LispCaseClasses with Lisp { val prevexp = curexp; curexp = x; if (trace) { - for (val x <- range(1, indent)) do System.out.print(" "); + for (val x <- range(1, indent)) System.out.print(" "); System.out.println("===> " + x); indent = indent + 1; } val result = eval1(x, env); if (trace) { indent = indent - 1; - for (val x <- range(1, indent)) do System.out.print(" "); + for (val x <- range(1, indent)) System.out.print(" "); System.out.println("<=== " + result); } curexp = prevexp; @@ -329,14 +329,14 @@ object LispAny with Lisp { val prevexp = curexp; curexp = x; if (trace) { - for (val x <- range(1, indent)) do System.out.print(" "); + for (val x <- range(1, indent)) System.out.print(" "); System.out.println("===> " + x); indent = indent + 1; } val result = eval1(x, env); if (trace) { indent = indent - 1; - for (val x <- range(1, indent)) do System.out.print(" "); + for (val x <- range(1, indent)) System.out.print(" "); System.out.println("<=== " + result); } curexp = prevexp; |