[PATCH] SRFI-34, SRFI-60 and core bindings

[Ludovic Courtès]

Hi,

The patch below fixes SRFI-34 and SRFI-60 so that they don't override
core bindings.  The nice side-effect is that it suppresses annoying
warning messages.

Thanks,
Ludovic.


2005-10-20  Ludovic Courtès  <address@hidden>

        * srfi/srfi-34.scm: Don't export `raise', replace it instead
          (because `raise' otherwise overrides a code binding).
    
        * test-suite/tests/srfi-34.test (define-module): Don't pass a
          `:duplicate' argument.
    
        * srfi/srfi-60.scm: Don't export `bit-count', replace it
          instead.


--- orig/srfi/srfi-34.scm
+++ mod/srfi/srfi-34.scm
@@ -27,8 +27,8 @@
 ;;; Code:
 
 (define-module (srfi srfi-34)
-  #:export (with-exception-handler
-           raise)
+  #:export (with-exception-handler)
+  #:replace (raise)
   #:export-syntax (guard))
 
 (cond-expand-provide (current-module) '(srfi-34))


--- orig/srfi/srfi-60.scm
+++ mod/srfi/srfi-60.scm
@@ -22,7 +22,6 @@
            bitwise-xor
            bitwise-not
            any-bits-set?
-           bit-count
            bitwise-if bitwise-merge
            log2-binary-factors first-set-bit
            bit-set?
@@ -42,7 +41,8 @@
               logtest
               logcount
               logbit?
-              ash))
+              ash)
+  #:replace (bit-count))
 
 (load-extension "libguile-srfi-srfi-60-v-1" "scm_init_srfi_60")
 

--- orig/test-suite/tests/srfi-34.test
+++ mod/test-suite/tests/srfi-34.test
@@ -18,7 +18,6 @@
 ;;;; Boston, MA 02110-1301 USA
 
 (define-module (test-suite test-srfi-34)
-  :duplicates (last)  ;; avoid warning about srfi-34 replacing `raise'
   :use-module (test-suite lib)
   :use-module (srfi srfi-13)
   :use-module (srfi srfi-34))