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 | |
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
-rw-r--r-- | sources/scala/Iterator.scala | 14 | ||||
-rw-r--r-- | sources/scala/Nil.scala | 2 | ||||
-rw-r--r-- | sources/scala/None.scala | 4 | ||||
-rw-r--r-- | sources/scala/Predef.scala | 3 | ||||
-rw-r--r-- | sources/scala/Some.scala | 4 | ||||
-rw-r--r-- | sources/scala/Stream.scala | 8 | ||||
-rw-r--r-- | sources/scala/concurrent/Lock.scala | 6 | ||||
-rw-r--r-- | sources/scala/concurrent/SyncChannel.scala | 12 | ||||
-rw-r--r-- | sources/scala/concurrent/SyncVar.scala | 6 | ||||
-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 | ||||
-rw-r--r-- | test/pos/List1.scala | 8 |
14 files changed, 60 insertions, 63 deletions
diff --git a/sources/scala/Iterator.scala b/sources/scala/Iterator.scala index 9507722e14..89c6507e66 100644 --- a/sources/scala/Iterator.scala +++ b/sources/scala/Iterator.scala @@ -15,9 +15,9 @@ trait Iterator[a] { def flatMap[b](f: a => Iterator[b]): Iterator[b] = new Iterator[b] { private var cur: Iterator[b] = Iterator.empty; def hasNext: Boolean = - if (cur.hasNext) True + if (cur.hasNext) true else if (Iterator.this.hasNext) { cur = f(Iterator.this.next); hasNext } - else False; + else false; def next: b = if (cur.hasNext) cur.next else if (Iterator.this.hasNext) { cur = f(Iterator.this.next); next } @@ -44,13 +44,13 @@ trait Iterator[a] { def buffered: BufferedIterator[a] = new BufferedIterator[a] { private var hd: a = _; - private var ahead: Boolean = False; + private var ahead: Boolean = false; def head: a = { - if (!ahead) { hd = Iterator.this.next; ahead = True } + if (!ahead) { hd = Iterator.this.next; ahead = true } hd } def next: a = - if (ahead) { ahead = False; hd } + if (ahead) { ahead = false; hd } else head; def hasNext: Boolean = ahead || Iterator.this.hasNext; @@ -61,7 +61,7 @@ trait Iterator[a] { module Iterator { def empty[a] = new Iterator[a] { - def hasNext = False; + def hasNext = false; def next: a = error("next on empty iterator"); } @@ -86,7 +86,7 @@ module Iterator { def from(lo: Int) = new Iterator[Int] { private var i = 0; def hasNext: Boolean = - True; + true; def next: Int = { i = i + 1 ; i - 1 } } diff --git a/sources/scala/Nil.scala b/sources/scala/Nil.scala index 0cc1660f02..d6d67433f8 100644 --- a/sources/scala/Nil.scala +++ b/sources/scala/Nil.scala @@ -4,7 +4,7 @@ package scala { * for <code>Nil</code>. */ final case class Nil[c]() extends List[c] { - def isEmpty = True; + def isEmpty = true; def head: c = error("head of empty list"); def tail: List[c] = error("tail of empty list"); override def toString(): String = "[]"; diff --git a/sources/scala/None.scala b/sources/scala/None.scala index 2b935619b8..7563dae231 100644 --- a/sources/scala/None.scala +++ b/sources/scala/None.scala @@ -1,6 +1,6 @@ package scala { final case class None[b]() extends Option[b] { - def isNone = True; + def isNone = true; def get: b = error("None does not have an element."); } -}
\ No newline at end of file +} diff --git a/sources/scala/Predef.scala b/sources/scala/Predef.scala index e93841f6c1..62561fab89 100644 --- a/sources/scala/Predef.scala +++ b/sources/scala/Predef.scala @@ -12,9 +12,6 @@ module Predef { type boolean = scala.Boolean; type unit = scala.Unit; - val True = Boolean.True; - val False = Boolean.False; - def List[a](x: a*): List[a] = x as List[a]; val List = scala.List; diff --git a/sources/scala/Some.scala b/sources/scala/Some.scala index bb7f9e4723..84d9a529fa 100644 --- a/sources/scala/Some.scala +++ b/sources/scala/Some.scala @@ -1,6 +1,6 @@ package scala { final case class Some[c](x: c) extends Option[c] { - def isNone = False; + def isNone = false; def get: c = x; } -}
\ No newline at end of file +} diff --git a/sources/scala/Stream.scala b/sources/scala/Stream.scala index bb82cbb6d2..701499a487 100644 --- a/sources/scala/Stream.scala +++ b/sources/scala/Stream.scala @@ -119,19 +119,19 @@ trait Stream[a] { module Stream { def empty[c]: Stream[c] = new Stream[c] { - def isEmpty = True; + def isEmpty = true; def head: c = error("head of empty stream"); def tail: Stream[c] = error("tail of empty stream"); override def toString(): String = "Stream.empty"; } def cons[b](hd: b, def tl: Stream[b]): Stream[b] = new Stream[b] { - def isEmpty = False; + def isEmpty = false; def head = hd; private var tlVal: Stream[b] = _; - private var tlDefined: Boolean = False; + private var tlDefined: Boolean = false; def tail: Stream[b] = { - if (!tlDefined) { tlVal = tl; tlDefined = True; } + if (!tlDefined) { tlVal = tl; tlDefined = true; } tlVal } override def toString(): String = "ConsStream(" + hd + ", ?)"; diff --git a/sources/scala/concurrent/Lock.scala b/sources/scala/concurrent/Lock.scala index 87d677085c..9581151ea7 100644 --- a/sources/scala/concurrent/Lock.scala +++ b/sources/scala/concurrent/Lock.scala @@ -1,13 +1,13 @@ package scala.concurrent; class Lock() extends Monitor() { - var available = True; + var available = true; def acquire = { if (!available) wait(); - available = False + available = false } def release = { - available = True; + available = true; notify() } } diff --git a/sources/scala/concurrent/SyncChannel.scala b/sources/scala/concurrent/SyncChannel.scala index 5aec23da1f..7184ff7c61 100644 --- a/sources/scala/concurrent/SyncChannel.scala +++ b/sources/scala/concurrent/SyncChannel.scala @@ -2,24 +2,24 @@ package scala.concurrent; class SyncChannel[a]() extends Monitor() { private var data: a = _; - private var reading = False; - private var writing = False; + private var reading = false; + private var writing = false; def write(x: a) = synchronized { await(!writing); data = x; - writing = True; + writing = true; if (reading) notifyAll(); else await(reading) } def read: a = synchronized { await(!reading); - reading = True; + reading = true; await(writing); val x = data; - writing = False; - reading = False; + writing = false; + reading = false; notifyAll(); x } diff --git a/sources/scala/concurrent/SyncVar.scala b/sources/scala/concurrent/SyncVar.scala index 7f389318a1..4bb550be30 100644 --- a/sources/scala/concurrent/SyncVar.scala +++ b/sources/scala/concurrent/SyncVar.scala @@ -1,19 +1,19 @@ package scala.concurrent; class SyncVar[a]() extends Monitor() { - private var isDefined: Boolean = False; + private var isDefined: Boolean = false; private var value: a = _; def get = synchronized { if (!isDefined) wait(); value } def set(x: a) = synchronized { - value = x ; isDefined = True ; notifyAll(); + value = x ; isDefined = true ; notifyAll(); } def isSet: Boolean = isDefined; def unset = synchronized { - isDefined = False; + isDefined = false; } } 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 { diff --git a/test/pos/List1.scala b/test/pos/List1.scala index a6d4e78f8c..fcc506bccc 100644 --- a/test/pos/List1.scala +++ b/test/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 +} |