diff options
author | paltherr <paltherr@epfl.ch> | 2003-03-18 13:14:45 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-03-18 13:14:45 +0000 |
commit | 374fe5428200c92a0636a0266d112b60af16e9cf (patch) | |
tree | 20868b2689b9783e6111ebb927747448399cdd90 /test/files | |
parent | 890f4fc1b3bb8083b1003d37860bb8262f7a846e (diff) | |
download | scala-374fe5428200c92a0636a0266d112b60af16e9cf.tar.gz scala-374fe5428200c92a0636a0266d112b60af16e9cf.tar.bz2 scala-374fe5428200c92a0636a0266d112b60af16e9cf.zip |
- Removed True & False from Predef
- Updated all scala files to use true & false
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/pos/List1.scala | 8 | ||||
-rw-r--r-- | test/files/run/Course-2002-03.scala | 8 | ||||
-rw-r--r-- | test/files/run/Course-2002-08.scala | 34 | ||||
-rw-r--r-- | test/files/run/Course-2002-11.scala | 6 |
4 files changed, 28 insertions, 28 deletions
diff --git a/test/files/pos/List1.scala b/test/files/pos/List1.scala index a6d4e78f8c..fcc506bccc 100644 --- a/test/files/pos/List1.scala +++ b/test/files/pos/List1.scala @@ -8,13 +8,13 @@ module lists { } def Nil[a] = new List[a] { - def isEmpty: Boolean = True; + def isEmpty: Boolean = true; def head = error[a]("head of Nil"); def tail = error[List[a]]("tail of Nil"); } def Cons[a](x: a, xs: List[a]): List[a] = new List[a] { - def isEmpty = Boolean.False; + def isEmpty = false; def head = x; def tail = xs; } @@ -30,7 +30,7 @@ module lists { } class IntList() extends List[Int] { - def isEmpty: Boolean = False; + def isEmpty: Boolean = false; def head: Int = 1; def foo: List[Int] { def isEmpty: Boolean; def head: Int; def tail: List[Int] } = Nil[Int]; def tail0: List[Int] = foo.prepend(1).prepend(1+1); @@ -42,4 +42,4 @@ module lists { val il2 = il1.prepend(1).prepend(2); () } -}
\ No newline at end of file +} diff --git a/test/files/run/Course-2002-03.scala b/test/files/run/Course-2002-03.scala index 89b35aeb10..86f5453111 100644 --- a/test/files/run/Course-2002-03.scala +++ b/test/files/run/Course-2002-03.scala @@ -154,7 +154,7 @@ module M5 { } class Empty() extends IntSet { - def contains(x: Int): Boolean = False; + def contains(x: Int): Boolean = false; def incl(x: Int): IntSet = new NonEmpty(x, new Empty(), new Empty()); } @@ -162,7 +162,7 @@ module M5 { def contains(x: Int): Boolean = if (x < elem) left contains x else if (x > elem) right contains x - else True; + else true; def incl(x: Int): IntSet = if (x < elem) new NonEmpty(elem, left incl x, right) else if (x > elem) new NonEmpty(elem, left, right incl x) @@ -245,7 +245,7 @@ module M8 { } class Empty() extends IntSet { // !!! class Empty() -> module Empty - def contains(x: Int): Boolean = False; + def contains(x: Int): Boolean = false; def incl(x: Int): IntSet = new NonEmpty(x, new Empty(), new Empty()); def map(f: Int => Int): IntSet = this; @@ -258,7 +258,7 @@ module M8 { def contains(x: Int): Boolean = if (x < elem) left contains x else if (x > elem) right contains x - else True; + else true; def incl(x: Int): IntSet = if (x < elem) new NonEmpty(elem, left incl x, right) diff --git a/test/files/run/Course-2002-08.scala b/test/files/run/Course-2002-08.scala index 2e1cb37758..9cb2bb8701 100644 --- a/test/files/run/Course-2002-08.scala +++ b/test/files/run/Course-2002-08.scala @@ -150,7 +150,7 @@ module M5 { type Action = () => Unit; class Wire() { - private var sigVal = False; + private var sigVal = false; private var actions: List[Action] = List(); def getSignal = sigVal; def setSignal(s: Boolean) = @@ -272,7 +272,7 @@ module M5 { def result = if (cout.getSignal) 1 else 0; def test(a: Int) = { - ain setSignal (if (a == 0) False else True); + ain setSignal (if (a == 0) false else true); run; System.out.println("!" + a + " = " + result); System.out.println(); @@ -293,8 +293,8 @@ module M5 { def result = if (cout.getSignal) 1 else 0; def test(a: Int, b: Int) = { - ain setSignal (if (a == 0) False else True); - bin setSignal (if (b == 0) False else True); + ain setSignal (if (a == 0) false else true); + bin setSignal (if (b == 0) false else true); run; System.out.println(a + " & " + b + " = " + result); System.out.println(); @@ -318,8 +318,8 @@ module M5 { def result = if (cout.getSignal) 1 else 0; def test(a: Int, b: Int) = { - ain setSignal (if (a == 0) False else True); - bin setSignal (if (b == 0) False else True); + ain setSignal (if (a == 0) false else true); + bin setSignal (if (b == 0) false else true); run; System.out.println(a + " | " + b + " = " + result); System.out.println(); @@ -346,8 +346,8 @@ module M5 { (if (cout.getSignal) 2 else 0); def test(a: Int, b: Int) = { - ain setSignal (if (a == 0) False else True); - bin setSignal (if (b == 0) False else True); + ain setSignal (if (a == 0) false else true); + bin setSignal (if (b == 0) false else true); run; System.out.println(a + " + " + b + " = " + result); System.out.println(); @@ -376,9 +376,9 @@ module M5 { (if (cout.getSignal) 2 else 0); def test(a: Int, b: Int, c: Int) = { - ain setSignal (if (a == 0) False else True); - bin setSignal (if (b == 0) False else True); - cin setSignal (if (c == 0) False else True); + ain setSignal (if (a == 0) false else true); + bin setSignal (if (b == 0) false else true); + cin setSignal (if (c == 0) false else true); run; System.out.println(a + " + " + b + " + " + c + " = " + result); System.out.println(); @@ -448,7 +448,7 @@ class Simulator() { } class Wire() { - private var sigVal = False; + private var sigVal = false; private var actions: List[() => Unit] = List(); def getSignal = sigVal; def setSignal(s: Boolean) = @@ -564,15 +564,15 @@ class Main() extends CircuitSimulator() { 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) } - in.setSignal(True); + in.setSignal(true); run; - ctrl.at(0).setSignal(True); + ctrl.at(0).setSignal(true); run; - ctrl.at(1).setSignal(True); + ctrl.at(1).setSignal(true); run; - ctrl.at(2).setSignal(True); + ctrl.at(2).setSignal(true); run; - ctrl.at(0).setSignal(False); + ctrl.at(0).setSignal(false); run; } } diff --git a/test/files/run/Course-2002-11.scala b/test/files/run/Course-2002-11.scala index dca2e52c32..5a257234c4 100644 --- a/test/files/run/Course-2002-11.scala +++ b/test/files/run/Course-2002-11.scala @@ -61,7 +61,7 @@ module Lisp { CONS(x0, list(x1, x2, x3, x4, x5, x6, x7, x8, x9)); var curexp: Data = null; - var trace: Boolean = False; + var trace: Boolean = false; var indent: Int = 0; def lispError[a](msg: String): a = @@ -87,8 +87,8 @@ module Lisp { } def toBoolean(x: Data) = x match { - case NUM(0) => False - case _ => True + case NUM(0) => false + case _ => true } def normalize(x: Data): Data = x match { |