summaryrefslogtreecommitdiff
path: root/sources/examples/maps.scala
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-03-18 12:36:03 +0000
committerpaltherr <paltherr@epfl.ch>2003-03-18 12:36:03 +0000
commitc6ce203b92ccbeebdc8af5016e544768cb059937 (patch)
tree7af0eb240d1853bc4e9dce7d2df0073518bd68ec /sources/examples/maps.scala
parent611eb370fa5ef8508ce27ffc27fe441b37fbb54a (diff)
downloadscala-c6ce203b92ccbeebdc8af5016e544768cb059937.tar.gz
scala-c6ce203b92ccbeebdc8af5016e544768cb059937.tar.bz2
scala-c6ce203b92ccbeebdc8af5016e544768cb059937.zip
- Fixed some minor errors
Diffstat (limited to 'sources/examples/maps.scala')
-rw-r--r--sources/examples/maps.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/examples/maps.scala b/sources/examples/maps.scala
index bcd73e0066..2f9471d2dd 100644
--- a/sources/examples/maps.scala
+++ b/sources/examples/maps.scala
@@ -1,7 +1,7 @@
module maps {
trait MapStruct[kt, vt] {
- trait Map extends Function1[kt, vt] with {
+ trait Map with Function1[kt, vt] {
def extend(key: kt, value: vt): Map;
def remove(key: kt): Map;
def domain: Stream[kt];
@@ -65,7 +65,7 @@ module maps {
class OOBinTree[kt <: Ord[kt], vt <: AnyRef]() extends MapStruct[kt, vt] {
type map = OOMap;
- trait OOMap extends Map with {
+ trait OOMap extends Map {
def apply(key: kt): vt;
def extend(key: kt, value: vt): map;
def remove(key: kt): map;
@@ -79,7 +79,7 @@ module maps {
def domain: Stream[kt] = Stream.empty;
def range: Stream[vt] = Stream.empty;
}
- private class Node(k: kt, v: vt, l: map, r: map) extends OOMap with {
+ private class Node(k: kt, v: vt, l: map, r: map) extends OOMap {
def apply(key: kt): vt =
if (key < k) l.apply(key)
else if (key > k) r.apply(key)
@@ -104,7 +104,7 @@ module maps {
class MutBinTree[kt <: Ord[kt], vt <: AnyRef]() extends MapStruct[kt, vt] {
type map = MutMap;
- class MutMap(key: kt, value: vt) extends Map with {
+ class MutMap(key: kt, value: vt) extends Map {
val k = key;
var v = value;
var l = empty, r = empty;