unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
* [PATCH] SRFI-34, SRFI-60 and core bindings
@ 2005-10-20 13:09 Ludovic Courtès
  2005-10-20 19:42 ` Kevin Ryde
  2005-12-06 23:23 ` Marius Vollmer
  0 siblings, 2 replies; 11+ messages in thread
From: Ludovic Courtès @ 2005-10-20 13:09 UTC (permalink / raw)


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  <ludovic.courtes@laas.fr>

	* 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))




_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/guile-devel


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2006-01-03 10:06 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-20 13:09 [PATCH] SRFI-34, SRFI-60 and core bindings Ludovic Courtès
2005-10-20 19:42 ` Kevin Ryde
2005-10-21  7:52   ` Ludovic Courtès
2005-10-21 20:36     ` Kevin Ryde
2005-10-24  8:10       ` Ludovic Courtès
2005-12-06 23:23 ` Marius Vollmer
2005-12-07 10:10   ` Ludovic Courtès
2005-12-13 21:55     ` Marius Vollmer
2005-12-14 10:13       ` Ludovic Courtès
2005-12-28 20:14         ` Neil Jerram
2006-01-03 10:06           ` Ludovic Courtès

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).