summaryrefslogtreecommitdiffstats
path: root/wttree.scm
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <tb@debian.org>2005-11-02 14:55:21 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:32 -0800
commit34c54a22ff7818bb8b38ef4d9c87dbbcb221ba73 (patch)
tree1189d06a81277bcf8539b0260a69a19f6038effb /wttree.scm
parent611b3db17894e5fdc0db3d49eaf6743d27b44233 (diff)
parent5145dd3aa0c02c9fc496d1432fc4410674206e1d (diff)
downloadslib-34c54a22ff7818bb8b38ef4d9c87dbbcb221ba73.tar.gz
slib-34c54a22ff7818bb8b38ef4d9c87dbbcb221ba73.zip
Import Debian changes 3a2-1debian/3a2-1
slib (3a2-1) unstable; urgency=low * New upstream release. * Acknowledge NMU. (Closes: #281809) * Makefile: Don't hack Makefile; use rules instead. * debian/rules: Set on make invocations: prefix, htmldir, TEXI2HTML. * debian/rules (clean): Clean more stuff here. * Makefile: Comment out old rule for $(htmldir)slib_toc.html. Instead, specify directly that the texi2html invocation produces that file. * debian/rules (binary-indep): Find web files in slib subdir. * debian/control (Build-Depends-Indep): Go back to using scm.
Diffstat (limited to 'wttree.scm')
-rw-r--r--wttree.scm31
1 files changed, 9 insertions, 22 deletions
diff --git a/wttree.scm b/wttree.scm
index 238d372..7d3e010 100644
--- a/wttree.scm
+++ b/wttree.scm
@@ -63,21 +63,6 @@
;;
;;(declare (usual-integrations))
-(define error:error
- (case (scheme-implementation-type)
- ((MITScheme) error)
- (else slib:error)))
-(define error:wrong-type-argument
- (case (scheme-implementation-type)
- ((MITScheme) error:wrong-type-argument)
- (else (lambda (arg1 arg2 arg3)
- (slib:error 'wrong-type-argument arg1 arg2 arg3)))))
-(define error:bad-range-argument
- (case (scheme-implementation-type)
- ((MITScheme) error:bad-range-argument)
- (else (lambda (arg1 arg2)
- (slib:error 'bad-range-argument arg1 arg2)))))
-
;;;
;;; Interface to this package.
;;;
@@ -369,11 +354,11 @@
(if (or (< index 0)
(>= index bound)
(not (fix:fixnum? index)))
- (error:bad-range-argument index 'node/index)
+ (slib:error 'bad-range-argument index 'node/index)
(loop node index))))
(define (error:empty owner)
- (error:error "Operation requires non-empty tree:" owner))
+ (slib:error "Operation requires non-empty tree:" owner))
(define (local:make-wt-tree-type key<?)
@@ -567,7 +552,7 @@
((pair? alist) (loop (cdr alist)
(node/add node (caar alist) (cdar alist))))
(else
- (error:wrong-type-argument alist "alist" 'alist->tree))))
+ (slib:error 'wrong-type-argument alist "alist" 'alist->tree))))
(%make-wt-tree my-type (loop alist empty)))
(define (tree/get tree key default)
@@ -607,18 +592,20 @@
(define (guarantee-tree tree procedure)
(if (not (wt-tree? tree))
- (error:wrong-type-argument tree "weight-balanced tree" procedure)))
+ (slib:error 'wrong-type-argument
+ tree "weight-balanced tree" procedure)))
(define (guarantee-tree-type type procedure)
(if (not (tree-type? type))
- (error:wrong-type-argument type "weight-balanced tree type" procedure)))
+ (slib:error 'wrong-type-argument
+ type "weight-balanced tree type" procedure)))
(define (guarantee-compatible-trees tree1 tree2 procedure)
(guarantee-tree tree1 procedure)
(guarantee-tree tree2 procedure)
(if (not (eq? (tree/type tree1) (tree/type tree2)))
- (error:error "The trees" tree1 'and tree2 'have 'incompatible 'types
- (tree/type tree1) 'and (tree/type tree2))))
+ (slib:error "The trees" tree1 'and tree2 'have 'incompatible 'types
+ (tree/type tree1) 'and (tree/type tree2))))
;;;______________________________________________________________________
;;;