diff options
-rw-r--r-- | sources/examples/boundedbuffer.scala | 2 | ||||
-rw-r--r-- | sources/examples/maps.scala | 8 | ||||
-rw-r--r-- | sources/examples/sort.scala | 3 | ||||
-rw-r--r-- | sources/examples/typeinf.scala | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/sources/examples/boundedbuffer.scala b/sources/examples/boundedbuffer.scala index 06ecec9d9a..e4271e7662 100644 --- a/sources/examples/boundedbuffer.scala +++ b/sources/examples/boundedbuffer.scala @@ -5,7 +5,7 @@ object boundedbuffer { import concurrent.ops._; class BoundedBuffer[a](N: Int) { - var in = 0, out = 0, n = 0; + var in, out, n = 0; val elems = new Array[a](N); def await(def cond: Boolean) = while (!cond) { wait() } diff --git a/sources/examples/maps.scala b/sources/examples/maps.scala index a5b2348f95..0defd89a81 100644 --- a/sources/examples/maps.scala +++ b/sources/examples/maps.scala @@ -21,7 +21,7 @@ object maps { val empty: AlgMap = Empty(); private case class - Empty() extends AlgMap {}, + Empty(), Node(key: kt, value: vt, l: map, r: map) extends AlgMap {} trait AlgMap extends Map { @@ -111,7 +111,7 @@ object maps { class MutMap(key: kt, value: vt) extends Map { val k = key; var v = value; - var l = empty, r = empty; + var l, r = empty; def apply(key: kt): vt = if (this == empty) null @@ -152,7 +152,9 @@ object maps { } class Date(y: Int, m: Int, d: Int) with Ord[Date] { - def year = y, month = m, day = d; + def year = y; + def month = m; + def day = d; def <(that: Date): Boolean = { (year < that.year) || diff --git a/sources/examples/sort.scala b/sources/examples/sort.scala index 38a9755774..c6450eec54 100644 --- a/sources/examples/sort.scala +++ b/sources/examples/sort.scala @@ -10,7 +10,8 @@ object sorter { def sort1(l: Int, r: Int): Unit = { val pivot = a((l + r) / 2); - var i = l, j = r; + var i = l; + var j = r; while (i <= j) { while (a(i) < pivot) { i = i + 1 } while (a(j) > pivot) { j = j - 1 } diff --git a/sources/examples/typeinf.scala b/sources/examples/typeinf.scala index 77976be656..d55e2f7c8d 100644 --- a/sources/examples/typeinf.scala +++ b/sources/examples/typeinf.scala @@ -98,7 +98,7 @@ object typeInfer { else mgu(u.newInstance, t, s) case Lam(x, e1) => - val a = newTyvar(), b = newTyvar(); + val a, b = newTyvar(); val s1 = mgu(t, Arrow(a, b), s); val env1 = Pair(x, TypeScheme(List(), a)) :: env; tp(env1, e1, b, s1) |