From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: SLIB support Date: Tue, 02 Oct 2007 05:25:06 +0200 Message-ID: <87ejgexkod.fsf@chbouib.org> References: <874pi13xer.fsf@gkar.rotty.yi.org> <87veaf3nq7.fsf@gkar.rotty.yi.org> <87lkbbau8j.fsf@chbouib.org> <87k5qu3dy1.fsf@gkar.rotty.yi.org> <87y7famv5n.fsf@raven.defaultvalue.org> <87zlzq1ruz.fsf@gkar.rotty.yi.org> <87ejh08fbk.fsf@chbouib.org> <87fy1f7shp.fsf@chbouib.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1191295594 4134 80.91.229.12 (2 Oct 2007 03:26:34 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 2 Oct 2007 03:26:34 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Oct 02 05:26:30 2007 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IcYOw-0007u7-BI for guile-devel@m.gmane.org; Tue, 02 Oct 2007 05:26:27 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IcYOr-0005GJ-K8 for guile-devel@m.gmane.org; Mon, 01 Oct 2007 23:26:21 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IcYOl-0005BF-Eb for guile-devel@gnu.org; Mon, 01 Oct 2007 23:26:15 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IcYOh-00054n-LN for guile-devel@gnu.org; Mon, 01 Oct 2007 23:26:15 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IcYOh-00054V-DA for guile-devel@gnu.org; Mon, 01 Oct 2007 23:26:11 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IcYOg-00047n-L4 for guile-devel@gnu.org; Mon, 01 Oct 2007 23:26:11 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1IcYOO-0007nE-6n for guile-devel@gnu.org; Tue, 02 Oct 2007 03:25:52 +0000 Original-Received: from 189.168.26.123 ([189.168.26.123]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Oct 2007 03:25:52 +0000 Original-Received: from ludo by 189.168.26.123 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Oct 2007 03:25:52 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 581 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 189.168.26.123 X-URL: http://www.laas.fr/~lcourtes/ X-PGP-Key-ID: 0xEB1F5364 X-PGP-Key: http://www.laas.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i486-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Cancel-Lock: sha1:5eCZRaq/dZLmNnieSnVR4oE+/RQ= X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:6820 Archived-At: --=-=-= Hello! I committed the attached patch that appears to solve the `(ice-9 slib)' problem. Note that I also updated the instructions in the manual. Feedback welcome! Thanks, Ludovic. --=-=-= Content-Type: text/x-patch; charset=iso-8859-1 Content-Disposition: inline; filename*=us-ascii''%2c%2cslib.diff Content-Transfer-Encoding: 8bit Content-Description: The patch --- orig/ChangeLog +++ mod/ChangeLog @@ -1,3 +1,7 @@ +2007-10-02 Ludovic Courtès + + * NEWS: Mention `(ice-9 slib)' fix. + 2007-09-03 Ludovic Courtès * NEWS: Mention alignment-related bug fixes. --- orig/NEWS +++ mod/NEWS @@ -41,6 +41,7 @@ * Bugs fixed +** The `(ice-9 slib)' module now works as expected ** Expressions like "(set! 'x #t)" no longer yield a crash ** Warnings about duplicate bindings now go to stderr ** A memory leak in `make-socket-address' was fixed --- orig/doc/ref/ChangeLog +++ mod/doc/ref/ChangeLog @@ -1,3 +1,11 @@ +2007-10-02 Ludovic Courtès + + * slib.texi (SLIB installation): Don't recommend using the site + directory for the symlink; instead, suggest either adding a + symlink in `/.../share/guile/1.8' (because slib will look for + its files in the implementation vicinity by default) or defining + `SCHEME_LIBRARY_PATH'. Mention `new-catalog'. + 2007-08-11 Ludovic Courtès * srfi-modules.texi (SRFI-34): New node. --- orig/doc/ref/slib.texi +++ mod/doc/ref/slib.texi @@ -23,7 +23,7 @@ @example (use-modules (ice-9 slib)) (require 'primes) -(probably-prime? 13) +(prime? 13) @result{} #t @end example @@ -31,7 +31,7 @@ example the SLIB version of @code{delete-file} returns a boolean indicating success or failure, whereas the Guile core version throws an error for failure. In general (and as might be expected) when SLIB -is loaded it's the SLIB specifications which are followed. +is loaded it's the SLIB specifications that are followed. @menu * SLIB installation:: @@ -41,17 +41,30 @@ @node SLIB installation @subsection SLIB installation -The following seems to work (e.g., with slib versions 2c7 and 2d2): +The following procedure works, e.g., with SLIB version 3a3 +(@pxref{Installation, SLIB installation,, slib, The SLIB Portable Scheme +Library}): @enumerate @item -Unpack slib somewhere, e.g., @file{/usr/local/share/slib}. +Unpack SLIB and install it using @code{make install} from its directory. +By default, this will install SLIB in @file{/usr/local/lib/slib/}. +Running @code{make installinfo} installs its documentation, by default +under @file{/usr/local/info/}. @item -Create a symlink in the Guile site directory to slib, e.g.,: +Define the @code{SCHEME_LIBRARY_PATH} environment variable: @example -ln -s /usr/local/share/slib /usr/local/share/guile/site/slib +$ SCHEME_LIBRARY_PATH=/usr/local/lib/slib/ +$ export SCHEME_LIBRARY_PATH +@end example + +Alternatively, you can create a symlink in the Guile directory to SLIB, +e.g.: + +@example +ln -s /usr/local/lib/slib /usr/local/share/guile/1.8/slib @end example @item @@ -60,12 +73,12 @@ @example # guile guile> (use-modules (ice-9 slib)) -guile> (load "/usr/local/share/slib/mklibcat.scm") +guile> (require 'new-catalog) guile> (quit) @end example The catalog data should now be in -@file{/usr/local/share/guile/site/slibcat}. +@file{/usr/local/share/guile/1.8/slibcat}. If instead you get an error such as: @@ -77,15 +90,6 @@ or to modify @file{ice-9/slib.scm} to use @code{define-public} for the offending variables. -@item -Install the documentation: - -@example -cd /usr/local/share/slib -rm /usr/local/info/slib.info* -cp slib.info /usr/local/info -install-info slib.info /usr/local/info/dir -@end example @end enumerate @node JACAL --- orig/ice-9/ChangeLog +++ mod/ice-9/ChangeLog @@ -1,3 +1,8 @@ +2007-10-02 Ludovic Courtès + + * slib.scm: Let SLIB's `guile.init' do most of the job. See the + `guile-devel@gnu.org' mailing list archive for details. + 2007-09-01 Andy Wingo * boot-9.scm (duplicate-handlers)[warn, warn-override-core]: --- orig/ice-9/slib.scm +++ mod/ice-9/slib.scm @@ -1,17 +1,17 @@ ;;;; slib.scm --- definitions needed to get SLIB to work with Guile ;;;; -;;;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public ;;;; License as published by the Free Software Foundation; either ;;;; version 2.1 of the License, or (at your option) any later version. -;;;; +;;;; ;;;; This library is distributed in the hope that it will be useful, ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;;; Lesser General Public License for more details. -;;;; +;;;; ;;;; You should have received a copy of the GNU Lesser General Public ;;;; License along with this library; if not, write to the Free Software ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -29,386 +29,14 @@ logical:bit-extract logical:integer-expt logical:ipow-by-squaring slib:eval-load slib:tab slib:form-feed difftime offset-time software-type) - :replace (delete-file open-file provide provided? system) :no-backtrace) +;; Initialize SLIB. +(load-from-path "slib/guile.init") -(define (eval-load evl) - (if (not (file-exists? )) - (set! (string-append (scheme-file-suffix)))) - (call-with-input-file - (lambda (port) - (let ((old-load-pathname *load-pathname*)) - (set! *load-pathname* ) - (do ((o (read port) (read port))) - ((eof-object? o)) - (evl o)) - (set! *load-pathname* old-load-pathname))))) - - - -(define slib:exit quit) -(define slib:error error) -(define slib:warn warn) -(define slib:eval (lambda (x) (eval x slib-module))) -(define defmacro:eval (lambda (x) (eval x (interaction-environment)))) -(define logical:logand logand) -(define logical:logior logior) -(define logical:logxor logxor) -(define logical:lognot lognot) -(define logical:ash ash) -(define logical:logcount logcount) -(define logical:integer-length integer-length) -(define logical:bit-extract bit-extract) -(define logical:integer-expt integer-expt) -(define slib:eval-load eval-load) -(define slib:tab #\tab) -(define slib:form-feed #\page) - -(define slib-module (current-module)) - -(define (defined? symbol) - (module-defined? slib-module symbol)) - -;;; *FEATURES* should be set to a list of symbols describing features -;;; of this implementation. Suggestions for features are: -(set! *features* - (append - '( - source ;can load scheme source files - ;(slib:load-source "filename") -; compiled ;can load compiled files - ;(slib:load-compiled "filename") - - ;; Scheme report features - -; rev5-report ;conforms to - eval ;R5RS two-argument eval -; values ;R5RS multiple values - dynamic-wind ;R5RS dynamic-wind -; macro ;R5RS high level macros - delay ;has DELAY and FORCE - multiarg-apply ;APPLY can take more than 2 args. -; rationalize - rev4-optional-procedures ;LIST-TAIL, STRING->LIST, - ;LIST->STRING, STRING-COPY, - ;STRING-FILL!, LIST->VECTOR, - ;VECTOR->LIST, and VECTOR-FILL! - -; rev4-report ;conforms to - -; ieee-p1178 ;conforms to - -; rev3-report ;conforms to - - rev2-procedures ;SUBSTRING-MOVE-LEFT!, - ;SUBSTRING-MOVE-RIGHT!, - ;SUBSTRING-FILL!, - ;STRING-NULL?, APPEND!, 1+, - ;-1+, ?, >=? -; object-hash ;has OBJECT-HASH - - multiarg/and- ;/ and - can take more than 2 args. - with-file ;has WITH-INPUT-FROM-FILE and - ;WITH-OUTPUT-FROM-FILE -; transcript ;TRANSCRIPT-ON and TRANSCRIPT-OFF -; ieee-floating-point ;conforms to IEEE Standard 754-1985 - ;IEEE Standard for Binary - ;Floating-Point Arithmetic. - full-continuation ;can return multiple times - - ;; Other common features - -; srfi ;srfi-0, COND-EXPAND finds all srfi-* -; sicp ;runs code from Structure and - ;Interpretation of Computer - ;Programs by Abelson and Sussman. - defmacro ;has Common Lisp DEFMACRO -; record ;has user defined data structures - string-port ;has CALL-WITH-INPUT-STRING and - ;CALL-WITH-OUTPUT-STRING -; sort -; pretty-print -; object->string -; format ;Common-lisp output formatting -; trace ;has macros: TRACE and UNTRACE -; compiler ;has (COMPILER) -; ed ;(ED) is editor - - ;; core definitions compatible, plus `make-random-state' below - random - ) - - (if (defined? 'getenv) - '(getenv) - '()) - - (if (defined? 'current-time) - '(current-time) - '()) - - (if (defined? 'system) - '(system) - '()) - - (if (defined? 'char-ready?) - '(char-ready?) - '()) - - *features*)) - -;; The array module specified by slib 3a1 is not the same as what guile -;; provides, so we must remove `array' from the features list. -;; -;; The main difference is `create-array' which is similar to -;; `make-uniform-array', but the `Ac64' etc prototype procedures incorporate -;; an initial fill element into the prototype. -;; -;; Believe the array-for-each module will need to be taken from slib when -;; the array module is taken from there, since what the array module creates -;; won't be understood by the guile functions. So remove `array-for-each' -;; from the features list too. -;; -;; Also, slib 3a1 array-for-each specifies an `array-map' which is not in -;; guile (but could be implemented quite easily). -;; -;; ENHANCE-ME: It'd be nice to implement what's necessary, since the guile -;; functions should be more efficient than the implementation in slib. -;; -;; FIXME: Since the *features* variable is shared by slib and the guile -;; core, removing these feature symbols has the unhappy effect of making it -;; look like they aren't in the core either. Let's assume that arrays have -;; been present unconditionally long enough that no guile-specific code will -;; bother to test. An alternative would be to make a new separate -;; *features* variable which the slib stuff operated on, leaving the core -;; mechanism alone. That might be a good thing anyway. -;; -(set! *features* (delq 'array *features*)) -(set! *features* (delq 'array-for-each *features*)) - -;; The random module in slib 3a1 provides a `random:chunk' which is used by -;; the random-inexact module. Guile doesn't provide random:chunk so we must -;; remove 'random from `*features*' to use the slib code. -;; -;; ENHANCE-ME: Maybe Guile could provide a `random:chunk', the rest of the -;; random module is already the same as Guile. -;; -;; FIXME: As per the array bits above, *features* is shared by slib and the -;; guile core, so removing 'random has the unhappy effect of making it look -;; like this isn't in the core. Let's assume random numbers have been -;; present unconditionally long enough that no guile-specific code will -;; bother to test. -;; -(set! *features* (delq 'random *features*)) - - -;;; FIXME: Because uers want require to search the path, this uses -;;; load-from-path, which probably isn't a hot idea. slib -;;; doesn't expect this function to search a path, so I expect to get -;;; bug reports at some point complaining that the wrong file gets -;;; loaded when something accidentally appears in the path before -;;; slib, etc. ad nauseum. However, the right fix seems to involve -;;; changing catalog:get in slib/require.scm, and I don't expect -;;; Aubrey will integrate such a change. So I'm just going to punt -;;; for the time being. -(define (slib:load name) - (save-module-excursion - (lambda () - (set-current-module slib-module) - (let ((errinfo (catch 'system-error - (lambda () - (load-from-path name) - #f) - (lambda args args)))) - (if (and errinfo - (catch 'system-error - (lambda () - (load-from-path - (string-append name ".scm")) - #f) - (lambda args args))) - (apply throw errinfo)))))) - -(define slib:load-source slib:load) -(define defmacro:load slib:load) - -(define slib-parent-dir - (let* ((path (%search-load-path "slib/require.scm"))) - (if path - (substring path 0 (- (string-length path) 17)) - (error "Could not find slib/require.scm in " %load-path)))) - -(define (implementation-vicinity) - (string-append slib-parent-dir "/")) -(define (library-vicinity) - (string-append (implementation-vicinity) "slib/")) -(define home-vicinity - (let ((home-path (getenv "HOME"))) - (lambda () home-path))) -(define (scheme-implementation-type) 'guile) -(define scheme-implementation-version version) -;;; (scheme-implementation-home-page) should return a (string) URI -;;; (Uniform Resource Identifier) for this scheme implementation's home -;;; page; or false if there isn't one. -(define (scheme-implementation-home-page) - "http://www.gnu.org/software/guile/guile.html") - -;; legacy from r3rs, but slib says all implementations provide these -;; ("Legacy" section of the "Miscellany" node in the manual) -(define-public t #t) -(define-public nil #f) - -;; ENHANCE-ME: Could call ioctl TIOCGWINSZ to get the size of a tty (see -;; "man 4 tty_ioctl" on a GNU/Linux system), on systems with that. -(define (output-port-width . arg) 80) -(define (output-port-height . arg) 24) - -;; slib 3a1 and up, straight from Template.scm -(define-public (call-with-open-ports . ports) - (define proc (car ports)) - (cond ((procedure? proc) (set! ports (cdr ports))) - (else (set! ports (reverse ports)) - (set! proc (car ports)) - (set! ports (reverse (cdr ports))))) - (let ((ans (apply proc ports))) - (for-each close-port ports) - ans)) - -;; slib (version 3a1) requires open-file accept a symbol r, rb, w or wb for -;; MODES, so extend the guile core open-file accordingly. -;; -;; slib (version 3a1) also calls open-file with strings "rb" or "wb", not -;; sure if that's intentional, but in any case this extension continues to -;; accept strings to make that work. -;; -(define-public (open-file filename modes) - (if (symbol? modes) - (set! modes (symbol->string modes))) - ((@ (guile) open-file) filename modes)) - -;; returning #t/#f instead of throwing an error for failure -(define-public (delete-file filename) - (catch 'system-error - (lambda () ((@ (guile) delete-file) filename) #t) - (lambda args #f))) - -;; Nothing special to do for this, so straight from Template.scm. Maybe -;; "sensible-browser" for a debian system would be worth trying too (and -;; would be good on a tty). -(define-public (browse-url url) - (define (try cmd end) (zero? (system (string-append cmd url end)))) - (or (try "netscape-remote -remote 'openURL(" ")'") - (try "netscape -remote 'openURL(" ")'") - (try "netscape '" "'&") - (try "netscape '" "'"))) - -;;; {array-for-each} -(define (array-indexes ra) - (let ((ra0 (apply make-array '() (array-shape ra)))) - (array-index-map! ra0 list) - ra0)) - -;;; {Random numbers} -;;; -(define (make-random-state . args) - (let ((seed (if (null? args) *random-state* (car args)))) - (cond ((string? seed)) - ((number? seed) (set! seed (number->string seed))) - (else (let () - (require 'object->string) - (set! seed (object->limited-string seed 50))))) - (seed->random-state seed))) - -;;; {rev2-procedures} -;;; - -(define -1+ 1-) -(define ? >) -(define >=? >=) - -;;; {system} -;;; -;; If the program run is killed by a signal, the shell normally gives an -;; exit code of 128+signum. If the shell itself is killed by a signal then -;; we do the same 128+signum here. -;; -;; "stop-sig" shouldn't arise here, since system shouldn't be calling -;; waitpid with WUNTRACED, but allow for it anyway, just in case. -;; -(if (memq 'system *features*) - (define-public system - (lambda (str) - (let ((st ((@ (guile) system) str))) - (or (status:exit-val st) - (+ 128 (or (status:term-sig st) - (status:stop-sig st)))))))) - -;;; {Time} -;;; - -(define difftime -) -(define offset-time +) - - -(define define - (procedure->memoizing-macro - (lambda (exp env) - (if (= (length env) 1) - `(define-public ,@(cdr exp)) - `(define-private ,@(cdr exp)))))) - -;;; Hack to make syncase macros work in the slib module -(if (nested-ref the-root-module '(app modules ice-9 syncase)) - (set-object-property! (module-local-variable (current-module) 'define) - '*sc-expander* - '(define))) - -(define (software-type) - "Return a symbol describing the current platform's operating system. -This may be one of AIX, VMS, UNIX, COHERENT, WINDOWS, MS-DOS, OS/2, -THINKC, AMIGA, ATARIST, MACH, or ACORN. - -Note that most varieties of Unix are considered to be simply \"UNIX\". -That is because when a program depends on features that are not present -on every operating system, it is usually better to test for the presence -or absence of that specific feature. The return value of -@code{software-type} should only be used for this purpose when there is -no other easy or unambiguous way of detecting such features." - 'UNIX) - -(slib:load (in-vicinity (library-vicinity) "require.scm")) - -(define require require:require) - -;; {Extensions to the require system so that the user can add new -;; require modules easily.} - -(define *vicinity-table* - (list - (cons 'implementation (implementation-vicinity)) - (cons 'library (library-vicinity)))) - -(define (install-require-vicinity name vicinity) - (let ((entry (assq name *vicinity-table*))) - (if entry - (set-cdr! entry vicinity) - (set! *vicinity-table* - (acons name vicinity *vicinity-table*))))) - -(define (install-require-module name vicinity-name file-name) - (if (not *catalog*) ;Fix which loads catalog in slib - (catalog:get 'random)) ;(doesn't load the feature 'random) - (let ((entry (assq name *catalog*)) - (vicinity (cdr (assq vicinity-name *vicinity-table*)))) - (let ((path-name (in-vicinity vicinity file-name))) - (if entry - (set-cdr! entry path-name) - (set! *catalog* - (acons name path-name *catalog*)))))) - -(define (make-exchanger obj) - (lambda (rep) (let ((old obj)) (set! obj rep) old))) +;; SLIB redefines a few core symbols based on their default definition. +;; Thus, we only replace them at this point so that their previous definition +;; is visible when `guile.init' is loaded. +(module-replace! (current-module) + '(delete-file open-file provide provided? system)) --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Guile-devel mailing list Guile-devel@gnu.org http://lists.gnu.org/mailman/listinfo/guile-devel --=-=-=--