- Removed True & False from Predef

- Updated all scala files to use true & false

9 files changed, 28 insertions, 31 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;
   }
 }