summaryrefslogtreecommitdiff
path: root/test/files/run/Course-2002-08.scala
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-03-18 13:14:45 +0000
committerpaltherr <paltherr@epfl.ch>2003-03-18 13:14:45 +0000
commit374fe5428200c92a0636a0266d112b60af16e9cf (patch)
tree20868b2689b9783e6111ebb927747448399cdd90 /test/files/run/Course-2002-08.scala
parent890f4fc1b3bb8083b1003d37860bb8262f7a846e (diff)
downloadscala-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/run/Course-2002-08.scala')
-rw-r--r--test/files/run/Course-2002-08.scala34
1 files changed, 17 insertions, 17 deletions
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;
}
}