summaryrefslogtreecommitdiff
path: root/docs/examples/sort.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-02-22 17:54:31 +0000
committermichelou <michelou@epfl.ch>2006-02-22 17:54:31 +0000
commit96ae92e4f6f830a9a4e55768c3de0328a2a030ba (patch)
tree0b84d247c1693bf186787aaa8f0c75d89fea9be3 /docs/examples/sort.scala
parentc1e184a3657d970a8fba6e3c7049f20a2e466bf0 (diff)
downloadscala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.tar.gz
scala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.tar.bz2
scala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.zip
adapted code to Scala 2 syntax in files src/exa...
adapted code to Scala 2 syntax in files src/examples/**/*.scala
Diffstat (limited to 'docs/examples/sort.scala')
-rw-r--r--docs/examples/sort.scala32
1 files changed, 16 insertions, 16 deletions
diff --git a/docs/examples/sort.scala b/docs/examples/sort.scala
index 6554a2415b..cc06f19366 100644
--- a/docs/examples/sort.scala
+++ b/docs/examples/sort.scala
@@ -1,47 +1,47 @@
-package examples;
+package examples
object sort {
def sort(a: Array[Int]): Unit = {
def swap(i: Int, j: Int): Unit = {
- val t = a(i); a(i) = a(j); a(j) = t;
+ val t = a(i); a(i) = a(j); a(j) = t
}
def sort1(l: Int, r: Int): Unit = {
- val pivot = a((l + r) / 2);
- var i = l;
- var j = r;
+ val pivot = a((l + r) / 2)
+ var i = l
+ var j = r
while (i <= j) {
while (a(i) < pivot) { i = i + 1 }
while (a(j) > pivot) { j = j - 1 }
if (i <= j) {
- swap(i, j);
- i = i + 1;
- j = j - 1;
+ swap(i, j)
+ i = i + 1
+ j = j - 1
}
}
- if (l < j) sort1(l, j);
- if (j < r) sort1(i, r);
+ if (l < j) sort1(l, j)
+ if (j < r) sort1(i, r)
}
if (a.length > 0)
- sort1(0, a.length - 1);
+ sort1(0, a.length - 1)
}
def println(ar: Array[Int]) = {
def print1 = {
def iter(i: Int): String =
- ar(i) + (if (i < ar.length-1) "," + iter(i+1) else "");
+ ar(i) + (if (i < ar.length-1) "," + iter(i+1) else "")
if (ar.length == 0) "" else iter(0)
}
Console.println("[" + print1 + "]")
}
- def main(args: Array[String]) = {
- val ar = Array(6, 2, 8, 5, 1);
- println(ar);
- sort(ar);
+ def main(args: Array[String]): Unit = {
+ val ar = Array(6, 2, 8, 5, 1)
+ println(ar)
+ sort(ar)
println(ar)
}