Import Upstream version 2d2upstream/2d2

1 files changed, 45 insertions, 45 deletions

diff --git a/wttree.scm b/wttree.scm
index 515563f..cb7ca13 100644
--- a/wttree.scm
+++ b/wttree.scm
@@ -1,44 +1,44 @@
-;;  "wttree.scm" Weight balanced trees			-*-Scheme-*-
-;;  Copyright (c) 1993-1994 Stephen Adams
-;;
-;;  $Id: wttree.scm,v 1.3 1999/10/11 03:36:29 jaffer Exp $
-;;
-;;  References:
-;;
-;;    Stephen Adams, Implemeting Sets Efficiently in a Functional
-;;       Language, CSTR 92-10, Department of Electronics and Computer
-;;       Science, University of Southampton, 1992
-;;
-;;
-;;  Copyright (c) 1993-94 Massachusetts Institute of Technology
-;;
-;;  This material was developed by the Scheme project at the Massachusetts
-;;  Institute of Technology, Department of Electrical Engineering and
-;;  Computer Science.  Permission to copy this software, to redistribute
-;;  it, and to use it for any purpose is granted, subject to the following
-;;  restrictions and understandings.
-;;
-;;  1. Any copy made of this software must include this copyright notice
-;;  in full.
-;;
-;;  2. Users of this software agree to make their best efforts (a) to
-;;  return to the MIT Scheme project any improvements or extensions that
-;;  they make, so that these may be included in future releases; and (b)
-;;  to inform MIT of noteworthy uses of this software.
-;;
-;;  3. All materials developed as a consequence of the use of this
-;;  software shall duly acknowledge such use, in accordance with the usual
-;;  standards of acknowledging credit in academic research.
-;;
-;;  4. MIT has made no warrantee or representation that the operation of
-;;  this software will be error-free, and MIT is under no obligation to
-;;  provide any services, by way of maintenance, update, or otherwise.
-;;
-;;  5. In conjunction with products arising from the use of this material,
-;;  there shall be no use of the name of the Massachusetts Institute of
-;;  Technology nor of any adaptation thereof in any advertising,
-;;  promotional, or sales literature without prior written consent from
-;;  MIT in each case.
+;;; "wttree.scm" Weight balanced trees			-*-Scheme-*-
+;;; Copyright (c) 1993-1994 Stephen Adams
+;;;
+;;; References:
+;;;
+;;;   Stephen Adams, Implemeting Sets Efficiently in a Functional
+;;;      Language, CSTR 92-10, Department of Electronics and Computer
+;;;      Science, University of Southampton, 1992
+;;;
+;;;
+;;; Copyright (c) 1993-94 Massachusetts Institute of Technology
+;;;
+;;; This material was developed by the Scheme project at the
+;;; Massachusetts Institute of Technology, Department of Electrical
+;;; Engineering and Computer Science.  Permission to copy and modify
+;;; this software, to redistribute either the original software or a
+;;; modified version, and to use this software for any purpose is
+;;; granted, subject to the following restrictions and understandings.
+;;;
+;;; 1. Any copy made of this software must include this copyright
+;;; notice in full.
+;;;
+;;; 2. Users of this software agree to make their best efforts (a) to
+;;; return to the MIT Scheme project any improvements or extensions
+;;; that they make, so that these may be included in future releases;
+;;; and (b) to inform MIT of noteworthy uses of this software.
+;;;
+;;; 3. All materials developed as a consequence of the use of this
+;;; software shall duly acknowledge such use, in accordance with the
+;;; usual standards of acknowledging credit in academic research.
+;;;
+;;; 4. MIT has made no warrantee or representation that the operation
+;;; of this software will be error-free, and MIT is under no
+;;; obligation to provide any services, by way of maintenance, update,
+;;; or otherwise.
+;;;
+;;; 5. In conjunction with products arising from the use of this
+;;; material, there shall be no use of the name of the Massachusetts
+;;; Institute of Technology nor of any adaptation thereof in any
+;;; advertising, promotional, or sales literature without prior
+;;; written consent from MIT in each case.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -63,7 +63,7 @@
 ;;
 ;;(declare (usual-integrations))
 
-(define error
+(define error:error
   (case (scheme-implementation-type)
     ((MITScheme) error)
     (else slib:error)))
@@ -373,7 +373,7 @@
           (loop node index))))
 
   (define (error:empty owner)
-    (error "Operation requires non-empty tree:" owner))
+    (error:error "Operation requires non-empty tree:" owner))
 
 
   (define (local:make-wt-tree-type key<?)
@@ -617,8 +617,8 @@
     (guarantee-tree tree1 procedure)
     (guarantee-tree tree2 procedure)
     (if (not (eq? (tree/type tree1) (tree/type tree2)))
-        (error "The trees" tree1 'and tree2 'have 'incompatible 'types
-               (tree/type tree1) 'and (tree/type tree2))))
+        (error:error "The trees" tree1 'and tree2 'have 'incompatible 'types
+		     (tree/type tree1) 'and (tree/type tree2))))
 
 ;;;______________________________________________________________________
 ;;;