From 98e301455e57a45431ed35b0ba157e92a386dd6d Mon Sep 17 00:00:00 2001 From: Rolf-Thomas Happe Date: Sun, 27 Jul 2003 17:36:26 +0000 Subject: [PATCH] little moral improvements --- s48/sequences/README | 18 +++++++++++++++--- s48/sequences/packages.scm | 21 +++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/s48/sequences/README b/s48/sequences/README index 62e9e2e..9147475 100644 --- a/s48/sequences/README +++ b/s48/sequences/README @@ -17,11 +17,12 @@ parameters) and consists mainly of generic sequence code compiled with the basic sequence operation names bound to the corresponding vector procedures. The library is neither complete nor tweaked nor tested sytematically. (The idea to recycle parts of the srfi-13 code came -too late.) It contains the folllowing procedures, arranged in -columns=structures and `* categories' from SRFI-13 and -1. +too late.) It contains the following procedures, arranged in +columns=structures and `* categories' from SRFI-13 and -1, followed +by the list of name clashes with standard modules. -VECTOR-LIB SEQUENCE-LIB ABSEQUENCES, also SL +VECTOR-LIB SEQUENCE-LIB ABSEQUENCES, also S.L. * Predicates or so vector? sequence? absequence? sequence-behavior? @@ -76,6 +77,17 @@ vectors-for-each sequences-for-each vectors-fold sequences-fold vectors-fold-right sequences-fold-right +* Name clashes with scheme +vector-fill! +list->vector + +When using both SCHEME and VECTOR-LIB, you should choose the binding +explicitly, like so: + + (open (modify scheme (hide vector-fill! + list->vector)) + vector-lib) + * Prelude diff --git a/s48/sequences/packages.scm b/s48/sequences/packages.scm index 09b3ab0..7e71712 100644 --- a/s48/sequences/packages.scm +++ b/s48/sequences/packages.scm @@ -1,7 +1,8 @@ ; Copyright (c) 2003 RT Happe ; See the file COPYING distributed with the Scheme Untergrund Library -;;; refers to structure KRIMS from sunterlib/s48/krims +;;; refers to structures from sunterlib/s48/krims +;;; relies on implicit shadowing of exported bindings ;; sequences as data + behaviour (define-structure absequences absequences-face @@ -17,7 +18,9 @@ srfi-1+ ; list procs srfi-13 ; string procs let-opt ; let-optionals [ from scsh ] - scheme) + (modify scheme (hide map for-each member assoc) ; srfi-1+ + (hide string->list string-copy string-fill!) ; srfi-13 + )) (files specseqs)) ;; basic sequence accessors etc. @@ -29,7 +32,8 @@ byte-vectors srfi-1 ; make-list srfi-23 ; error - scheme) + (modify scheme (hide map for-each member assoc) ; srfi-1 + )) (files baseqs)) ;; sequence operations defined in terms of the basic protocol @@ -40,7 +44,8 @@ srfi-1+ ; append! rest srfi-23 ; error let-opt ; let-optionals [ from scsh ] - scheme) + (modify scheme (hide map for-each member assoc) ; srfi-1+ + )) (files genseqs)) @@ -51,7 +56,8 @@ util ; unspecific let-opt ; let-optionals [ from scsh ] srfi-1+ ; append! drop first rest - scheme) + (modify scheme (hide map for-each member assoc) ; srfi-1+ + )) ;; bind the basic operations to vector specialists (begin (define sequence? vector?) @@ -80,5 +86,8 @@ srfi-13 ; string procs byte-vectors let-opt ; let-optionals [ from scsh ] - scheme) + (modify scheme (hide map for-each member assoc) ; srfi-1 + (hide string->list string-copy string-fill!) ; srfi-13 + (hide vector-fill! list->vector) ; vector-lib + )) (files composeqs))