summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorstenman <stenman@epfl.ch>2004-01-09 11:51:26 +0000
committerstenman <stenman@epfl.ch>2004-01-09 11:51:26 +0000
commit57bf1138b8fdaafc9c4ea1e883aba222ec8117cc (patch)
treea4a8109e13061c990131800b62f4516904e6bf17 /sources
parent64c98ed1390f50c333a3cabdd02003ce7feb74c3 (diff)
downloadscala-57bf1138b8fdaafc9c4ea1e883aba222ec8117cc.tar.gz
scala-57bf1138b8fdaafc9c4ea1e883aba222ec8117cc.tar.bz2
scala-57bf1138b8fdaafc9c4ea1e883aba222ec8117cc.zip
Bugfix: Delete was incorrect - fixed now.
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/collection/immutable/Tree.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/scala/collection/immutable/Tree.scala b/sources/scala/collection/immutable/Tree.scala
index 42c41bb813..8f65a2f0b7 100644
--- a/sources/scala/collection/immutable/Tree.scala
+++ b/sources/scala/collection/immutable/Tree.scala
@@ -202,8 +202,8 @@ abstract class Tree[KEY,Entry](order:Order[KEY]) {
def count = Info(1,0);
def is_defined(key:KEY) = false;
def get(_key:KEY) = None;
- def apply(key:KEY) = error("key " + key + "not found");
- def update(key:KEY, value:Entry) = error("key " + key + "not found");
+ def apply(key:KEY) = error("key " + key + " not found");
+ def update(key:KEY, value:Entry) = error("key " + key + " not found");
def insert(key:KEY, value:Entry, s:int):anInsertTree =
if (s == 0) INode(GBNode(value, GBNil, GBNil), 1, 1);
else ITree(GBNode(value, GBNil, GBNil));
@@ -280,8 +280,8 @@ abstract class Tree[KEY,Entry](order:Order[KEY]) {
def merge(larger:aNode) = {
if(larger==GBNil) this;
else {
- val Pair(value,larger1) = larger.take_smallest;
- GBNode(value,smaller,larger1);
+ val Pair(value1,larger1) = larger.take_smallest;
+ GBNode(value1,this,larger1);
}
}