1996-07-25 22:56:11 +00:00
|
|
|
|
;;; installed-scm-file
|
|
|
|
|
|
|
2009-02-20 14:23:55 +01:00
|
|
|
|
;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;; Free Software Foundation, Inc.
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;;;
|
2003-04-05 19:15:35 +00:00
|
|
|
|
;;;; 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,
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
;;;; 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
|
2005-05-23 19:57:22 +00:00
|
|
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2001-06-03 23:29:45 +00:00
|
|
|
|
;;;;
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; This file is the first thing loaded into Guile. It adds many mundane
|
|
|
|
|
|
;;; definitions and a few that are interesting.
|
|
|
|
|
|
;;;
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; The module system (hence the hierarchical namespace) are defined in this
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; file.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
2001-05-02 00:59:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
2009-04-24 23:10:31 +02:00
|
|
|
|
;; Before compiling, make sure any symbols are resolved in the (guile)
|
|
|
|
|
|
;; module, the primary location of those symbols, rather than in
|
|
|
|
|
|
;; (guile-user), the default module that we compile in.
|
|
|
|
|
|
|
|
|
|
|
|
(eval-when (compile)
|
|
|
|
|
|
(set-current-module (resolve-module '(guile))))
|
|
|
|
|
|
|
2009-03-09 21:40:30 +01:00
|
|
|
|
;;; {R4RS compliance}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(primitive-load-path "ice-9/r4rs")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-04-22 22:23:43 +02:00
|
|
|
|
;;; {Simple Debugging Tools}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; peek takes any number of arguments, writes them to the
|
|
|
|
|
|
;; current ouput port, and returns the last argument.
|
|
|
|
|
|
;; It is handy to wrap around an expression to look at
|
|
|
|
|
|
;; a value each time is evaluated, e.g.:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; (+ 10 (troublesome-fn))
|
|
|
|
|
|
;; => (+ 10 (pk 'troublesome-fn-returned (troublesome-fn)))
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (peek . stuff)
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(display ";;; ")
|
|
|
|
|
|
(write stuff)
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(car (last-pair stuff)))
|
|
|
|
|
|
|
|
|
|
|
|
(define pk peek)
|
|
|
|
|
|
|
|
|
|
|
|
(define (warn . stuff)
|
|
|
|
|
|
(with-output-to-port (current-error-port)
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(display ";;; WARNING ")
|
|
|
|
|
|
(display stuff)
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(car (last-pair stuff)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-11-02 20:51:30 +00:00
|
|
|
|
;;; {Features}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1996-11-02 20:51:30 +00:00
|
|
|
|
|
|
|
|
|
|
(define (provide sym)
|
|
|
|
|
|
(if (not (memq sym *features*))
|
|
|
|
|
|
(set! *features* (cons sym *features*))))
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;; Return #t iff FEATURE is available to this Guile interpreter. In SLIB,
|
|
|
|
|
|
;; provided? also checks to see if the module is available. We should do that
|
|
|
|
|
|
;; too, but don't.
|
|
|
|
|
|
|
1999-05-02 17:27:05 +00:00
|
|
|
|
(define (provided? feature)
|
|
|
|
|
|
(and (memq feature *features*) #t))
|
|
|
|
|
|
|
2009-04-29 23:12:12 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {and-map and or-map}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; (and-map fn lst) is like (and (fn (car lst)) (fn (cadr lst)) (fn...) ...)
|
|
|
|
|
|
;;; (or-map fn lst) is like (or (fn (car lst)) (fn (cadr lst)) (fn...) ...)
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; and-map f l
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Apply f to successive elements of l until exhaustion or f returns #f.
|
|
|
|
|
|
;; If returning early, return #f. Otherwise, return the last value returned
|
|
|
|
|
|
;; by f. If f has never been called because l is empty, return #t.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (and-map f lst)
|
|
|
|
|
|
(let loop ((result #t)
|
|
|
|
|
|
(l lst))
|
|
|
|
|
|
(and result
|
|
|
|
|
|
(or (and (null? l)
|
|
|
|
|
|
result)
|
|
|
|
|
|
(loop (f (car l)) (cdr l))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; or-map f l
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Apply f to successive elements of l until exhaustion or while f returns #f.
|
|
|
|
|
|
;; If returning early, return the return value of f.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (or-map f lst)
|
|
|
|
|
|
(let loop ((result #f)
|
|
|
|
|
|
(l lst))
|
|
|
|
|
|
(or result
|
|
|
|
|
|
(and (not (null? l))
|
|
|
|
|
|
(loop (f (car l)) (cdr l))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;; let format alias simple-format until the more complete version is loaded
|
1999-09-26 16:00:36 +00:00
|
|
|
|
|
2000-01-11 18:52:25 +00:00
|
|
|
|
(define format simple-format)
|
|
|
|
|
|
|
2004-12-14 00:21:25 +00:00
|
|
|
|
;; this is scheme wrapping the C code so the final pred call is a tail call,
|
|
|
|
|
|
;; per SRFI-13 spec
|
|
|
|
|
|
(define (string-any char_pred s . rest)
|
|
|
|
|
|
(let ((start (if (null? rest)
|
|
|
|
|
|
0 (car rest)))
|
|
|
|
|
|
(end (if (or (null? rest) (null? (cdr rest)))
|
|
|
|
|
|
(string-length s) (cadr rest))))
|
|
|
|
|
|
(if (and (procedure? char_pred)
|
|
|
|
|
|
(> end start)
|
|
|
|
|
|
(<= end (string-length s))) ;; let c-code handle range error
|
|
|
|
|
|
(or (string-any-c-code char_pred s start (1- end))
|
|
|
|
|
|
(char_pred (string-ref s (1- end))))
|
|
|
|
|
|
(string-any-c-code char_pred s start end))))
|
|
|
|
|
|
|
|
|
|
|
|
;; this is scheme wrapping the C code so the final pred call is a tail call,
|
|
|
|
|
|
;; per SRFI-13 spec
|
|
|
|
|
|
(define (string-every char_pred s . rest)
|
|
|
|
|
|
(let ((start (if (null? rest)
|
|
|
|
|
|
0 (car rest)))
|
|
|
|
|
|
(end (if (or (null? rest) (null? (cdr rest)))
|
|
|
|
|
|
(string-length s) (cadr rest))))
|
|
|
|
|
|
(if (and (procedure? char_pred)
|
|
|
|
|
|
(> end start)
|
|
|
|
|
|
(<= end (string-length s))) ;; let c-code handle range error
|
|
|
|
|
|
(and (string-every-c-code char_pred s start (1- end))
|
|
|
|
|
|
(char_pred (string-ref s (1- end))))
|
|
|
|
|
|
(string-every-c-code char_pred s start end))))
|
|
|
|
|
|
|
2005-06-05 17:24:52 +00:00
|
|
|
|
;; A variant of string-fill! that we keep for compatability
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (substring-fill! str start end fill)
|
|
|
|
|
|
(string-fill! str fill start end))
|
|
|
|
|
|
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
2009-04-29 22:50:45 +02:00
|
|
|
|
;; Define a minimal stub of the module API for psyntax, before modules
|
|
|
|
|
|
;; have booted.
|
2009-04-22 00:17:22 +02:00
|
|
|
|
(define (module-name x)
|
2009-04-24 13:50:14 +02:00
|
|
|
|
'(guile))
|
2009-04-29 21:19:23 +02:00
|
|
|
|
(define (module-define! module sym val)
|
|
|
|
|
|
(let ((v (hashq-ref (%get-pre-modules-obarray) sym)))
|
|
|
|
|
|
(if v
|
|
|
|
|
|
(variable-set! v val)
|
|
|
|
|
|
(hashq-set! (%get-pre-modules-obarray) sym
|
|
|
|
|
|
(make-variable val)))))
|
|
|
|
|
|
(define (module-ref module sym)
|
|
|
|
|
|
(let ((v (module-variable module sym)))
|
|
|
|
|
|
(if v (variable-ref v) (error "badness!" (pk module) (pk sym)))))
|
2009-04-29 22:50:45 +02:00
|
|
|
|
(define (resolve-module . args)
|
|
|
|
|
|
#f)
|
2009-04-29 21:19:23 +02:00
|
|
|
|
|
2009-04-29 23:39:09 +02:00
|
|
|
|
;; Input hook to syncase -- so that we might be able to pass annotated
|
|
|
|
|
|
;; expressions in. Currently disabled. Maybe we should just use
|
|
|
|
|
|
;; source-properties directly.
|
|
|
|
|
|
(define (annotation? x) #f)
|
|
|
|
|
|
|
|
|
|
|
|
;; API provided by psyntax
|
2009-04-26 20:36:58 +02:00
|
|
|
|
(define syntax-violation #f)
|
2009-04-26 20:56:24 +02:00
|
|
|
|
(define datum->syntax #f)
|
|
|
|
|
|
(define syntax->datum #f)
|
|
|
|
|
|
(define identifier? #f)
|
|
|
|
|
|
(define generate-temporaries #f)
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(define bound-identifier=? #f)
|
|
|
|
|
|
(define free-identifier=? #f)
|
2009-04-29 00:38:12 +02:00
|
|
|
|
(define sc-expand #f)
|
|
|
|
|
|
|
2009-04-29 23:39:09 +02:00
|
|
|
|
;; $sc-expand is an implementation detail of psyntax. It is used by
|
|
|
|
|
|
;; expanded macros, to dispatch an input against a set of patterns.
|
2009-04-29 00:38:12 +02:00
|
|
|
|
(define $sc-dispatch #f)
|
|
|
|
|
|
|
2009-04-29 23:39:09 +02:00
|
|
|
|
;; Load it up!
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(primitive-load-path "ice-9/psyntax-pp")
|
|
|
|
|
|
|
2009-04-29 23:39:09 +02:00
|
|
|
|
;; %pre-modules-transformer is the Scheme expander from now until the
|
|
|
|
|
|
;; module system has booted up.
|
2009-04-23 13:30:23 +02:00
|
|
|
|
(define %pre-modules-transformer sc-expand)
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-03-26 17:59:22 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;; {Defmacros}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(define-syntax define-macro
|
|
|
|
|
|
(lambda (x)
|
2009-04-25 16:31:52 +02:00
|
|
|
|
"Define a defmacro."
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(syntax-case x ()
|
2009-04-25 16:31:52 +02:00
|
|
|
|
((_ (macro . args) doc body1 body ...)
|
2009-04-26 20:56:24 +02:00
|
|
|
|
(string? (syntax->datum (syntax doc)))
|
2009-04-25 16:31:52 +02:00
|
|
|
|
(syntax (define-macro macro doc (lambda args body1 body ...))))
|
|
|
|
|
|
((_ (macro . args) body ...)
|
|
|
|
|
|
(syntax (define-macro macro #f (lambda args body ...))))
|
|
|
|
|
|
((_ macro doc transformer)
|
2009-04-26 20:56:24 +02:00
|
|
|
|
(or (string? (syntax->datum (syntax doc)))
|
|
|
|
|
|
(not (syntax->datum (syntax doc))))
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(syntax
|
|
|
|
|
|
(define-syntax macro
|
|
|
|
|
|
(lambda (y)
|
2009-04-25 16:31:52 +02:00
|
|
|
|
doc
|
2009-04-25 12:50:53 +02:00
|
|
|
|
(syntax-case y ()
|
|
|
|
|
|
((_ . args)
|
2009-04-26 20:56:24 +02:00
|
|
|
|
(let ((v (syntax->datum (syntax args))))
|
|
|
|
|
|
(datum->syntax y (apply transformer v))))))))))))
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
|
|
|
|
|
|
(define-syntax defmacro
|
|
|
|
|
|
(lambda (x)
|
2009-04-25 16:31:52 +02:00
|
|
|
|
"Define a defmacro, with the old lispy defun syntax."
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(syntax-case x ()
|
2009-04-25 16:31:52 +02:00
|
|
|
|
((_ macro args doc body1 body ...)
|
2009-04-26 20:56:24 +02:00
|
|
|
|
(string? (syntax->datum (syntax doc)))
|
2009-04-25 16:31:52 +02:00
|
|
|
|
(syntax (define-macro macro doc (lambda args body1 body ...))))
|
|
|
|
|
|
((_ macro args body ...)
|
|
|
|
|
|
(syntax (define-macro macro #f (lambda args body ...)))))))
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
(provide 'defmacro)
|
2003-03-26 17:59:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;; {Deprecation}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Depends on: defmacro
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro begin-deprecated forms
|
|
|
|
|
|
(if (include-deprecated-features)
|
2008-09-01 23:40:10 -07:00
|
|
|
|
`(begin ,@forms)
|
2009-03-09 22:01:27 +01:00
|
|
|
|
`(begin)))
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
;;; {Trivial Functions}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
|
2001-04-15 22:47:25 +00:00
|
|
|
|
(define (identity x) x)
|
1997-01-08 01:27:01 +00:00
|
|
|
|
(define (and=> value procedure) (and value (procedure value)))
|
2003-03-22 00:34:34 +00:00
|
|
|
|
(define call/cc call-with-current-continuation)
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
|
2001-05-14 16:38:08 +00:00
|
|
|
|
;;; apply-to-args is functionally redundant with apply and, worse,
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; is less general than apply since it only takes two arguments.
|
|
|
|
|
|
;;;
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; On the other hand, apply-to-args is a syntacticly convenient way to
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; perform binding in many circumstances when the "let" family of
|
|
|
|
|
|
;;; of forms don't cut it. E.g.:
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; (apply-to-args (return-3d-mouse-coords)
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; (lambda (x y z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; ...))
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (apply-to-args args fn) (apply fn args))
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
(defmacro false-if-exception (expr)
|
|
|
|
|
|
`(catch #t (lambda () ,expr)
|
|
|
|
|
|
(lambda args #f)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {General Properties}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; This is a more modern interface to properties. It will replace all
|
|
|
|
|
|
;; other property-like things eventually.
|
|
|
|
|
|
|
|
|
|
|
|
(define (make-object-property)
|
|
|
|
|
|
(let ((prop (primitive-make-property #f)))
|
|
|
|
|
|
(make-procedure-with-setter
|
|
|
|
|
|
(lambda (obj) (primitive-property-ref prop obj))
|
|
|
|
|
|
(lambda (obj val) (primitive-property-set! prop obj val)))))
|
|
|
|
|
|
|
2001-04-15 22:47:25 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Symbol Properties}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (symbol-property sym prop)
|
|
|
|
|
|
(let ((pair (assoc prop (symbol-pref sym))))
|
|
|
|
|
|
(and pair (cdr pair))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (set-symbol-property! sym prop val)
|
|
|
|
|
|
(let ((pair (assoc prop (symbol-pref sym))))
|
|
|
|
|
|
(if pair
|
|
|
|
|
|
(set-cdr! pair val)
|
|
|
|
|
|
(symbol-pset! sym (acons prop val (symbol-pref sym))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (symbol-property-remove! sym prop)
|
|
|
|
|
|
(let ((pair (assoc prop (symbol-pref sym))))
|
|
|
|
|
|
(if pair
|
|
|
|
|
|
(symbol-pset! sym (delq! pair (symbol-pref sym))))))
|
|
|
|
|
|
|
1997-01-25 18:24:54 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Arrays}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2005-01-10 20:06:03 +00:00
|
|
|
|
(define (array-shape a)
|
|
|
|
|
|
(map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
|
|
|
|
|
|
(array-dimensions a)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Keywords}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (kw-arg-ref args kw)
|
|
|
|
|
|
(let ((rem (member kw args)))
|
|
|
|
|
|
(and rem (pair? (cdr rem)) (cadr rem))))
|
|
|
|
|
|
|
1997-06-04 22:39:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
1997-10-03 00:47:48 +00:00
|
|
|
|
;;; {Structs}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1997-06-04 22:39:09 +00:00
|
|
|
|
|
|
|
|
|
|
(define (struct-layout s)
|
1997-10-03 00:47:48 +00:00
|
|
|
|
(struct-ref (struct-vtable s) vtable-index-layout))
|
1997-06-04 22:39:09 +00:00
|
|
|
|
|
2000-08-11 08:45:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Records}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
1997-06-04 22:39:09 +00:00
|
|
|
|
;; Printing records: by default, records are printed as
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; #<type-name field1: val1 field2: val2 ...>
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; You can change that by giving a custom printing function to
|
|
|
|
|
|
;; MAKE-RECORD-TYPE (after the list of field symbols). This function
|
|
|
|
|
|
;; will be called like
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; (<printer> object port)
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; It should print OBJECT to PORT.
|
|
|
|
|
|
|
1997-10-31 22:16:24 +00:00
|
|
|
|
(define (inherit-print-state old-port new-port)
|
1999-08-24 02:22:18 +00:00
|
|
|
|
(if (get-print-state old-port)
|
|
|
|
|
|
(port-with-print-state new-port (get-print-state old-port))
|
1997-10-31 22:16:24 +00:00
|
|
|
|
new-port))
|
|
|
|
|
|
|
1997-10-03 00:47:48 +00:00
|
|
|
|
;; 0: type-name, 1: fields
|
2001-04-28 19:07:38 +00:00
|
|
|
|
(define record-type-vtable
|
1997-10-03 00:47:48 +00:00
|
|
|
|
(make-vtable-vtable "prpr" 0
|
|
|
|
|
|
(lambda (s p)
|
|
|
|
|
|
(cond ((eq? s record-type-vtable)
|
|
|
|
|
|
(display "#<record-type-vtable>" p))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(display "#<record-type " p)
|
|
|
|
|
|
(display (record-type-name s) p)
|
|
|
|
|
|
(display ">" p))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (record-type? obj)
|
|
|
|
|
|
(and (struct? obj) (eq? record-type-vtable (struct-vtable obj))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (make-record-type type-name fields . opt)
|
1996-10-03 05:47:12 +00:00
|
|
|
|
(let ((printer-fn (and (pair? opt) (car opt))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let ((struct (make-struct record-type-vtable 0
|
1996-10-21 23:53:01 +00:00
|
|
|
|
(make-struct-layout
|
2000-08-27 03:20:19 +00:00
|
|
|
|
(apply string-append
|
1996-10-21 23:53:01 +00:00
|
|
|
|
(map (lambda (f) "pw") fields)))
|
1997-10-03 00:47:48 +00:00
|
|
|
|
(or printer-fn
|
|
|
|
|
|
(lambda (s p)
|
|
|
|
|
|
(display "#<" p)
|
|
|
|
|
|
(display type-name p)
|
|
|
|
|
|
(let loop ((fields fields)
|
|
|
|
|
|
(off 0))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((not (null? fields))
|
|
|
|
|
|
(display " " p)
|
|
|
|
|
|
(display (car fields) p)
|
|
|
|
|
|
(display ": " p)
|
|
|
|
|
|
(display (struct-ref s off) p)
|
|
|
|
|
|
(loop (cdr fields) (+ 1 off)))))
|
|
|
|
|
|
(display ">" p)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
type-name
|
|
|
|
|
|
(copy-tree fields))))
|
1999-03-14 16:46:04 +00:00
|
|
|
|
;; Temporary solution: Associate a name to the record type descriptor
|
|
|
|
|
|
;; so that the object system can create a wrapper class for it.
|
|
|
|
|
|
(set-struct-vtable-name! struct (if (symbol? type-name)
|
|
|
|
|
|
type-name
|
|
|
|
|
|
(string->symbol type-name)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
struct)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (record-type-name obj)
|
|
|
|
|
|
(if (record-type? obj)
|
1997-10-03 00:47:48 +00:00
|
|
|
|
(struct-ref obj vtable-offset-user)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(error 'not-a-record-type obj)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (record-type-fields obj)
|
|
|
|
|
|
(if (record-type? obj)
|
1997-10-03 00:47:48 +00:00
|
|
|
|
(struct-ref obj (+ 1 vtable-offset-user))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(error 'not-a-record-type obj)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (record-constructor rtd . opt)
|
1996-10-03 05:47:12 +00:00
|
|
|
|
(let ((field-names (if (pair? opt) (car opt) (record-type-fields rtd))))
|
2008-09-01 23:43:38 -07:00
|
|
|
|
(primitive-eval
|
|
|
|
|
|
`(lambda ,field-names
|
|
|
|
|
|
(make-struct ',rtd 0 ,@(map (lambda (f)
|
|
|
|
|
|
(if (memq f field-names)
|
|
|
|
|
|
f
|
|
|
|
|
|
#f))
|
|
|
|
|
|
(record-type-fields rtd)))))))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (record-predicate rtd)
|
|
|
|
|
|
(lambda (obj) (and (struct? obj) (eq? rtd (struct-vtable obj)))))
|
|
|
|
|
|
|
2007-08-08 14:56:02 +00:00
|
|
|
|
(define (%record-type-error rtd obj) ;; private helper
|
2006-10-09 22:59:10 +00:00
|
|
|
|
(or (eq? rtd (record-type-descriptor obj))
|
|
|
|
|
|
(scm-error 'wrong-type-arg "%record-type-check"
|
|
|
|
|
|
"Wrong type record (want `~S'): ~S"
|
|
|
|
|
|
(list (record-type-name rtd) obj)
|
|
|
|
|
|
#f)))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (record-accessor rtd field-name)
|
2008-09-01 23:43:38 -07:00
|
|
|
|
(let ((pos (list-index (record-type-fields rtd) field-name)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if (not pos)
|
|
|
|
|
|
(error 'no-such-field field-name))
|
2008-09-01 23:43:38 -07:00
|
|
|
|
(lambda (obj)
|
|
|
|
|
|
(if (eq? (struct-vtable obj) rtd)
|
|
|
|
|
|
(struct-ref obj pos)
|
|
|
|
|
|
(%record-type-error rtd obj)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (record-modifier rtd field-name)
|
2008-09-01 23:43:38 -07:00
|
|
|
|
(let ((pos (list-index (record-type-fields rtd) field-name)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if (not pos)
|
|
|
|
|
|
(error 'no-such-field field-name))
|
2008-09-01 23:43:38 -07:00
|
|
|
|
(lambda (obj val)
|
|
|
|
|
|
(if (eq? (struct-vtable obj) rtd)
|
|
|
|
|
|
(struct-set! obj pos val)
|
|
|
|
|
|
(%record-type-error rtd obj)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (record? obj)
|
|
|
|
|
|
(and (struct? obj) (record-type? (struct-vtable obj))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (record-type-descriptor obj)
|
|
|
|
|
|
(if (struct? obj)
|
|
|
|
|
|
(struct-vtable obj)
|
|
|
|
|
|
(error 'not-a-record obj)))
|
|
|
|
|
|
|
1996-11-02 20:51:30 +00:00
|
|
|
|
(provide 'record)
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Booleans}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (->bool x) (not (not x)))
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Symbols}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (symbol-append . args)
|
2000-08-27 03:20:19 +00:00
|
|
|
|
(string->symbol (apply string-append (map symbol->string args))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (list->symbol . args)
|
|
|
|
|
|
(string->symbol (apply list->string args)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (symbol . args)
|
|
|
|
|
|
(string->symbol (apply string args)))
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Lists}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (list-index l k)
|
|
|
|
|
|
(let loop ((n 0)
|
|
|
|
|
|
(l l))
|
|
|
|
|
|
(and (not (null? l))
|
|
|
|
|
|
(if (eq? (car l) k)
|
|
|
|
|
|
n
|
|
|
|
|
|
(loop (+ n 1) (cdr l))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1999-09-26 16:00:36 +00:00
|
|
|
|
(if (provided? 'posix)
|
2008-09-25 13:46:09 +02:00
|
|
|
|
(primitive-load-path "ice-9/posix"))
|
1996-10-06 06:33:11 +00:00
|
|
|
|
|
1999-09-26 16:00:36 +00:00
|
|
|
|
(if (provided? 'socket)
|
2008-09-25 13:46:09 +02:00
|
|
|
|
(primitive-load-path "ice-9/networking"))
|
1996-10-27 23:26:35 +00:00
|
|
|
|
|
2003-09-15 22:29:32 +00:00
|
|
|
|
;; For reference, Emacs file-exists-p uses stat in this same way.
|
2003-09-12 23:35:54 +00:00
|
|
|
|
;; ENHANCE-ME: Catching an exception from stat is a bit wasteful, do this in
|
|
|
|
|
|
;; C where all that's needed is to inspect the return from stat().
|
1996-10-06 06:33:11 +00:00
|
|
|
|
(define file-exists?
|
1999-09-26 16:00:36 +00:00
|
|
|
|
(if (provided? 'posix)
|
1996-10-06 06:33:11 +00:00
|
|
|
|
(lambda (str)
|
2003-09-12 23:35:54 +00:00
|
|
|
|
(->bool (false-if-exception (stat str))))
|
1996-10-06 06:33:11 +00:00
|
|
|
|
(lambda (str)
|
|
|
|
|
|
(let ((port (catch 'system-error (lambda () (open-file str OPEN_READ))
|
|
|
|
|
|
(lambda args #f))))
|
|
|
|
|
|
(if port (begin (close-port port) #t)
|
|
|
|
|
|
#f)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define file-is-directory?
|
1999-09-26 16:00:36 +00:00
|
|
|
|
(if (provided? 'posix)
|
1996-10-06 06:33:11 +00:00
|
|
|
|
(lambda (str)
|
1996-10-27 23:26:35 +00:00
|
|
|
|
(eq? (stat:type (stat str)) 'directory))
|
1996-10-06 06:33:11 +00:00
|
|
|
|
(lambda (str)
|
|
|
|
|
|
(let ((port (catch 'system-error
|
|
|
|
|
|
(lambda () (open-file (string-append str "/.")
|
|
|
|
|
|
OPEN_READ))
|
|
|
|
|
|
(lambda args #f))))
|
|
|
|
|
|
(if port (begin (close-port port) #t)
|
|
|
|
|
|
#f)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (has-suffix? str suffix)
|
2008-05-19 12:23:46 +02:00
|
|
|
|
(string-suffix? suffix str))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-06-16 20:14:24 +00:00
|
|
|
|
(define (system-error-errno args)
|
|
|
|
|
|
(if (eq? (car args) 'system-error)
|
|
|
|
|
|
(car (list-ref args 4))
|
|
|
|
|
|
#f))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Error Handling}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (error . args)
|
1996-11-02 20:51:30 +00:00
|
|
|
|
(save-stack)
|
1996-09-19 09:04:55 +00:00
|
|
|
|
(if (null? args)
|
* boot-9.scm (error): replace another throw with scm-error. Throw
to 'misc-error instead of 'error (no need to distinguish these.)
Don't set up 'error as a key.
Set up regex-error as a key, if regex is available.
(signal-handler): use scm-error, not throw.
(%try-load, try-load-with-path, %load, load-with-path,
basic-try-load-with-path, basic-load-with-path,
try-load-module-with-path,load-module-with-path): deleted, since
they seem redundant.
(try-load): define using %try-load, not try-load-with-path.
(load): rewritten. load tries to open the file directly and
with a .scm extension before searching the library directories
(should "." be added to %load-path? then load could still open
directly files starting with "/").
(try-module-autoload): use load, not load-with-path.
(%load-indent): deleted, -2 was causing errors.
(%read-sharp): use port-line, not line-number.
1996-09-28 19:38:45 +00:00
|
|
|
|
(scm-error 'misc-error #f "?" #f #f)
|
2000-01-11 18:52:25 +00:00
|
|
|
|
(let loop ((msg "~A")
|
1996-09-19 09:04:55 +00:00
|
|
|
|
(rest (cdr args)))
|
|
|
|
|
|
(if (not (null? rest))
|
2000-01-11 18:52:25 +00:00
|
|
|
|
(loop (string-append msg " ~S")
|
1996-09-19 09:04:55 +00:00
|
|
|
|
(cdr rest))
|
* boot-9.scm (error): replace another throw with scm-error. Throw
to 'misc-error instead of 'error (no need to distinguish these.)
Don't set up 'error as a key.
Set up regex-error as a key, if regex is available.
(signal-handler): use scm-error, not throw.
(%try-load, try-load-with-path, %load, load-with-path,
basic-try-load-with-path, basic-load-with-path,
try-load-module-with-path,load-module-with-path): deleted, since
they seem redundant.
(try-load): define using %try-load, not try-load-with-path.
(load): rewritten. load tries to open the file directly and
with a .scm extension before searching the library directories
(should "." be added to %load-path? then load could still open
directly files starting with "/").
(try-module-autoload): use load, not load-with-path.
(%load-indent): deleted, -2 was causing errors.
(%read-sharp): use port-line, not line-number.
1996-09-28 19:38:45 +00:00
|
|
|
|
(scm-error 'misc-error #f msg args #f)))))
|
1996-09-20 09:02:14 +00:00
|
|
|
|
|
1996-10-05 16:55:06 +00:00
|
|
|
|
;; bad-throw is the hook that is called upon a throw to a an unhandled
|
1996-10-17 21:45:04 +00:00
|
|
|
|
;; key (unless the throw has four arguments, in which case
|
|
|
|
|
|
;; it's usually interpreted as an error throw.)
|
|
|
|
|
|
;; If the key has a default handler (a throw-handler-default property),
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; it is applied to the throw.
|
|
|
|
|
|
;;
|
1996-10-05 16:55:06 +00:00
|
|
|
|
(define (bad-throw key . args)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let ((default (symbol-property key 'throw-handler-default)))
|
|
|
|
|
|
(or (and default (apply default key args))
|
1996-09-19 09:04:55 +00:00
|
|
|
|
(apply error "unhandled-exception:" key args))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
* boot-9.scm: define accessor procedures for the objects returned
by getpw, getgr, gethost, getnet, getproto, getserv (e.g.,
passwd:name, where the first component is the name of the C structure
and the second is the unprefixed C member name.)
* * boot-9.scm (setpwent, setgrent, sethostent, setnetent, setprotoent,
setservent): no longer take an argument, it was bogus.
1997-03-22 18:26:32 +00:00
|
|
|
|
|
1997-04-05 21:58:35 +00:00
|
|
|
|
(define (tm:sec obj) (vector-ref obj 0))
|
|
|
|
|
|
(define (tm:min obj) (vector-ref obj 1))
|
|
|
|
|
|
(define (tm:hour obj) (vector-ref obj 2))
|
|
|
|
|
|
(define (tm:mday obj) (vector-ref obj 3))
|
|
|
|
|
|
(define (tm:mon obj) (vector-ref obj 4))
|
|
|
|
|
|
(define (tm:year obj) (vector-ref obj 5))
|
|
|
|
|
|
(define (tm:wday obj) (vector-ref obj 6))
|
|
|
|
|
|
(define (tm:yday obj) (vector-ref obj 7))
|
|
|
|
|
|
(define (tm:isdst obj) (vector-ref obj 8))
|
|
|
|
|
|
(define (tm:gmtoff obj) (vector-ref obj 9))
|
|
|
|
|
|
(define (tm:zone obj) (vector-ref obj 10))
|
|
|
|
|
|
|
|
|
|
|
|
(define (set-tm:sec obj val) (vector-set! obj 0 val))
|
|
|
|
|
|
(define (set-tm:min obj val) (vector-set! obj 1 val))
|
|
|
|
|
|
(define (set-tm:hour obj val) (vector-set! obj 2 val))
|
|
|
|
|
|
(define (set-tm:mday obj val) (vector-set! obj 3 val))
|
|
|
|
|
|
(define (set-tm:mon obj val) (vector-set! obj 4 val))
|
|
|
|
|
|
(define (set-tm:year obj val) (vector-set! obj 5 val))
|
|
|
|
|
|
(define (set-tm:wday obj val) (vector-set! obj 6 val))
|
|
|
|
|
|
(define (set-tm:yday obj val) (vector-set! obj 7 val))
|
|
|
|
|
|
(define (set-tm:isdst obj val) (vector-set! obj 8 val))
|
|
|
|
|
|
(define (set-tm:gmtoff obj val) (vector-set! obj 9 val))
|
|
|
|
|
|
(define (set-tm:zone obj val) (vector-set! obj 10 val))
|
|
|
|
|
|
|
* stime.h: prototype for scm_times.
* stime.c (scm_times): new procedure.
* ioext.c (scm_fseek): if the first argument is a file descriptor
call lseek.
(scm_ftell): if the first argument is a file descriptor call lseek
(sic).
* filesys.h: prototypes for scm_open_fdes, scm_fsync.
* filesys.c (scm_chmod): if the first argument is a file descriptor,
call fchmod.
(scm_chown): if the first argument is a port or file descriptor,
call fchown.
(scm_truncate_file): new procedure.
Add DEFER/ALLOW INTS to a few other procedures.
(scm_fsync): new procedure.
(scm_open_fdes): new procedure.
(scm_open): use scm_open_fdes. If mode isn't specified, 666 will
now be used.
(scm_fcntl): the first argument can now be a file descriptor. The
third argument is now optional.
* posix.c (scm_execl, scm_execlp): make the filename argument
compulsory, since omitting it causes SEGV.
(scm_sync): return unspecified instead of #f.
(scm_execle): new procedure.
(environ_list_to_c): new procedure.
(scm_environ): use environ_list_to_c. disable interrupts.
(scm_convert_exec_args): take pos and subr arguments and
improve error checking.
* boot-9.scm: define tms accessors: clock, utime, stime, cutime,
cstime.
1997-08-16 18:48:44 +00:00
|
|
|
|
(define (tms:clock obj) (vector-ref obj 0))
|
|
|
|
|
|
(define (tms:utime obj) (vector-ref obj 1))
|
|
|
|
|
|
(define (tms:stime obj) (vector-ref obj 2))
|
|
|
|
|
|
(define (tms:cutime obj) (vector-ref obj 3))
|
|
|
|
|
|
(define (tms:cstime obj) (vector-ref obj 4))
|
|
|
|
|
|
|
2002-06-01 17:14:17 +00:00
|
|
|
|
(define file-position ftell)
|
|
|
|
|
|
(define (file-set-position port offset . whence)
|
|
|
|
|
|
(let ((whence (if (eq? whence '()) SEEK_SET (car whence))))
|
|
|
|
|
|
(seek port offset whence)))
|
1996-08-04 22:32:07 +00:00
|
|
|
|
|
* ioext.h: removed scm_duplicate_port prototype.
* ioext.c (scm_primitive_dup2): return the new file descriptor
instead of SCM_UNSPECIFIED, since similarity to scm_primitive_dup
is convenient.
(scm_fdopen): bug fix: don't try to make port unbuffered until its
stream has been set.
(scm_duplicate_port): deleted, there's now an implementation in
boot-9.scm.
(scm_primitive_dup2): do nothing if newfd == oldfd.
* boot-9.scm (dup->port, dup->inport, dup->outport, dup->fdes,
dup, fdes->inport, fdes->outport, port->fdes): new procedures.
(duplicate-port): was a C primitive, now it's here.
(move->fdes): allow the first argument to be a file descriptor.
Return the modified port or file descriptor (was unspecified.)
1997-07-21 08:52:26 +00:00
|
|
|
|
(define (move->fdes fd/port fd)
|
|
|
|
|
|
(cond ((integer? fd/port)
|
1997-07-29 02:21:08 +00:00
|
|
|
|
(dup->fdes fd/port fd)
|
* ioext.h: removed scm_duplicate_port prototype.
* ioext.c (scm_primitive_dup2): return the new file descriptor
instead of SCM_UNSPECIFIED, since similarity to scm_primitive_dup
is convenient.
(scm_fdopen): bug fix: don't try to make port unbuffered until its
stream has been set.
(scm_duplicate_port): deleted, there's now an implementation in
boot-9.scm.
(scm_primitive_dup2): do nothing if newfd == oldfd.
* boot-9.scm (dup->port, dup->inport, dup->outport, dup->fdes,
dup, fdes->inport, fdes->outport, port->fdes): new procedures.
(duplicate-port): was a C primitive, now it's here.
(move->fdes): allow the first argument to be a file descriptor.
Return the modified port or file descriptor (was unspecified.)
1997-07-21 08:52:26 +00:00
|
|
|
|
(close fd/port)
|
|
|
|
|
|
fd)
|
|
|
|
|
|
(else
|
|
|
|
|
|
(primitive-move->fdes fd/port fd)
|
|
|
|
|
|
(set-port-revealed! fd/port 1)
|
|
|
|
|
|
fd/port)))
|
1996-08-04 22:32:07 +00:00
|
|
|
|
|
|
|
|
|
|
(define (release-port-handle port)
|
|
|
|
|
|
(let ((revealed (port-revealed port)))
|
|
|
|
|
|
(if (> revealed 0)
|
|
|
|
|
|
(set-port-revealed! port (- revealed 1)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* ioext.h: removed scm_duplicate_port prototype.
* ioext.c (scm_primitive_dup2): return the new file descriptor
instead of SCM_UNSPECIFIED, since similarity to scm_primitive_dup
is convenient.
(scm_fdopen): bug fix: don't try to make port unbuffered until its
stream has been set.
(scm_duplicate_port): deleted, there's now an implementation in
boot-9.scm.
(scm_primitive_dup2): do nothing if newfd == oldfd.
* boot-9.scm (dup->port, dup->inport, dup->outport, dup->fdes,
dup, fdes->inport, fdes->outport, port->fdes): new procedures.
(duplicate-port): was a C primitive, now it's here.
(move->fdes): allow the first argument to be a file descriptor.
Return the modified port or file descriptor (was unspecified.)
1997-07-21 08:52:26 +00:00
|
|
|
|
(define (dup->port port/fd mode . maybe-fd)
|
1997-07-29 02:21:08 +00:00
|
|
|
|
(let ((port (fdopen (apply dup->fdes port/fd maybe-fd)
|
* ioext.h: removed scm_duplicate_port prototype.
* ioext.c (scm_primitive_dup2): return the new file descriptor
instead of SCM_UNSPECIFIED, since similarity to scm_primitive_dup
is convenient.
(scm_fdopen): bug fix: don't try to make port unbuffered until its
stream has been set.
(scm_duplicate_port): deleted, there's now an implementation in
boot-9.scm.
(scm_primitive_dup2): do nothing if newfd == oldfd.
* boot-9.scm (dup->port, dup->inport, dup->outport, dup->fdes,
dup, fdes->inport, fdes->outport, port->fdes): new procedures.
(duplicate-port): was a C primitive, now it's here.
(move->fdes): allow the first argument to be a file descriptor.
Return the modified port or file descriptor (was unspecified.)
1997-07-21 08:52:26 +00:00
|
|
|
|
mode)))
|
|
|
|
|
|
(if (pair? maybe-fd)
|
|
|
|
|
|
(set-port-revealed! port 1))
|
|
|
|
|
|
port))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
* ioext.h: removed scm_duplicate_port prototype.
* ioext.c (scm_primitive_dup2): return the new file descriptor
instead of SCM_UNSPECIFIED, since similarity to scm_primitive_dup
is convenient.
(scm_fdopen): bug fix: don't try to make port unbuffered until its
stream has been set.
(scm_duplicate_port): deleted, there's now an implementation in
boot-9.scm.
(scm_primitive_dup2): do nothing if newfd == oldfd.
* boot-9.scm (dup->port, dup->inport, dup->outport, dup->fdes,
dup, fdes->inport, fdes->outport, port->fdes): new procedures.
(duplicate-port): was a C primitive, now it's here.
(move->fdes): allow the first argument to be a file descriptor.
Return the modified port or file descriptor (was unspecified.)
1997-07-21 08:52:26 +00:00
|
|
|
|
(define (dup->inport port/fd . maybe-fd)
|
|
|
|
|
|
(apply dup->port port/fd "r" maybe-fd))
|
|
|
|
|
|
|
|
|
|
|
|
(define (dup->outport port/fd . maybe-fd)
|
|
|
|
|
|
(apply dup->port port/fd "w" maybe-fd))
|
|
|
|
|
|
|
|
|
|
|
|
(define (dup port/fd . maybe-fd)
|
|
|
|
|
|
(if (integer? port/fd)
|
|
|
|
|
|
(apply dup->fdes port/fd maybe-fd)
|
|
|
|
|
|
(apply dup->port port/fd (port-mode port/fd) maybe-fd)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (duplicate-port port modes)
|
|
|
|
|
|
(dup->port port modes))
|
|
|
|
|
|
|
|
|
|
|
|
(define (fdes->inport fdes)
|
|
|
|
|
|
(let loop ((rest-ports (fdes->ports fdes)))
|
|
|
|
|
|
(cond ((null? rest-ports)
|
|
|
|
|
|
(let ((result (fdopen fdes "r")))
|
|
|
|
|
|
(set-port-revealed! result 1)
|
|
|
|
|
|
result))
|
|
|
|
|
|
((input-port? (car rest-ports))
|
|
|
|
|
|
(set-port-revealed! (car rest-ports)
|
|
|
|
|
|
(+ (port-revealed (car rest-ports)) 1))
|
|
|
|
|
|
(car rest-ports))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(loop (cdr rest-ports))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (fdes->outport fdes)
|
|
|
|
|
|
(let loop ((rest-ports (fdes->ports fdes)))
|
|
|
|
|
|
(cond ((null? rest-ports)
|
|
|
|
|
|
(let ((result (fdopen fdes "w")))
|
|
|
|
|
|
(set-port-revealed! result 1)
|
|
|
|
|
|
result))
|
|
|
|
|
|
((output-port? (car rest-ports))
|
|
|
|
|
|
(set-port-revealed! (car rest-ports)
|
|
|
|
|
|
(+ (port-revealed (car rest-ports)) 1))
|
|
|
|
|
|
(car rest-ports))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(loop (cdr rest-ports))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (port->fdes port)
|
|
|
|
|
|
(set-port-revealed! port (+ (port-revealed port) 1))
|
|
|
|
|
|
(fileno port))
|
|
|
|
|
|
|
1997-07-26 20:37:05 +00:00
|
|
|
|
(define (setenv name value)
|
|
|
|
|
|
(if value
|
|
|
|
|
|
(putenv (string-append name "=" value))
|
|
|
|
|
|
(putenv name)))
|
|
|
|
|
|
|
2002-05-09 19:36:30 +00:00
|
|
|
|
(define (unsetenv name)
|
|
|
|
|
|
"Remove the entry for NAME from the environment."
|
|
|
|
|
|
(putenv name))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Load Paths}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;;; Here for backward compatability
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define scheme-file-suffix (lambda () ".scm"))
|
|
|
|
|
|
|
1996-09-05 16:33:42 +00:00
|
|
|
|
(define (in-vicinity vicinity file)
|
|
|
|
|
|
(let ((tail (let ((len (string-length vicinity)))
|
1997-09-20 13:57:22 +00:00
|
|
|
|
(if (zero? len)
|
|
|
|
|
|
#f
|
1996-09-05 16:33:42 +00:00
|
|
|
|
(string-ref vicinity (- len 1))))))
|
|
|
|
|
|
(string-append vicinity
|
1997-09-20 13:57:22 +00:00
|
|
|
|
(if (or (not tail)
|
|
|
|
|
|
(eq? tail #\/))
|
|
|
|
|
|
""
|
|
|
|
|
|
"/")
|
1996-09-05 16:33:42 +00:00
|
|
|
|
file)))
|
1996-08-30 21:09:23 +00:00
|
|
|
|
|
1997-04-19 13:04:38 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1997-04-19 13:04:38 +00:00
|
|
|
|
;;; {Help for scm_shell}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1997-04-19 13:04:38 +00:00
|
|
|
|
;;; The argument-processing code used by Guile-based shells generates
|
|
|
|
|
|
;;; Scheme code based on the argument list. This page contains help
|
|
|
|
|
|
;;; functions for the code it generates.
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1997-04-19 13:04:38 +00:00
|
|
|
|
|
|
|
|
|
|
(define (command-line) (program-arguments))
|
|
|
|
|
|
|
1997-05-15 21:22:25 +00:00
|
|
|
|
;; This is mostly for the internal use of the code generated by
|
|
|
|
|
|
;; scm_compile_shell_switches.
|
2001-11-05 23:09:10 +00:00
|
|
|
|
|
|
|
|
|
|
(define (turn-on-debugging)
|
|
|
|
|
|
(debug-enable 'debug)
|
|
|
|
|
|
(debug-enable 'backtrace)
|
|
|
|
|
|
(read-enable 'positions))
|
2002-02-26 10:57:54 +00:00
|
|
|
|
|
1997-04-19 13:04:38 +00:00
|
|
|
|
(define (load-user-init)
|
2000-05-14 22:15:13 +00:00
|
|
|
|
(let* ((home (or (getenv "HOME")
|
|
|
|
|
|
(false-if-exception (passwd:dir (getpwuid (getuid))))
|
|
|
|
|
|
"/")) ;; fallback for cygwin etc.
|
|
|
|
|
|
(init-file (in-vicinity home ".guile")))
|
|
|
|
|
|
(if (file-exists? init-file)
|
|
|
|
|
|
(primitive-load init-file))))
|
1997-04-19 13:04:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
2008-09-26 12:03:36 +02:00
|
|
|
|
;;; {The interpreter stack}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro start-stack (tag exp)
|
|
|
|
|
|
`(%start-stack ,tag (lambda () ,exp)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-10-29 03:59:35 +00:00
|
|
|
|
;;; {Loading by paths}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1996-10-29 03:59:35 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Load a Scheme source file named NAME, searching for it in the
|
|
|
|
|
|
;;; directories listed in %load-path, and applying each of the file
|
|
|
|
|
|
;;; name extensions listed in %load-extensions.
|
|
|
|
|
|
(define (load-from-path name)
|
|
|
|
|
|
(start-stack 'load-stack
|
1997-03-08 19:02:20 +00:00
|
|
|
|
(primitive-load-path name)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2009-04-24 14:08:32 +02:00
|
|
|
|
(define %load-verbosely #f)
|
|
|
|
|
|
(define (assert-load-verbosity v) (set! %load-verbosely v))
|
|
|
|
|
|
|
|
|
|
|
|
(define (%load-announce file)
|
|
|
|
|
|
(if %load-verbosely
|
|
|
|
|
|
(with-output-to-port (current-error-port)
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(display ";;; ")
|
|
|
|
|
|
(display "loading ")
|
|
|
|
|
|
(display file)
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(force-output)))))
|
|
|
|
|
|
|
|
|
|
|
|
(set! %load-hook %load-announce)
|
|
|
|
|
|
|
|
|
|
|
|
(define (load name . reader)
|
|
|
|
|
|
(with-fluid* current-reader (and (pair? reader) (car reader))
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(start-stack 'load-stack
|
|
|
|
|
|
(primitive-load name)))))
|
* boot-9.scm (error): replace another throw with scm-error. Throw
to 'misc-error instead of 'error (no need to distinguish these.)
Don't set up 'error as a key.
Set up regex-error as a key, if regex is available.
(signal-handler): use scm-error, not throw.
(%try-load, try-load-with-path, %load, load-with-path,
basic-try-load-with-path, basic-load-with-path,
try-load-module-with-path,load-module-with-path): deleted, since
they seem redundant.
(try-load): define using %try-load, not try-load-with-path.
(load): rewritten. load tries to open the file directly and
with a .scm extension before searching the library directories
(should "." be added to %load-path? then load could still open
directly files starting with "/").
(try-module-autoload): use load, not load-with-path.
(%load-indent): deleted, -2 was causing errors.
(%read-sharp): use port-line, not line-number.
1996-09-28 19:38:45 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Transcendental Functions}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Derived from "Transcen.scm", Complex trancendental functions for SCM.
|
1998-01-05 22:10:10 +00:00
|
|
|
|
;;; Written by Jerry D. Hedden, (C) FSF.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; See the file `COPYING' for terms applying to this program.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define expt
|
|
|
|
|
|
(let ((integer-expt integer-expt))
|
|
|
|
|
|
(lambda (z1 z2)
|
2004-09-08 14:34:51 +00:00
|
|
|
|
(cond ((and (exact? z2) (integer? z2))
|
|
|
|
|
|
(integer-expt z1 z2))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
((and (real? z2) (real? z1) (>= z1 0))
|
|
|
|
|
|
($expt z1 z2))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(exp (* z2 (log z1))))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (sinh z)
|
|
|
|
|
|
(if (real? z) ($sinh z)
|
|
|
|
|
|
(let ((x (real-part z)) (y (imag-part z)))
|
|
|
|
|
|
(make-rectangular (* ($sinh x) ($cos y))
|
|
|
|
|
|
(* ($cosh x) ($sin y))))))
|
|
|
|
|
|
(define (cosh z)
|
|
|
|
|
|
(if (real? z) ($cosh z)
|
|
|
|
|
|
(let ((x (real-part z)) (y (imag-part z)))
|
|
|
|
|
|
(make-rectangular (* ($cosh x) ($cos y))
|
|
|
|
|
|
(* ($sinh x) ($sin y))))))
|
|
|
|
|
|
(define (tanh z)
|
|
|
|
|
|
(if (real? z) ($tanh z)
|
|
|
|
|
|
(let* ((x (* 2 (real-part z)))
|
|
|
|
|
|
(y (* 2 (imag-part z)))
|
|
|
|
|
|
(w (+ ($cosh x) ($cos y))))
|
|
|
|
|
|
(make-rectangular (/ ($sinh x) w) (/ ($sin y) w)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (asinh z)
|
|
|
|
|
|
(if (real? z) ($asinh z)
|
|
|
|
|
|
(log (+ z (sqrt (+ (* z z) 1))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (acosh z)
|
|
|
|
|
|
(if (and (real? z) (>= z 1))
|
|
|
|
|
|
($acosh z)
|
|
|
|
|
|
(log (+ z (sqrt (- (* z z) 1))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (atanh z)
|
|
|
|
|
|
(if (and (real? z) (> z -1) (< z 1))
|
|
|
|
|
|
($atanh z)
|
|
|
|
|
|
(/ (log (/ (+ 1 z) (- 1 z))) 2)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (sin z)
|
|
|
|
|
|
(if (real? z) ($sin z)
|
|
|
|
|
|
(let ((x (real-part z)) (y (imag-part z)))
|
|
|
|
|
|
(make-rectangular (* ($sin x) ($cosh y))
|
|
|
|
|
|
(* ($cos x) ($sinh y))))))
|
|
|
|
|
|
(define (cos z)
|
|
|
|
|
|
(if (real? z) ($cos z)
|
|
|
|
|
|
(let ((x (real-part z)) (y (imag-part z)))
|
|
|
|
|
|
(make-rectangular (* ($cos x) ($cosh y))
|
|
|
|
|
|
(- (* ($sin x) ($sinh y)))))))
|
|
|
|
|
|
(define (tan z)
|
|
|
|
|
|
(if (real? z) ($tan z)
|
|
|
|
|
|
(let* ((x (* 2 (real-part z)))
|
|
|
|
|
|
(y (* 2 (imag-part z)))
|
|
|
|
|
|
(w (+ ($cos x) ($cosh y))))
|
|
|
|
|
|
(make-rectangular (/ ($sin x) w) (/ ($sinh y) w)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (asin z)
|
|
|
|
|
|
(if (and (real? z) (>= z -1) (<= z 1))
|
|
|
|
|
|
($asin z)
|
|
|
|
|
|
(* -i (asinh (* +i z)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (acos z)
|
|
|
|
|
|
(if (and (real? z) (>= z -1) (<= z 1))
|
|
|
|
|
|
($acos z)
|
|
|
|
|
|
(+ (/ (angle -1) 2) (* +i (asinh (* +i z))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (atan z . y)
|
|
|
|
|
|
(if (null? y)
|
|
|
|
|
|
(if (real? z) ($atan z)
|
|
|
|
|
|
(/ (log (/ (- +i z) (+ +i z))) +2i))
|
|
|
|
|
|
($atan2 z (car y))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Reader Extensions}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Reader code for various "#c" forms.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
1997-03-08 19:02:20 +00:00
|
|
|
|
(read-hash-extend #\' (lambda (c port)
|
|
|
|
|
|
(read port)))
|
2001-07-06 17:38:40 +00:00
|
|
|
|
|
|
|
|
|
|
(define read-eval? (make-fluid))
|
|
|
|
|
|
(fluid-set! read-eval? #f)
|
|
|
|
|
|
(read-hash-extend #\.
|
|
|
|
|
|
(lambda (c port)
|
|
|
|
|
|
(if (fluid-ref read-eval?)
|
|
|
|
|
|
(eval (read port) (interaction-environment))
|
|
|
|
|
|
(error
|
2001-07-09 14:28:03 +00:00
|
|
|
|
"#. read expansion found and read-eval? is #f."))))
|
1997-03-08 19:02:20 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Command Line Options}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (get-option argv kw-opts kw-args return)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null? argv)
|
|
|
|
|
|
(return #f #f argv))
|
|
|
|
|
|
|
|
|
|
|
|
((or (not (eq? #\- (string-ref (car argv) 0)))
|
|
|
|
|
|
(eq? (string-length (car argv)) 1))
|
|
|
|
|
|
(return 'normal-arg (car argv) (cdr argv)))
|
|
|
|
|
|
|
|
|
|
|
|
((eq? #\- (string-ref (car argv) 1))
|
|
|
|
|
|
(let* ((kw-arg-pos (or (string-index (car argv) #\=)
|
|
|
|
|
|
(string-length (car argv))))
|
|
|
|
|
|
(kw (symbol->keyword (substring (car argv) 2 kw-arg-pos)))
|
|
|
|
|
|
(kw-opt? (member kw kw-opts))
|
|
|
|
|
|
(kw-arg? (member kw kw-args))
|
|
|
|
|
|
(arg (or (and (not (eq? kw-arg-pos (string-length (car argv))))
|
|
|
|
|
|
(substring (car argv)
|
|
|
|
|
|
(+ kw-arg-pos 1)
|
|
|
|
|
|
(string-length (car argv))))
|
|
|
|
|
|
(and kw-arg?
|
|
|
|
|
|
(begin (set! argv (cdr argv)) (car argv))))))
|
|
|
|
|
|
(if (or kw-opt? kw-arg?)
|
|
|
|
|
|
(return kw arg (cdr argv))
|
|
|
|
|
|
(return 'usage-error kw (cdr argv)))))
|
|
|
|
|
|
|
|
|
|
|
|
(else
|
|
|
|
|
|
(let* ((char (substring (car argv) 1 2))
|
|
|
|
|
|
(kw (symbol->keyword char)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
|
|
|
|
|
|
((member kw kw-opts)
|
|
|
|
|
|
(let* ((rest-car (substring (car argv) 2 (string-length (car argv))))
|
|
|
|
|
|
(new-argv (if (= 0 (string-length rest-car))
|
|
|
|
|
|
(cdr argv)
|
|
|
|
|
|
(cons (string-append "-" rest-car) (cdr argv)))))
|
|
|
|
|
|
(return kw #f new-argv)))
|
|
|
|
|
|
|
|
|
|
|
|
((member kw kw-args)
|
|
|
|
|
|
(let* ((rest-car (substring (car argv) 2 (string-length (car argv))))
|
|
|
|
|
|
(arg (if (= 0 (string-length rest-car))
|
|
|
|
|
|
(cadr argv)
|
|
|
|
|
|
rest-car))
|
|
|
|
|
|
(new-argv (if (= 0 (string-length rest-car))
|
|
|
|
|
|
(cddr argv)
|
|
|
|
|
|
(cdr argv))))
|
|
|
|
|
|
(return kw arg new-argv)))
|
|
|
|
|
|
|
|
|
|
|
|
(else (return 'usage-error kw argv)))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (for-next-option proc argv kw-opts kw-args)
|
|
|
|
|
|
(let loop ((argv argv))
|
|
|
|
|
|
(get-option argv kw-opts kw-args
|
|
|
|
|
|
(lambda (opt opt-arg argv)
|
|
|
|
|
|
(and opt (proc opt opt-arg argv loop))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (display-usage-report kw-desc)
|
|
|
|
|
|
(for-each
|
|
|
|
|
|
(lambda (kw)
|
|
|
|
|
|
(or (eq? (car kw) #t)
|
|
|
|
|
|
(eq? (car kw) 'else)
|
|
|
|
|
|
(let* ((opt-desc kw)
|
|
|
|
|
|
(help (cadr opt-desc))
|
|
|
|
|
|
(opts (car opt-desc))
|
|
|
|
|
|
(opts-proper (if (string? (car opts)) (cdr opts) opts))
|
|
|
|
|
|
(arg-name (if (string? (car opts))
|
|
|
|
|
|
(string-append "<" (car opts) ">")
|
|
|
|
|
|
""))
|
|
|
|
|
|
(left-part (string-append
|
|
|
|
|
|
(with-output-to-string
|
|
|
|
|
|
(lambda ()
|
2003-05-03 20:52:31 +00:00
|
|
|
|
(map (lambda (x) (display (keyword->symbol x)) (display " "))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
opts-proper)))
|
|
|
|
|
|
arg-name))
|
1997-09-16 20:16:57 +00:00
|
|
|
|
(middle-part (if (and (< (string-length left-part) 30)
|
|
|
|
|
|
(< (string-length help) 40))
|
|
|
|
|
|
(make-string (- 30 (string-length left-part)) #\ )
|
1996-07-25 22:56:11 +00:00
|
|
|
|
"\n\t")))
|
|
|
|
|
|
(display left-part)
|
|
|
|
|
|
(display middle-part)
|
|
|
|
|
|
(display help)
|
|
|
|
|
|
(newline))))
|
|
|
|
|
|
kw-desc))
|
|
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (transform-usage-lambda cases)
|
|
|
|
|
|
(let* ((raw-usage (delq! 'else (map car cases)))
|
|
|
|
|
|
(usage-sans-specials (map (lambda (x)
|
|
|
|
|
|
(or (and (not (list? x)) x)
|
|
|
|
|
|
(and (symbol? (car x)) #t)
|
|
|
|
|
|
(and (boolean? (car x)) #t)
|
|
|
|
|
|
x))
|
|
|
|
|
|
raw-usage))
|
1996-12-23 04:38:04 +00:00
|
|
|
|
(usage-desc (delq! #t usage-sans-specials))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(kw-desc (map car usage-desc))
|
|
|
|
|
|
(kw-opts (apply append (map (lambda (x) (and (not (string? (car x))) x)) kw-desc)))
|
|
|
|
|
|
(kw-args (apply append (map (lambda (x) (and (string? (car x)) (cdr x))) kw-desc)))
|
|
|
|
|
|
(transmogrified-cases (map (lambda (case)
|
|
|
|
|
|
(cons (let ((opts (car case)))
|
|
|
|
|
|
(if (or (boolean? opts) (eq? 'else opts))
|
|
|
|
|
|
opts
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((symbol? (car opts)) opts)
|
|
|
|
|
|
((boolean? (car opts)) opts)
|
|
|
|
|
|
((string? (caar opts)) (cdar opts))
|
|
|
|
|
|
(else (car opts)))))
|
|
|
|
|
|
(cdr case)))
|
|
|
|
|
|
cases)))
|
|
|
|
|
|
`(let ((%display-usage (lambda () (display-usage-report ',usage-desc))))
|
|
|
|
|
|
(lambda (%argv)
|
|
|
|
|
|
(let %next-arg ((%argv %argv))
|
|
|
|
|
|
(get-option %argv
|
|
|
|
|
|
',kw-opts
|
|
|
|
|
|
',kw-args
|
|
|
|
|
|
(lambda (%opt %arg %new-argv)
|
|
|
|
|
|
(case %opt
|
|
|
|
|
|
,@ transmogrified-cases))))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Low Level Modules}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; These are the low level data structures for modules.
|
|
|
|
|
|
;;;
|
2003-11-16 13:54:26 +00:00
|
|
|
|
;;; Every module object is of the type 'module-type', which is a record
|
|
|
|
|
|
;;; consisting of the following members:
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - eval-closure: the function that defines for its module the strategy that
|
|
|
|
|
|
;;; shall be followed when looking up symbols in the module.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; An eval-closure is a function taking two arguments: the symbol to be
|
|
|
|
|
|
;;; looked up and a boolean value telling whether a binding for the symbol
|
|
|
|
|
|
;;; should be created if it does not exist yet. If the symbol lookup
|
|
|
|
|
|
;;; succeeded (either because an existing binding was found or because a new
|
|
|
|
|
|
;;; binding was created), a variable object representing the binding is
|
|
|
|
|
|
;;; returned. Otherwise, the value #f is returned. Note that the eval
|
|
|
|
|
|
;;; closure does not take the module to be searched as an argument: During
|
|
|
|
|
|
;;; construction of the eval-closure, the eval-closure has to store the
|
|
|
|
|
|
;;; module it belongs to in its environment. This means, that any
|
|
|
|
|
|
;;; eval-closure can belong to only one module.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; The eval-closure of a module can be defined arbitrarily. However, three
|
|
|
|
|
|
;;; special cases of eval-closures are to be distinguished: During startup
|
|
|
|
|
|
;;; the module system is not yet activated. In this phase, no modules are
|
|
|
|
|
|
;;; defined and all bindings are automatically stored by the system in the
|
|
|
|
|
|
;;; pre-modules-obarray. Since no eval-closures exist at this time, the
|
|
|
|
|
|
;;; functions which require an eval-closure as their argument need to be
|
|
|
|
|
|
;;; passed the value #f.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; The other two special cases of eval-closures are the
|
|
|
|
|
|
;;; standard-eval-closure and the standard-interface-eval-closure. Both
|
|
|
|
|
|
;;; behave equally for the case that no new binding is to be created. The
|
|
|
|
|
|
;;; difference between the two comes in, when the boolean argument to the
|
|
|
|
|
|
;;; eval-closure indicates that a new binding shall be created if it is not
|
|
|
|
|
|
;;; found.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Given that no new binding shall be created, both standard eval-closures
|
|
|
|
|
|
;;; define the following standard strategy of searching bindings in the
|
|
|
|
|
|
;;; module: First, the module's obarray is searched for the symbol. Second,
|
|
|
|
|
|
;;; if no binding for the symbol was found in the module's obarray, the
|
|
|
|
|
|
;;; module's binder procedure is exececuted. If this procedure did not
|
|
|
|
|
|
;;; return a binding for the symbol, the modules referenced in the module's
|
|
|
|
|
|
;;; uses list are recursively searched for a binding of the symbol. If the
|
|
|
|
|
|
;;; binding can not be found in these modules also, the symbol lookup has
|
|
|
|
|
|
;;; failed.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; If a new binding shall be created, the standard-interface-eval-closure
|
|
|
|
|
|
;;; immediately returns indicating failure. That is, it does not even try
|
|
|
|
|
|
;;; to look up the symbol. In contrast, the standard-eval-closure would
|
|
|
|
|
|
;;; first search the obarray, and if no binding was found there, would
|
|
|
|
|
|
;;; create a new binding in the obarray, therefore not calling the binder
|
|
|
|
|
|
;;; procedure or searching the modules in the uses list.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; The explanation of the following members obarray, binder and uses
|
|
|
|
|
|
;;; assumes that the symbol lookup follows the strategy that is defined in
|
|
|
|
|
|
;;; the standard-eval-closure and the standard-interface-eval-closure.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - obarray: a hash table that maps symbols to variable objects. In this
|
|
|
|
|
|
;;; hash table, the definitions are found that are local to the module (that
|
|
|
|
|
|
;;; is, not imported from other modules). When looking up bindings in the
|
|
|
|
|
|
;;; module, this hash table is searched first.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - binder: either #f or a function taking a module and a symbol argument.
|
|
|
|
|
|
;;; If it is a function it is called after the obarray has been
|
|
|
|
|
|
;;; unsuccessfully searched for a binding. It then can provide bindings
|
|
|
|
|
|
;;; that would otherwise not be found locally in the module.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - uses: a list of modules from which non-local bindings can be inherited.
|
|
|
|
|
|
;;; These modules are the third place queried for bindings after the obarray
|
|
|
|
|
|
;;; has been unsuccessfully searched and the binder function did not deliver
|
|
|
|
|
|
;;; a result either.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - transformer: either #f or a function taking a scheme expression as
|
|
|
|
|
|
;;; delivered by read. If it is a function, it will be called to perform
|
|
|
|
|
|
;;; syntax transformations (e. g. makro expansion) on the given scheme
|
|
|
|
|
|
;;; expression. The output of the transformer function will then be passed
|
|
|
|
|
|
;;; to Guile's internal memoizer. This means that the output must be valid
|
|
|
|
|
|
;;; scheme code. The only exception is, that the output may make use of the
|
|
|
|
|
|
;;; syntax extensions provided to identify the modules that a binding
|
|
|
|
|
|
;;; belongs to.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - name: the name of the module. This is used for all kinds of printing
|
|
|
|
|
|
;;; outputs. In certain places the module name also serves as a way of
|
|
|
|
|
|
;;; identification. When adding a module to the uses list of another
|
|
|
|
|
|
;;; module, it is made sure that the new uses list will not contain two
|
|
|
|
|
|
;;; modules of the same name.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; - kind: classification of the kind of module. The value is (currently?)
|
|
|
|
|
|
;;; only used for printing. It has no influence on how a module is treated.
|
|
|
|
|
|
;;; Currently the following values are used when setting the module kind:
|
|
|
|
|
|
;;; 'module, 'directory, 'interface, 'custom-interface. If no explicit kind
|
|
|
|
|
|
;;; is set, it defaults to 'module.
|
|
|
|
|
|
;;;
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;;; - duplicates-handlers: a list of procedures that get called to make a
|
|
|
|
|
|
;;; choice between two duplicate bindings when name clashes occur. See the
|
|
|
|
|
|
;;; `duplicate-handlers' global variable below.
|
2003-11-16 13:54:26 +00:00
|
|
|
|
;;;
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;;; - observers: a list of procedures that get called when the module is
|
|
|
|
|
|
;;; modified.
|
2003-11-16 13:54:26 +00:00
|
|
|
|
;;;
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;;; - weak-observers: a weak-key hash table of procedures that get called
|
|
|
|
|
|
;;; when the module is modified. See `module-observe-weak' for details.
|
2003-11-16 13:54:26 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
;;; In addition, the module may (must?) contain a binding for
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;;; `%module-public-interface'. This variable should be bound to a module
|
|
|
|
|
|
;;; representing the exported interface of a module. See the
|
|
|
|
|
|
;;; `module-public-interface' and `module-export!' procedures.
|
2003-11-16 13:54:26 +00:00
|
|
|
|
;;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; !!! warning: The interface to lazy binder procedures is going
|
|
|
|
|
|
;;; to be changed in an incompatible way to permit all the basic
|
|
|
|
|
|
;;; module ops to be virtualized.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; (make-module size use-list lazy-binding-proc) => module
|
|
|
|
|
|
;;; module-{obarray,uses,binder}[|-set!]
|
|
|
|
|
|
;;; (module? obj) => [#t|#f]
|
|
|
|
|
|
;;; (module-locally-bound? module symbol) => [#t|#f]
|
|
|
|
|
|
;;; (module-bound? module symbol) => [#t|#f]
|
|
|
|
|
|
;;; (module-symbol-locally-interned? module symbol) => [#t|#f]
|
|
|
|
|
|
;;; (module-symbol-interned? module symbol) => [#t|#f]
|
|
|
|
|
|
;;; (module-local-variable module symbol) => [#<variable ...> | #f]
|
|
|
|
|
|
;;; (module-variable module symbol) => [#<variable ...> | #f]
|
|
|
|
|
|
;;; (module-symbol-binding module symbol opt-value)
|
|
|
|
|
|
;;; => [ <obj> | opt-value | an error occurs ]
|
|
|
|
|
|
;;; (module-make-local-var! module symbol) => #<variable...>
|
|
|
|
|
|
;;; (module-add! module symbol var) => unspecified
|
|
|
|
|
|
;;; (module-remove! module symbol) => unspecified
|
|
|
|
|
|
;;; (module-for-each proc module) => unspecified
|
|
|
|
|
|
;;; (make-scm-module) => module ; a lazy copy of the symhash module
|
|
|
|
|
|
;;; (set-current-module module) => unspecified
|
|
|
|
|
|
;;; (current-module) => #<module...>
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-10-16 22:29:19 +00:00
|
|
|
|
;;; {Printing Modules}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
|
1996-10-16 22:29:19 +00:00
|
|
|
|
;; This is how modules are printed. You can re-define it.
|
1997-06-04 22:39:09 +00:00
|
|
|
|
;; (Redefining is actually more complicated than simply redefining
|
|
|
|
|
|
;; %print-module because that would only change the binding and not
|
|
|
|
|
|
;; the value stored in the vtable that determines how record are
|
|
|
|
|
|
;; printed. Sigh.)
|
|
|
|
|
|
|
|
|
|
|
|
(define (%print-module mod port) ; unused args: depth length style table)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(display "#<" port)
|
|
|
|
|
|
(display (or (module-kind mod) "module") port)
|
|
|
|
|
|
(let ((name (module-name mod)))
|
|
|
|
|
|
(if name
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(display " " port)
|
|
|
|
|
|
(display name port))))
|
|
|
|
|
|
(display " " port)
|
|
|
|
|
|
(display (number->string (object-address mod) 16) port)
|
|
|
|
|
|
(display ">" port))
|
|
|
|
|
|
|
|
|
|
|
|
;; module-type
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; A module is characterized by an obarray in which local symbols
|
|
|
|
|
|
;; are interned, a list of modules, "uses", from which non-local
|
|
|
|
|
|
;; bindings can be inherited, and an optional lazy-binder which
|
1996-11-21 16:16:46 +00:00
|
|
|
|
;; is a (CLOSURE module symbol) which, as a last resort, can provide
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; bindings that would otherwise not be found locally in the module.
|
|
|
|
|
|
;;
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;; NOTE: If you change anything here, you also need to change
|
|
|
|
|
|
;; libguile/modules.h.
|
2000-08-11 08:45:35 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define module-type
|
1997-09-10 20:07:04 +00:00
|
|
|
|
(make-record-type 'module
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
'(obarray uses binder eval-closure transformer name kind
|
2007-05-05 20:38:57 +00:00
|
|
|
|
duplicates-handlers import-obarray
|
|
|
|
|
|
observers weak-observers)
|
1996-10-16 02:18:33 +00:00
|
|
|
|
%print-module))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-10-16 02:18:33 +00:00
|
|
|
|
;; make-module &opt size uses binder
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;
|
1996-10-16 02:18:33 +00:00
|
|
|
|
;; Create a new module, perhaps with a particular size of obarray,
|
|
|
|
|
|
;; initial uses list, or binding procedure.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;
|
|
|
|
|
|
(define make-module
|
|
|
|
|
|
(lambda args
|
|
|
|
|
|
|
1996-10-16 02:18:33 +00:00
|
|
|
|
(define (parse-arg index default)
|
|
|
|
|
|
(if (> (length args) index)
|
|
|
|
|
|
(list-ref args index)
|
|
|
|
|
|
default))
|
|
|
|
|
|
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(define %default-import-size
|
|
|
|
|
|
;; Typical number of imported bindings actually used by a module.
|
|
|
|
|
|
600)
|
|
|
|
|
|
|
1996-10-16 02:18:33 +00:00
|
|
|
|
(if (> (length args) 3)
|
|
|
|
|
|
(error "Too many args to make-module." args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-02-19 16:16:46 +00:00
|
|
|
|
(let ((size (parse-arg 0 31))
|
1996-10-16 02:18:33 +00:00
|
|
|
|
(uses (parse-arg 1 '()))
|
|
|
|
|
|
(binder (parse-arg 2 #f)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-10-16 02:18:33 +00:00
|
|
|
|
(if (not (integer? size))
|
|
|
|
|
|
(error "Illegal size to make-module." size))
|
|
|
|
|
|
(if (not (and (list? uses)
|
|
|
|
|
|
(and-map module? uses)))
|
|
|
|
|
|
(error "Incorrect use list." uses))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if (and binder (not (procedure? binder)))
|
|
|
|
|
|
(error
|
|
|
|
|
|
"Lazy-binder expected to be a procedure or #f." binder))
|
|
|
|
|
|
|
2003-09-12 15:16:42 +00:00
|
|
|
|
(let ((module (module-constructor (make-hash-table size)
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
uses binder #f %pre-modules-transformer
|
|
|
|
|
|
#f #f #f
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(make-hash-table %default-import-size)
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
'()
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(make-weak-key-hash-table 31))))
|
1996-10-16 02:18:33 +00:00
|
|
|
|
|
|
|
|
|
|
;; We can't pass this as an argument to module-constructor,
|
|
|
|
|
|
;; because we need it to close over a pointer to the module
|
|
|
|
|
|
;; itself.
|
2000-06-04 01:34:27 +00:00
|
|
|
|
(set-module-eval-closure! module (standard-eval-closure module))
|
1996-10-16 02:18:33 +00:00
|
|
|
|
|
|
|
|
|
|
module))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-10-16 02:18:33 +00:00
|
|
|
|
(define module-constructor (record-constructor module-type))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define module-obarray (record-accessor module-type 'obarray))
|
|
|
|
|
|
(define set-module-obarray! (record-modifier module-type 'obarray))
|
|
|
|
|
|
(define module-uses (record-accessor module-type 'uses))
|
|
|
|
|
|
(define set-module-uses! (record-modifier module-type 'uses))
|
|
|
|
|
|
(define module-binder (record-accessor module-type 'binder))
|
|
|
|
|
|
(define set-module-binder! (record-modifier module-type 'binder))
|
1998-11-22 12:03:34 +00:00
|
|
|
|
|
|
|
|
|
|
;; NOTE: This binding is used in libguile/modules.c.
|
1996-11-21 16:16:46 +00:00
|
|
|
|
(define module-eval-closure (record-accessor module-type 'eval-closure))
|
1998-11-22 12:03:34 +00:00
|
|
|
|
|
1997-09-10 20:07:04 +00:00
|
|
|
|
(define module-transformer (record-accessor module-type 'transformer))
|
|
|
|
|
|
(define set-module-transformer! (record-modifier module-type 'transformer))
|
2009-04-24 13:50:14 +02:00
|
|
|
|
;; (define module-name (record-accessor module-type 'name)) wait until mods are booted
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define set-module-name! (record-modifier module-type 'name))
|
|
|
|
|
|
(define module-kind (record-accessor module-type 'kind))
|
|
|
|
|
|
(define set-module-kind! (record-modifier module-type 'kind))
|
2003-03-12 14:30:03 +00:00
|
|
|
|
(define module-duplicates-handlers
|
|
|
|
|
|
(record-accessor module-type 'duplicates-handlers))
|
|
|
|
|
|
(define set-module-duplicates-handlers!
|
|
|
|
|
|
(record-modifier module-type 'duplicates-handlers))
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
(define module-observers (record-accessor module-type 'observers))
|
|
|
|
|
|
(define set-module-observers! (record-modifier module-type 'observers))
|
|
|
|
|
|
(define module-weak-observers (record-accessor module-type 'weak-observers))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define module? (record-predicate module-type))
|
|
|
|
|
|
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(define module-import-obarray (record-accessor module-type 'import-obarray))
|
|
|
|
|
|
|
1999-03-12 09:48:18 +00:00
|
|
|
|
(define set-module-eval-closure!
|
|
|
|
|
|
(let ((setter (record-modifier module-type 'eval-closure)))
|
|
|
|
|
|
(lambda (module closure)
|
|
|
|
|
|
(setter module closure)
|
2005-07-31 23:36:50 +00:00
|
|
|
|
;; Make it possible to lookup the module from the environment.
|
|
|
|
|
|
;; This implementation is correct since an eval closure can belong
|
|
|
|
|
|
;; to maximally one module.
|
|
|
|
|
|
(set-procedure-property! closure 'module module))))
|
1996-10-16 02:18:33 +00:00
|
|
|
|
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
;;; {Observer protocol}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-observe module proc)
|
|
|
|
|
|
(set-module-observers! module (cons proc (module-observers module)))
|
|
|
|
|
|
(cons module proc))
|
|
|
|
|
|
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(define (module-observe-weak module observer-id . proc)
|
|
|
|
|
|
;; Register PROC as an observer of MODULE under name OBSERVER-ID (which can
|
|
|
|
|
|
;; be any Scheme object). PROC is invoked and passed MODULE any time
|
|
|
|
|
|
;; MODULE is modified. PROC gets unregistered when OBSERVER-ID gets GC'd
|
|
|
|
|
|
;; (thus, it is never unregistered if OBSERVER-ID is an immediate value,
|
|
|
|
|
|
;; for instance).
|
|
|
|
|
|
|
|
|
|
|
|
;; The two-argument version is kept for backward compatibility: when called
|
|
|
|
|
|
;; with two arguments, the observer gets unregistered when closure PROC
|
|
|
|
|
|
;; gets GC'd (making it impossible to use an anonymous lambda for PROC).
|
|
|
|
|
|
|
|
|
|
|
|
(let ((proc (if (null? proc) observer-id (car proc))))
|
|
|
|
|
|
(hashq-set! (module-weak-observers module) observer-id proc)))
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
|
|
|
|
|
|
(define (module-unobserve token)
|
|
|
|
|
|
(let ((module (car token))
|
|
|
|
|
|
(id (cdr token)))
|
|
|
|
|
|
(if (integer? id)
|
|
|
|
|
|
(hash-remove! (module-weak-observers module) id)
|
|
|
|
|
|
(set-module-observers! module (delq1! id (module-observers module)))))
|
|
|
|
|
|
*unspecified*)
|
|
|
|
|
|
|
2003-03-12 14:11:42 +00:00
|
|
|
|
(define module-defer-observers #f)
|
2009-02-20 14:23:55 +01:00
|
|
|
|
(define module-defer-observers-mutex (make-mutex 'recursive))
|
2003-03-12 14:11:42 +00:00
|
|
|
|
(define module-defer-observers-table (make-hash-table))
|
|
|
|
|
|
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(define (module-modified m)
|
2003-03-12 14:11:42 +00:00
|
|
|
|
(if module-defer-observers
|
|
|
|
|
|
(hash-set! module-defer-observers-table m #t)
|
|
|
|
|
|
(module-call-observers m)))
|
|
|
|
|
|
|
|
|
|
|
|
;;; This function can be used to delay calls to observers so that they
|
|
|
|
|
|
;;; can be called once only in the face of massive updating of modules.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
(define (call-with-deferred-observers thunk)
|
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(lock-mutex module-defer-observers-mutex)
|
|
|
|
|
|
(set! module-defer-observers #t))
|
|
|
|
|
|
thunk
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(set! module-defer-observers #f)
|
|
|
|
|
|
(hash-for-each (lambda (m dummy)
|
|
|
|
|
|
(module-call-observers m))
|
|
|
|
|
|
module-defer-observers-table)
|
|
|
|
|
|
(hash-clear! module-defer-observers-table)
|
|
|
|
|
|
(unlock-mutex module-defer-observers-mutex))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-call-observers m)
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
(for-each (lambda (proc) (proc m)) (module-observers m))
|
2007-05-05 20:38:57 +00:00
|
|
|
|
|
|
|
|
|
|
;; We assume that weak observers don't (un)register themselves as they are
|
|
|
|
|
|
;; called since this would preclude proper iteration over the hash table
|
|
|
|
|
|
;; elements.
|
|
|
|
|
|
(hash-for-each (lambda (id proc) (proc m)) (module-weak-observers m)))
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Module Searching in General}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; We sometimes want to look for properties of a symbol
|
|
|
|
|
|
;;; just within the obarray of one module. If the property
|
|
|
|
|
|
;;; holds, then it is said to hold ``locally'' as in, ``The symbol
|
|
|
|
|
|
;;; DISPLAY is locally rebound in the module `safe-guile'.''
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Other times, we want to test for a symbol property in the obarray
|
|
|
|
|
|
;;; of M and, if it is not found there, try each of the modules in the
|
|
|
|
|
|
;;; uses list of M. This is the normal way of testing for some
|
|
|
|
|
|
;;; property, so we state these properties without qualification as
|
|
|
|
|
|
;;; in: ``The symbol 'fnord is interned in module M because it is
|
|
|
|
|
|
;;; interned locally in module M2 which is a member of the uses list
|
|
|
|
|
|
;;; of M.''
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; module-search fn m
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; return the first non-#f result of FN applied to M and then to
|
|
|
|
|
|
;; the modules in the uses of m, and so on recursively. If all applications
|
|
|
|
|
|
;; return #f, then so does this function.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-search fn m v)
|
|
|
|
|
|
(define (loop pos)
|
|
|
|
|
|
(and (pair? pos)
|
|
|
|
|
|
(or (module-search fn (car pos) v)
|
|
|
|
|
|
(loop (cdr pos)))))
|
|
|
|
|
|
(or (fn m v)
|
|
|
|
|
|
(loop (module-uses m))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Is a symbol bound in a module?}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Symbol S in Module M is bound if S is interned in M and if the binding
|
|
|
|
|
|
;;; of S in M has been set to some well-defined value.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; module-locally-bound? module symbol
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Is a symbol bound (interned and defined) locally in a given module?
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-locally-bound? m v)
|
|
|
|
|
|
(let ((var (module-local-variable m v)))
|
|
|
|
|
|
(and var
|
|
|
|
|
|
(variable-bound? var))))
|
|
|
|
|
|
|
|
|
|
|
|
;; module-bound? module symbol
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Is a symbol bound (interned and defined) anywhere in a given module
|
|
|
|
|
|
;; or its uses?
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-bound? m v)
|
2009-04-26 11:35:23 +02:00
|
|
|
|
(let ((var (module-variable m v)))
|
|
|
|
|
|
(and var
|
|
|
|
|
|
(variable-bound? var))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
;;; {Is a symbol interned in a module?}
|
|
|
|
|
|
;;;
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; Symbol S in Module M is interned if S occurs in
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; of S in M has been set to some well-defined value.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; It is possible to intern a symbol in a module without providing
|
|
|
|
|
|
;;; an initial binding for the corresponding variable. This is done
|
|
|
|
|
|
;;; with:
|
|
|
|
|
|
;;; (module-add! module symbol (make-undefined-variable))
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; In that case, the symbol is interned in the module, but not
|
|
|
|
|
|
;;; bound there. The unbound symbol shadows any binding for that
|
|
|
|
|
|
;;; symbol that might otherwise be inherited from a member of the uses list.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-obarray-get-handle ob key)
|
|
|
|
|
|
((if (symbol? key) hashq-get-handle hash-get-handle) ob key))
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-obarray-ref ob key)
|
|
|
|
|
|
((if (symbol? key) hashq-ref hash-ref) ob key))
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-obarray-set! ob key val)
|
|
|
|
|
|
((if (symbol? key) hashq-set! hash-set!) ob key val))
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-obarray-remove! ob key)
|
|
|
|
|
|
((if (symbol? key) hashq-remove! hash-remove!) ob key))
|
|
|
|
|
|
|
|
|
|
|
|
;; module-symbol-locally-interned? module symbol
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; is a symbol interned (not neccessarily defined) locally in a given module
|
|
|
|
|
|
;; or its uses? Interned symbols shadow inherited bindings even if
|
|
|
|
|
|
;; they are not themselves bound to a defined value.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-symbol-locally-interned? m v)
|
|
|
|
|
|
(not (not (module-obarray-get-handle (module-obarray m) v))))
|
|
|
|
|
|
|
|
|
|
|
|
;; module-symbol-interned? module symbol
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; is a symbol interned (not neccessarily defined) anywhere in a given module
|
|
|
|
|
|
;; or its uses? Interned symbols shadow inherited bindings even if
|
|
|
|
|
|
;; they are not themselves bound to a defined value.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-symbol-interned? m v)
|
|
|
|
|
|
(module-search module-symbol-locally-interned? m v))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Mapping modules x symbols --> variables}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; module-local-variable module symbol
|
|
|
|
|
|
;; return the local variable associated with a MODULE and SYMBOL.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;;; This function is very important. It is the only function that can
|
|
|
|
|
|
;;; return a variable from a module other than the mutators that store
|
|
|
|
|
|
;;; new variables in modules. Therefore, this function is the location
|
|
|
|
|
|
;;; of the "lazy binder" hack.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; If symbol is defined in MODULE, and if the definition binds symbol
|
|
|
|
|
|
;;; to a variable, return that variable object.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; If the symbols is not found at first, but the module has a lazy binder,
|
|
|
|
|
|
;;; then try the binder.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; If the symbol is not found at all, return #f.
|
|
|
|
|
|
;;;
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;;; (This is now written in C, see `modules.c'.)
|
|
|
|
|
|
;;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
;;; {Mapping modules x symbols --> bindings}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; These are similar to the mapping to variables, except that the
|
|
|
|
|
|
;;; variable is dereferenced.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; module-symbol-binding module symbol opt-value
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; return the binding of a variable specified by name within
|
|
|
|
|
|
;; a given module, signalling an error if the variable is unbound.
|
|
|
|
|
|
;; If the OPT-VALUE is passed, then instead of signalling an error,
|
|
|
|
|
|
;; return OPT-VALUE.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-symbol-local-binding m v . opt-val)
|
|
|
|
|
|
(let ((var (module-local-variable m v)))
|
2003-03-07 13:12:47 +00:00
|
|
|
|
(if (and var (variable-bound? var))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(variable-ref var)
|
|
|
|
|
|
(if (not (null? opt-val))
|
|
|
|
|
|
(car opt-val)
|
|
|
|
|
|
(error "Locally unbound variable." v)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; module-symbol-binding module symbol opt-value
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; return the binding of a variable specified by name within
|
|
|
|
|
|
;; a given module, signalling an error if the variable is unbound.
|
|
|
|
|
|
;; If the OPT-VALUE is passed, then instead of signalling an error,
|
|
|
|
|
|
;; return OPT-VALUE.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-symbol-binding m v . opt-val)
|
|
|
|
|
|
(let ((var (module-variable m v)))
|
2003-03-07 13:12:47 +00:00
|
|
|
|
(if (and var (variable-bound? var))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(variable-ref var)
|
|
|
|
|
|
(if (not (null? opt-val))
|
|
|
|
|
|
(car opt-val)
|
|
|
|
|
|
(error "Unbound variable." v)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Adding Variables to Modules}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; module-make-local-var! module symbol
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; ensure a variable for V in the local namespace of M.
|
|
|
|
|
|
;; If no variable was already there, then create a new and uninitialzied
|
|
|
|
|
|
;; variable.
|
|
|
|
|
|
;;
|
2003-03-12 14:11:42 +00:00
|
|
|
|
;; This function is used in modules.c.
|
|
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (module-make-local-var! m v)
|
|
|
|
|
|
(or (let ((b (module-obarray-ref (module-obarray m) v)))
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
(and (variable? b)
|
|
|
|
|
|
(begin
|
2003-03-12 14:11:42 +00:00
|
|
|
|
;; Mark as modified since this function is called when
|
|
|
|
|
|
;; the standard eval closure defines a binding
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(module-modified m)
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
b)))
|
2004-12-22 14:50:56 +00:00
|
|
|
|
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;; Create a new local variable.
|
|
|
|
|
|
(let ((local-var (make-undefined-variable)))
|
|
|
|
|
|
(module-add! m v local-var)
|
|
|
|
|
|
local-var)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-06-04 22:14:16 +00:00
|
|
|
|
;; module-ensure-local-variable! module symbol
|
2001-06-02 18:33:25 +00:00
|
|
|
|
;;
|
2001-06-04 22:14:16 +00:00
|
|
|
|
;; Ensure that there is a local variable in MODULE for SYMBOL. If
|
|
|
|
|
|
;; there is no binding for SYMBOL, create a new uninitialized
|
|
|
|
|
|
;; variable. Return the local variable.
|
2001-06-02 18:33:25 +00:00
|
|
|
|
;;
|
2001-06-04 22:14:16 +00:00
|
|
|
|
(define (module-ensure-local-variable! module symbol)
|
|
|
|
|
|
(or (module-local-variable module symbol)
|
2001-06-02 18:33:25 +00:00
|
|
|
|
(let ((var (make-undefined-variable)))
|
|
|
|
|
|
(module-add! module symbol var)
|
|
|
|
|
|
var)))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; module-add! module symbol var
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; ensure a particular variable for V in the local namespace of M.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-add! m v var)
|
|
|
|
|
|
(if (not (variable? var))
|
|
|
|
|
|
(error "Bad variable to module-add!" var))
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
(module-obarray-set! (module-obarray m) v var)
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(module-modified m))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;; module-remove!
|
|
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; make sure that a symbol is undefined in the local namespace of M.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-remove! m v)
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
(module-obarray-remove! (module-obarray m) v)
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(module-modified m))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (module-clear! m)
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
(hash-clear! (module-obarray m))
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(module-modified m))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
;; MODULE-FOR-EACH -- exported
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; Call PROC on each symbol in MODULE, with arguments of (SYMBOL VARIABLE).
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-for-each proc module)
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
(hash-for-each proc (module-obarray module)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (module-map proc module)
|
2004-02-13 23:15:37 +00:00
|
|
|
|
(hash-map->list proc (module-obarray module)))
|
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
2003-02-19 15:04:51 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Low Level Bootstrapping}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;; make-root-module
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:59:42 +00:00
|
|
|
|
;; A root module uses the pre-modules-obarray as its obarray. This
|
|
|
|
|
|
;; special obarray accumulates all bindings that have been established
|
|
|
|
|
|
;; before the module system is fully booted.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;
|
2001-05-15 14:59:42 +00:00
|
|
|
|
;; (The obarray continues to be used by code that has been closed over
|
|
|
|
|
|
;; before the module system has been booted.)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (make-root-module)
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(let ((m (make-module 0)))
|
|
|
|
|
|
(set-module-obarray! m (%get-pre-modules-obarray))
|
|
|
|
|
|
m))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 19:33:43 +00:00
|
|
|
|
;; make-scm-module
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:59:42 +00:00
|
|
|
|
;; The root interface is a module that uses the same obarray as the
|
|
|
|
|
|
;; root module. It does not allow new definitions, tho.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-06-04 01:34:27 +00:00
|
|
|
|
(define (make-scm-module)
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(let ((m (make-module 0)))
|
|
|
|
|
|
(set-module-obarray! m (%get-pre-modules-obarray))
|
|
|
|
|
|
(set-module-eval-closure! m (standard-interface-eval-closure m))
|
|
|
|
|
|
m))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Module-based Loading}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (save-module-excursion thunk)
|
|
|
|
|
|
(let ((inner-module (current-module))
|
|
|
|
|
|
(outer-module #f))
|
|
|
|
|
|
(dynamic-wind (lambda ()
|
|
|
|
|
|
(set! outer-module (current-module))
|
|
|
|
|
|
(set-current-module inner-module)
|
|
|
|
|
|
(set! inner-module #f))
|
|
|
|
|
|
thunk
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(set! inner-module (current-module))
|
|
|
|
|
|
(set-current-module outer-module)
|
|
|
|
|
|
(set! outer-module #f)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define basic-load load)
|
|
|
|
|
|
|
2005-12-14 00:21:11 +00:00
|
|
|
|
(define (load-module filename . reader)
|
1998-06-18 23:59:24 +00:00
|
|
|
|
(save-module-excursion
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(let ((oldname (and (current-load-port)
|
|
|
|
|
|
(port-filename (current-load-port)))))
|
2005-12-14 00:21:11 +00:00
|
|
|
|
(apply basic-load
|
|
|
|
|
|
(if (and oldname
|
|
|
|
|
|
(> (string-length filename) 0)
|
|
|
|
|
|
(not (char=? (string-ref filename 0) #\/))
|
|
|
|
|
|
(not (string=? (dirname oldname) ".")))
|
|
|
|
|
|
(string-append (dirname oldname) "/" filename)
|
|
|
|
|
|
filename)
|
|
|
|
|
|
reader)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-10-16 22:29:19 +00:00
|
|
|
|
;;; {MODULE-REF -- exported}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; Returns the value of a variable called NAME in MODULE or any of its
|
|
|
|
|
|
;; used modules. If there is no such variable, then if the optional third
|
|
|
|
|
|
;; argument DEFAULT is present, it is returned; otherwise an error is signaled.
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (module-ref module name . rest)
|
|
|
|
|
|
(let ((variable (module-variable module name)))
|
|
|
|
|
|
(if (and variable (variable-bound? variable))
|
|
|
|
|
|
(variable-ref variable)
|
|
|
|
|
|
(if (null? rest)
|
|
|
|
|
|
(error "No variable named" name 'in module)
|
|
|
|
|
|
(car rest) ; default value
|
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
|
|
;; MODULE-SET! -- exported
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Sets the variable called NAME in MODULE (or in a module that MODULE uses)
|
|
|
|
|
|
;; to VALUE; if there is no such variable, an error is signaled.
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (module-set! module name value)
|
|
|
|
|
|
(let ((variable (module-variable module name)))
|
|
|
|
|
|
(if variable
|
|
|
|
|
|
(variable-set! variable value)
|
|
|
|
|
|
(error "No variable named" name 'in module))))
|
|
|
|
|
|
|
|
|
|
|
|
;; MODULE-DEFINE! -- exported
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Sets the variable called NAME in MODULE to VALUE; if there is no such
|
|
|
|
|
|
;; variable, it is added first.
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (module-define! module name value)
|
|
|
|
|
|
(let ((variable (module-local-variable module name)))
|
|
|
|
|
|
(if variable
|
GOOPS needs the observer protocol specified for the new module
system. Here's a simple version for the old module system:
* boot-9.scm (module-observers, module-weak-observers,
module-observer-id, set-module-observers!,
set-module-observer-id!): New accessors.
(module-type): Added slots `observers', `weak-observers' and
`observer-id'.
(module-observe, module-observe-weak, module-unobserve,
module-modified!): New procedures.
(module-make-local-var!, module-add!, module-remove!,
module-clear!, module-define!, module-use!): Call module-modified!.
1999-08-05 12:05:57 +00:00
|
|
|
|
(begin
|
|
|
|
|
|
(variable-set! variable value)
|
1999-08-05 17:56:15 +00:00
|
|
|
|
(module-modified module))
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(let ((variable (make-variable value)))
|
|
|
|
|
|
(module-add! module name variable)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1997-02-27 15:36:04 +00:00
|
|
|
|
;; MODULE-DEFINED? -- exported
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Return #t iff NAME is defined in MODULE (or in a module that MODULE
|
|
|
|
|
|
;; uses)
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-defined? module name)
|
|
|
|
|
|
(let ((variable (module-variable module name)))
|
|
|
|
|
|
(and variable (variable-bound? variable))))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; MODULE-USE! module interface
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Add INTERFACE to the list of interfaces used by MODULE.
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (module-use! module interface)
|
2009-03-18 00:44:26 +01:00
|
|
|
|
(if (not (or (eq? module interface)
|
|
|
|
|
|
(memq interface (module-uses module))))
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(begin
|
|
|
|
|
|
;; Newly used modules must be appended rather than consed, so that
|
|
|
|
|
|
;; `module-variable' traverses the use list starting from the first
|
|
|
|
|
|
;; used module.
|
|
|
|
|
|
(set-module-uses! module
|
|
|
|
|
|
(append (filter (lambda (m)
|
|
|
|
|
|
(not
|
|
|
|
|
|
(equal? (module-name m)
|
|
|
|
|
|
(module-name interface))))
|
|
|
|
|
|
(module-uses module))
|
|
|
|
|
|
(list interface)))
|
|
|
|
|
|
|
|
|
|
|
|
(module-modified module))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-03-07 13:12:47 +00:00
|
|
|
|
;; MODULE-USE-INTERFACES! module interfaces
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Same as MODULE-USE! but add multiple interfaces and check for duplicates
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-use-interfaces! module interfaces)
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(set-module-uses! module
|
|
|
|
|
|
(append (module-uses module) interfaces))
|
|
|
|
|
|
(module-modified module))
|
2003-03-07 13:12:47 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Recursive Namespaces}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; A hierarchical namespace emerges if we consider some module to be
|
|
|
|
|
|
;;; root, and variables bound to modules as nested namespaces.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; The routines in this file manage variable names in hierarchical namespace.
|
|
|
|
|
|
;;; Each variable name is a list of elements, looked up in successively nested
|
|
|
|
|
|
;;; modules.
|
|
|
|
|
|
;;;
|
1996-09-13 03:02:38 +00:00
|
|
|
|
;;; (nested-ref some-root-module '(foo bar baz))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; => <value of a variable named baz in the module bound to bar in
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; the module bound to foo in some-root-module>
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; There are:
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; ;; a-root is a module
|
|
|
|
|
|
;;; ;; name is a list of symbols
|
|
|
|
|
|
;;;
|
1996-09-13 03:02:38 +00:00
|
|
|
|
;;; nested-ref a-root name
|
|
|
|
|
|
;;; nested-set! a-root name val
|
|
|
|
|
|
;;; nested-define! a-root name val
|
|
|
|
|
|
;;; nested-remove! a-root name
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; (current-module) is a natural choice for a-root so for convenience there are
|
|
|
|
|
|
;;; also:
|
|
|
|
|
|
;;;
|
1996-09-13 03:02:38 +00:00
|
|
|
|
;;; local-ref name == nested-ref (current-module) name
|
|
|
|
|
|
;;; local-set! name val == nested-set! (current-module) name val
|
|
|
|
|
|
;;; local-define! name val == nested-define! (current-module) name val
|
|
|
|
|
|
;;; local-remove! name == nested-remove! (current-module) name
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-09-13 03:02:38 +00:00
|
|
|
|
(define (nested-ref root names)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let loop ((cur root)
|
|
|
|
|
|
(elts names))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null? elts) cur)
|
|
|
|
|
|
((not (module? cur)) #f)
|
|
|
|
|
|
(else (loop (module-ref cur (car elts) #f) (cdr elts))))))
|
|
|
|
|
|
|
1996-09-13 03:02:38 +00:00
|
|
|
|
(define (nested-set! root names val)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let loop ((cur root)
|
|
|
|
|
|
(elts names))
|
|
|
|
|
|
(if (null? (cdr elts))
|
|
|
|
|
|
(module-set! cur (car elts) val)
|
|
|
|
|
|
(loop (module-ref cur (car elts)) (cdr elts)))))
|
|
|
|
|
|
|
1996-09-13 03:02:38 +00:00
|
|
|
|
(define (nested-define! root names val)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let loop ((cur root)
|
|
|
|
|
|
(elts names))
|
|
|
|
|
|
(if (null? (cdr elts))
|
|
|
|
|
|
(module-define! cur (car elts) val)
|
|
|
|
|
|
(loop (module-ref cur (car elts)) (cdr elts)))))
|
|
|
|
|
|
|
1996-09-13 03:02:38 +00:00
|
|
|
|
(define (nested-remove! root names)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(let loop ((cur root)
|
|
|
|
|
|
(elts names))
|
|
|
|
|
|
(if (null? (cdr elts))
|
|
|
|
|
|
(module-remove! cur (car elts))
|
|
|
|
|
|
(loop (module-ref cur (car elts)) (cdr elts)))))
|
|
|
|
|
|
|
1996-09-13 03:02:38 +00:00
|
|
|
|
(define (local-ref names) (nested-ref (current-module) names))
|
|
|
|
|
|
(define (local-set! names val) (nested-set! (current-module) names val))
|
|
|
|
|
|
(define (local-define names val) (nested-define! (current-module) names val))
|
|
|
|
|
|
(define (local-remove names) (nested-remove! (current-module) names))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
2004-12-01 00:02:24 +00:00
|
|
|
|
;;; {The (%app) module}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
;;; The root of conventionally named objects not directly in the top level.
|
|
|
|
|
|
;;;
|
2004-12-01 00:02:24 +00:00
|
|
|
|
;;; (%app modules)
|
|
|
|
|
|
;;; (%app modules guile)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
;;; The directory of all modules and the standard root module.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2008-09-29 21:36:25 +02:00
|
|
|
|
;; module-public-interface is defined in C.
|
1999-03-12 09:48:18 +00:00
|
|
|
|
(define (set-module-public-interface! m i)
|
|
|
|
|
|
(module-define! m '%module-public-interface i))
|
|
|
|
|
|
(define (set-system-module! m s)
|
|
|
|
|
|
(set-procedure-property! (module-eval-closure m) 'system-module s))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define the-root-module (make-root-module))
|
|
|
|
|
|
(define the-scm-module (make-scm-module))
|
|
|
|
|
|
(set-module-public-interface! the-root-module the-scm-module)
|
2000-06-11 18:29:57 +00:00
|
|
|
|
(set-module-name! the-root-module '(guile))
|
|
|
|
|
|
(set-module-name! the-scm-module '(guile))
|
|
|
|
|
|
(set-module-kind! the-scm-module 'interface)
|
2009-03-06 16:57:17 +01:00
|
|
|
|
(set-system-module! the-root-module #t)
|
|
|
|
|
|
(set-system-module! the-scm-module #t)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:59:42 +00:00
|
|
|
|
;; NOTE: This binding is used in libguile/modules.c.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (make-modules-in module name)
|
|
|
|
|
|
(if (null? name)
|
|
|
|
|
|
module
|
runtime byte compilation of goops methods, whooooo
* ice-9/boot-9.scm (make-modules-in): Change to make sure that we are
making modules in modules; that is, that a global binding of `compile'
doesn't prevent a module from importing a submodule named `compile'.
(resolve-module): Clean up a bit, and serialize the logic.
* libguile/objects.c (scm_mcache_lookup_cmethod, scm_apply_generic):
* libguile/eval.i.c (CEVAL): Now that cmethod entries can have a program
as their tail instead of a memoized proc, we have to change the halting
condition on the method cache search, in both places: the one that's
inlined into eval.i.c and the one in objects.c. If the cmethod isn't a
pair, apply it.
* libguile/goops.c (make): In the `make' procedure that's used before
GOOPS is booted, bind #:formals, #:body, and #:compile-env on methods.
* oop/goops/compile.scm (compute-entry-with-cmethod): There was a
terrible trick here that involved putting a dummy pair in the cache,
then modifying it in place with the result of memoization. The note
claimed that this was to cut recursion short, or something. I can't see
how it could recurse, given that `methods' is changing each time. Also,
the pair trick doesn't work with byte-compiled methods. So, remove it.
(compile-method): Dispatch to the appropriate method compiler, based on
whether the method was defined with the interpreter or with the
compiler.
(make-next-method): New function, generically computes a `next-method'
procedure, though the caller has to supply the arguments.
(compile-method/vm): Exciting method byte compiler!
(make-make-next-method/memoizer, compile-method/memoizer): Add the
/memoizer suffix, and move all this code to the bottom of the file.
2008-10-30 13:42:40 +01:00
|
|
|
|
(make-modules-in
|
|
|
|
|
|
(let* ((var (module-local-variable module (car name)))
|
|
|
|
|
|
(val (and var (variable-bound? var) (variable-ref var))))
|
|
|
|
|
|
(if (module? val)
|
|
|
|
|
|
val
|
|
|
|
|
|
(let ((m (make-module 31)))
|
|
|
|
|
|
(set-module-kind! m 'directory)
|
|
|
|
|
|
(set-module-name! m (append (or (module-name module) '())
|
|
|
|
|
|
(list (car name))))
|
|
|
|
|
|
(module-define! module (car name) m)
|
|
|
|
|
|
m)))
|
|
|
|
|
|
(cdr name))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(define (beautify-user-module! module)
|
|
|
|
|
|
(let ((interface (module-public-interface module)))
|
|
|
|
|
|
(if (or (not interface)
|
|
|
|
|
|
(eq? interface module))
|
|
|
|
|
|
(let ((interface (make-module 31)))
|
|
|
|
|
|
(set-module-name! interface (module-name module))
|
|
|
|
|
|
(set-module-kind! interface 'interface)
|
2003-03-12 14:30:03 +00:00
|
|
|
|
(set-module-public-interface! module interface))))
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(if (and (not (memq the-scm-module (module-uses module)))
|
|
|
|
|
|
(not (eq? module the-root-module)))
|
2007-05-05 20:38:57 +00:00
|
|
|
|
;; Import the default set of bindings (from the SCM module) in MODULE.
|
|
|
|
|
|
(module-use! module the-scm-module)))
|
1999-03-19 05:14:09 +00:00
|
|
|
|
|
1998-11-26 17:56:36 +00:00
|
|
|
|
;; NOTE: This binding is used in libguile/modules.c.
|
|
|
|
|
|
;;
|
2008-09-02 00:40:57 -07:00
|
|
|
|
(define resolve-module
|
|
|
|
|
|
(let ((the-root-module the-root-module))
|
|
|
|
|
|
(lambda (name . maybe-autoload)
|
|
|
|
|
|
(if (equal? name '(guile))
|
|
|
|
|
|
the-root-module
|
|
|
|
|
|
(let ((full-name (append '(%app modules) name)))
|
runtime byte compilation of goops methods, whooooo
* ice-9/boot-9.scm (make-modules-in): Change to make sure that we are
making modules in modules; that is, that a global binding of `compile'
doesn't prevent a module from importing a submodule named `compile'.
(resolve-module): Clean up a bit, and serialize the logic.
* libguile/objects.c (scm_mcache_lookup_cmethod, scm_apply_generic):
* libguile/eval.i.c (CEVAL): Now that cmethod entries can have a program
as their tail instead of a memoized proc, we have to change the halting
condition on the method cache search, in both places: the one that's
inlined into eval.i.c and the one in objects.c. If the cmethod isn't a
pair, apply it.
* libguile/goops.c (make): In the `make' procedure that's used before
GOOPS is booted, bind #:formals, #:body, and #:compile-env on methods.
* oop/goops/compile.scm (compute-entry-with-cmethod): There was a
terrible trick here that involved putting a dummy pair in the cache,
then modifying it in place with the result of memoization. The note
claimed that this was to cut recursion short, or something. I can't see
how it could recurse, given that `methods' is changing each time. Also,
the pair trick doesn't work with byte-compiled methods. So, remove it.
(compile-method): Dispatch to the appropriate method compiler, based on
whether the method was defined with the interpreter or with the
compiler.
(make-next-method): New function, generically computes a `next-method'
procedure, though the caller has to supply the arguments.
(compile-method/vm): Exciting method byte compiler!
(make-make-next-method/memoizer, compile-method/memoizer): Add the
/memoizer suffix, and move all this code to the bottom of the file.
2008-10-30 13:42:40 +01:00
|
|
|
|
(let ((already (nested-ref the-root-module full-name))
|
|
|
|
|
|
(autoload (or (null? maybe-autoload) (car maybe-autoload))))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and already (module? already)
|
|
|
|
|
|
(or (not autoload) (module-public-interface already)))
|
|
|
|
|
|
;; A hit, a palpable hit.
|
|
|
|
|
|
already)
|
|
|
|
|
|
(autoload
|
|
|
|
|
|
;; Try to autoload the module, and recurse.
|
|
|
|
|
|
(try-load-module name)
|
|
|
|
|
|
(resolve-module name #f))
|
|
|
|
|
|
(else
|
|
|
|
|
|
;; A module is not bound (but maybe something else is),
|
|
|
|
|
|
;; we're not autoloading -- here's the weird semantics,
|
|
|
|
|
|
;; we create an empty module.
|
|
|
|
|
|
(make-modules-in the-root-module full-name)))))))))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
2001-05-19 01:30:02 +00:00
|
|
|
|
;; Cheat. These bindings are needed by modules.c, but we don't want
|
|
|
|
|
|
;; to move their real definition here because that would be unnatural.
|
|
|
|
|
|
;;
|
2001-05-15 14:59:42 +00:00
|
|
|
|
(define try-module-autoload #f)
|
2001-05-19 01:30:02 +00:00
|
|
|
|
(define process-define-module #f)
|
|
|
|
|
|
(define process-use-modules #f)
|
|
|
|
|
|
(define module-export! #f)
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(define default-duplicate-binding-procedures #f)
|
2001-05-15 14:59:42 +00:00
|
|
|
|
|
2004-12-01 00:02:24 +00:00
|
|
|
|
(define %app (make-module 31))
|
|
|
|
|
|
(define app %app) ;; for backwards compatability
|
2008-09-02 00:42:39 -07:00
|
|
|
|
|
2004-12-01 00:02:24 +00:00
|
|
|
|
(local-define '(%app modules) (make-module 31))
|
|
|
|
|
|
(local-define '(%app modules guile) the-root-module)
|
2001-05-15 14:59:42 +00:00
|
|
|
|
|
2008-09-02 00:42:39 -07:00
|
|
|
|
;; This boots the module system. All bindings needed by modules.c
|
|
|
|
|
|
;; must have been defined by now.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(set-current-module the-root-module)
|
2009-04-24 13:50:14 +02:00
|
|
|
|
;; definition deferred for syncase's benefit
|
|
|
|
|
|
(define module-name (record-accessor module-type 'name))
|
2008-09-02 00:42:39 -07:00
|
|
|
|
|
2004-12-01 00:02:24 +00:00
|
|
|
|
;; (define-special-value '(%app modules new-ws) (lambda () (make-scm-module)))
|
2001-05-15 14:59:42 +00:00
|
|
|
|
|
|
|
|
|
|
(define (try-load-module name)
|
2009-04-23 13:30:23 +02:00
|
|
|
|
(try-module-autoload name))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-06-21 01:16:45 +00:00
|
|
|
|
(define (purify-module! module)
|
|
|
|
|
|
"Removes bindings in MODULE which are inherited from the (guile) module."
|
|
|
|
|
|
(let ((use-list (module-uses module)))
|
|
|
|
|
|
(if (and (pair? use-list)
|
|
|
|
|
|
(eq? (car (last-pair use-list)) the-scm-module))
|
|
|
|
|
|
(set-module-uses! module (reverse (cdr (reverse use-list)))))))
|
|
|
|
|
|
|
2002-02-26 10:57:54 +00:00
|
|
|
|
;; Return a module that is an interface to the module designated by
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; NAME.
|
|
|
|
|
|
;;
|
2003-03-11 19:58:14 +00:00
|
|
|
|
;; `resolve-interface' takes four keyword arguments:
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;;
|
|
|
|
|
|
;; #:select SELECTION
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; SELECTION is a list of binding-specs to be imported; A binding-spec
|
|
|
|
|
|
;; is either a symbol or a pair of symbols (ORIG . SEEN), where ORIG
|
|
|
|
|
|
;; is the name in the used module and SEEN is the name in the using
|
|
|
|
|
|
;; module. Note that SEEN is also passed through RENAMER, below. The
|
|
|
|
|
|
;; default is to select all bindings. If you specify no selection but
|
2002-02-26 10:57:54 +00:00
|
|
|
|
;; a renamer, only the bindings that already exist in the used module
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; are made available in the interface. Bindings that are added later
|
|
|
|
|
|
;; are not picked up.
|
|
|
|
|
|
;;
|
2003-03-11 19:58:14 +00:00
|
|
|
|
;; #:hide BINDINGS
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;;
|
2003-03-11 19:58:14 +00:00
|
|
|
|
;; BINDINGS is a list of bindings which should not be imported.
|
2003-03-10 23:18:05 +00:00
|
|
|
|
;;
|
|
|
|
|
|
;; #:prefix PREFIX
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; PREFIX is a symbol that will be appended to each exported name.
|
|
|
|
|
|
;; The default is to not perform any renaming.
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;;
|
2003-03-11 19:58:14 +00:00
|
|
|
|
;; #:renamer RENAMER
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; RENAMER is a procedure that takes a symbol and returns its new
|
|
|
|
|
|
;; name. The default is not perform any renaming.
|
|
|
|
|
|
;;
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; Signal "no code for module" error if module name is not resolvable
|
|
|
|
|
|
;; or its public interface is not available. Signal "no binding"
|
|
|
|
|
|
;; error if selected binding does not exist in the used module.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (resolve-interface name . args)
|
|
|
|
|
|
|
|
|
|
|
|
(define (get-keyword-arg args kw def)
|
|
|
|
|
|
(cond ((memq kw args)
|
|
|
|
|
|
=> (lambda (kw-arg)
|
|
|
|
|
|
(if (null? (cdr kw-arg))
|
|
|
|
|
|
(error "keyword without value: " kw))
|
|
|
|
|
|
(cadr kw-arg)))
|
|
|
|
|
|
(else
|
|
|
|
|
|
def)))
|
|
|
|
|
|
|
|
|
|
|
|
(let* ((select (get-keyword-arg args #:select #f))
|
2003-03-11 19:58:14 +00:00
|
|
|
|
(hide (get-keyword-arg args #:hide '()))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(renamer (or (get-keyword-arg args #:renamer #f)
|
|
|
|
|
|
(let ((prefix (get-keyword-arg args #:prefix #f)))
|
|
|
|
|
|
(and prefix (symbol-prefix-proc prefix)))
|
|
|
|
|
|
identity))
|
2001-05-15 19:33:43 +00:00
|
|
|
|
(module (resolve-module name))
|
|
|
|
|
|
(public-i (and module (module-public-interface module))))
|
|
|
|
|
|
(and (or (not module) (not public-i))
|
|
|
|
|
|
(error "no code for module" name))
|
2003-03-11 19:58:14 +00:00
|
|
|
|
(if (and (not select) (null? hide) (eq? renamer identity))
|
2001-05-15 19:33:43 +00:00
|
|
|
|
public-i
|
2001-06-01 20:15:10 +00:00
|
|
|
|
(let ((selection (or select (module-map (lambda (sym var) sym)
|
|
|
|
|
|
public-i)))
|
2001-05-15 19:33:43 +00:00
|
|
|
|
(custom-i (make-module 31)))
|
2003-03-11 19:58:14 +00:00
|
|
|
|
(set-module-kind! custom-i 'custom-interface)
|
|
|
|
|
|
(set-module-name! custom-i name)
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; XXX - should use a lazy binder so that changes to the
|
|
|
|
|
|
;; used module are picked up automatically.
|
2003-03-12 14:11:42 +00:00
|
|
|
|
(for-each (lambda (bspec)
|
|
|
|
|
|
(let* ((direct? (symbol? bspec))
|
|
|
|
|
|
(orig (if direct? bspec (car bspec)))
|
|
|
|
|
|
(seen (if direct? bspec (cdr bspec)))
|
2003-03-11 19:58:14 +00:00
|
|
|
|
(var (or (module-local-variable public-i orig)
|
|
|
|
|
|
(module-local-variable module orig)
|
|
|
|
|
|
(error
|
|
|
|
|
|
;; fixme: format manually for now
|
|
|
|
|
|
(simple-format
|
|
|
|
|
|
#f "no binding `~A' in module ~A"
|
|
|
|
|
|
orig name)))))
|
|
|
|
|
|
(if (memq orig hide)
|
|
|
|
|
|
(set! hide (delq! orig hide))
|
|
|
|
|
|
(module-add! custom-i
|
|
|
|
|
|
(renamer seen)
|
|
|
|
|
|
var))))
|
2003-03-12 14:11:42 +00:00
|
|
|
|
selection)
|
2003-03-11 19:58:14 +00:00
|
|
|
|
;; Check that we are not hiding bindings which don't exist
|
|
|
|
|
|
(for-each (lambda (binding)
|
|
|
|
|
|
(if (not (module-local-variable public-i binding))
|
|
|
|
|
|
(error
|
|
|
|
|
|
(simple-format
|
|
|
|
|
|
#f "no binding `~A' to hide in module ~A"
|
|
|
|
|
|
binding name))))
|
|
|
|
|
|
hide)
|
2001-05-15 19:33:43 +00:00
|
|
|
|
custom-i))))
|
2001-05-10 22:00:22 +00:00
|
|
|
|
|
|
|
|
|
|
(define (symbol-prefix-proc prefix)
|
|
|
|
|
|
(lambda (symbol)
|
|
|
|
|
|
(symbol-append prefix symbol)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-11-23 21:43:44 +00:00
|
|
|
|
;; This function is called from "modules.c". If you change it, be
|
|
|
|
|
|
;; sure to update "modules.c" as well.
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (process-define-module args)
|
2001-05-18 17:28:03 +00:00
|
|
|
|
(let* ((module-id (car args))
|
|
|
|
|
|
(module (resolve-module module-id #f))
|
|
|
|
|
|
(kws (cdr args))
|
|
|
|
|
|
(unrecognized (lambda (arg)
|
|
|
|
|
|
(error "unrecognized define-module argument" arg))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(beautify-user-module! module)
|
1996-12-21 09:50:38 +00:00
|
|
|
|
(let loop ((kws kws)
|
2008-09-12 17:59:59 +02:00
|
|
|
|
(reversed-interfaces '())
|
|
|
|
|
|
(exports '())
|
|
|
|
|
|
(re-exports '())
|
|
|
|
|
|
(replacements '())
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(autoloads '()))
|
2005-06-11 01:48:19 +00:00
|
|
|
|
|
1996-12-21 09:50:38 +00:00
|
|
|
|
(if (null? kws)
|
2008-09-12 17:59:59 +02:00
|
|
|
|
(call-with-deferred-observers
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(module-use-interfaces! module (reverse reversed-interfaces))
|
|
|
|
|
|
(module-export! module exports)
|
|
|
|
|
|
(module-replace! module replacements)
|
|
|
|
|
|
(module-re-export! module re-exports)
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(if (not (null? autoloads))
|
|
|
|
|
|
(apply module-autoload! module autoloads))))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
(case (car kws)
|
|
|
|
|
|
((#:use-module #:use-syntax)
|
|
|
|
|
|
(or (pair? (cdr kws))
|
|
|
|
|
|
(unrecognized kws))
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(cond
|
|
|
|
|
|
((equal? (caadr kws) '(ice-9 syncase))
|
|
|
|
|
|
(issue-deprecation-warning
|
|
|
|
|
|
"(ice-9 syncase) is deprecated. Support for syntax-case is now in Guile core.")
|
2008-09-12 17:59:59 +02:00
|
|
|
|
(loop (cddr kws)
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
reversed-interfaces
|
2008-09-12 17:59:59 +02:00
|
|
|
|
exports
|
|
|
|
|
|
re-exports
|
|
|
|
|
|
replacements
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
autoloads))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(let* ((interface-args (cadr kws))
|
|
|
|
|
|
(interface (apply resolve-interface interface-args)))
|
|
|
|
|
|
(and (eq? (car kws) #:use-syntax)
|
|
|
|
|
|
(or (symbol? (caar interface-args))
|
|
|
|
|
|
(error "invalid module name for use-syntax"
|
|
|
|
|
|
(car interface-args)))
|
|
|
|
|
|
(set-module-transformer!
|
|
|
|
|
|
module
|
|
|
|
|
|
(module-ref interface
|
|
|
|
|
|
(car (last-pair (car interface-args)))
|
|
|
|
|
|
#f)))
|
|
|
|
|
|
(loop (cddr kws)
|
|
|
|
|
|
(cons interface reversed-interfaces)
|
|
|
|
|
|
exports
|
|
|
|
|
|
re-exports
|
|
|
|
|
|
replacements
|
|
|
|
|
|
autoloads)))))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:autoload)
|
|
|
|
|
|
(or (and (pair? (cdr kws)) (pair? (cddr kws)))
|
|
|
|
|
|
(unrecognized kws))
|
|
|
|
|
|
(loop (cdddr kws)
|
2007-05-05 20:38:57 +00:00
|
|
|
|
reversed-interfaces
|
2008-09-12 17:59:59 +02:00
|
|
|
|
exports
|
|
|
|
|
|
re-exports
|
|
|
|
|
|
replacements
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(let ((name (cadr kws))
|
|
|
|
|
|
(bindings (caddr kws)))
|
|
|
|
|
|
(cons* name bindings autoloads))))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:no-backtrace)
|
|
|
|
|
|
(set-system-module! module #t)
|
|
|
|
|
|
(loop (cdr kws) reversed-interfaces exports re-exports
|
2007-05-05 20:38:57 +00:00
|
|
|
|
replacements autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:pure)
|
|
|
|
|
|
(purify-module! module)
|
|
|
|
|
|
(loop (cdr kws) reversed-interfaces exports re-exports
|
2007-05-05 20:38:57 +00:00
|
|
|
|
replacements autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:duplicates)
|
|
|
|
|
|
(if (not (pair? (cdr kws)))
|
|
|
|
|
|
(unrecognized kws))
|
|
|
|
|
|
(set-module-duplicates-handlers!
|
|
|
|
|
|
module
|
|
|
|
|
|
(lookup-duplicates-handlers (cadr kws)))
|
|
|
|
|
|
(loop (cddr kws) reversed-interfaces exports re-exports
|
2007-05-05 20:38:57 +00:00
|
|
|
|
replacements autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:export #:export-syntax)
|
|
|
|
|
|
(or (pair? (cdr kws))
|
|
|
|
|
|
(unrecognized kws))
|
|
|
|
|
|
(loop (cddr kws)
|
|
|
|
|
|
reversed-interfaces
|
|
|
|
|
|
(append (cadr kws) exports)
|
|
|
|
|
|
re-exports
|
|
|
|
|
|
replacements
|
2007-05-05 20:38:57 +00:00
|
|
|
|
autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:re-export #:re-export-syntax)
|
|
|
|
|
|
(or (pair? (cdr kws))
|
|
|
|
|
|
(unrecognized kws))
|
|
|
|
|
|
(loop (cddr kws)
|
|
|
|
|
|
reversed-interfaces
|
|
|
|
|
|
exports
|
|
|
|
|
|
(append (cadr kws) re-exports)
|
|
|
|
|
|
replacements
|
2007-05-05 20:38:57 +00:00
|
|
|
|
autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
((#:replace #:replace-syntax)
|
|
|
|
|
|
(or (pair? (cdr kws))
|
|
|
|
|
|
(unrecognized kws))
|
|
|
|
|
|
(loop (cddr kws)
|
|
|
|
|
|
reversed-interfaces
|
|
|
|
|
|
exports
|
|
|
|
|
|
re-exports
|
|
|
|
|
|
(append (cadr kws) replacements)
|
2007-05-05 20:38:57 +00:00
|
|
|
|
autoloads))
|
2008-09-12 17:59:59 +02:00
|
|
|
|
(else
|
|
|
|
|
|
(unrecognized kws)))))
|
2002-12-28 20:14:21 +00:00
|
|
|
|
(run-hook module-defined-hook module)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
module))
|
1998-12-01 17:06:34 +00:00
|
|
|
|
|
2002-12-28 20:14:21 +00:00
|
|
|
|
;; `module-defined-hook' is a hook that is run whenever a new module
|
|
|
|
|
|
;; is defined. Its members are called with one argument, the new
|
|
|
|
|
|
;; module.
|
|
|
|
|
|
(define module-defined-hook (make-hook 1))
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
1998-12-01 17:06:34 +00:00
|
|
|
|
;;; {Autoload}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1998-12-01 17:06:34 +00:00
|
|
|
|
|
|
|
|
|
|
(define (make-autoload-interface module name bindings)
|
|
|
|
|
|
(let ((b (lambda (a sym definep)
|
|
|
|
|
|
(and (memq sym bindings)
|
|
|
|
|
|
(let ((i (module-public-interface (resolve-module name))))
|
|
|
|
|
|
(if (not i)
|
|
|
|
|
|
(error "missing interface for module" name))
|
2006-04-16 23:43:48 +00:00
|
|
|
|
(let ((autoload (memq a (module-uses module))))
|
|
|
|
|
|
;; Replace autoload-interface with actual interface if
|
|
|
|
|
|
;; that has not happened yet.
|
|
|
|
|
|
(if (pair? autoload)
|
|
|
|
|
|
(set-car! autoload i)))
|
1998-12-01 17:06:34 +00:00
|
|
|
|
(module-local-variable i sym))))))
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(module-constructor (make-hash-table 0) '() b #f #f name 'autoload #f
|
|
|
|
|
|
(make-hash-table 0) '() (make-weak-value-hash-table 31))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (module-autoload! module . args)
|
|
|
|
|
|
"Have @var{module} automatically load the module named @var{name} when one
|
|
|
|
|
|
of the symbols listed in @var{bindings} is looked up. @var{args} should be a
|
|
|
|
|
|
list of module-name/binding-list pairs, e.g., as in @code{(module-autoload!
|
|
|
|
|
|
module '(ice-9 q) '(make-q q-length))}."
|
|
|
|
|
|
(let loop ((args args))
|
|
|
|
|
|
(cond ((null? args)
|
|
|
|
|
|
#t)
|
|
|
|
|
|
((null? (cdr args))
|
|
|
|
|
|
(error "invalid name+binding autoload list" args))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(let ((name (car args))
|
|
|
|
|
|
(bindings (cadr args)))
|
|
|
|
|
|
(module-use! module (make-autoload-interface module
|
|
|
|
|
|
name bindings))
|
|
|
|
|
|
(loop (cddr args)))))))
|
|
|
|
|
|
|
1998-12-01 17:06:34 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-10-16 22:29:19 +00:00
|
|
|
|
;;; {Autoloading modules}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define autoloads-in-progress '())
|
|
|
|
|
|
|
2001-11-23 21:43:44 +00:00
|
|
|
|
;; This function is called from "modules.c". If you change it, be
|
|
|
|
|
|
;; sure to update "modules.c" as well.
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (try-module-autoload module-name)
|
|
|
|
|
|
(let* ((reverse-name (reverse module-name))
|
2000-08-27 03:20:19 +00:00
|
|
|
|
(name (symbol->string (car reverse-name)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(dir-hint-module-name (reverse (cdr reverse-name)))
|
2000-08-27 03:20:19 +00:00
|
|
|
|
(dir-hint (apply string-append
|
|
|
|
|
|
(map (lambda (elt)
|
|
|
|
|
|
(string-append (symbol->string elt) "/"))
|
|
|
|
|
|
dir-hint-module-name))))
|
1996-12-21 09:50:38 +00:00
|
|
|
|
(resolve-module dir-hint-module-name #f)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(and (not (autoload-done-or-in-progress? dir-hint name))
|
|
|
|
|
|
(let ((didit #f))
|
2001-04-16 03:42:36 +00:00
|
|
|
|
(define (load-file proc file)
|
|
|
|
|
|
(save-module-excursion (lambda () (proc file)))
|
|
|
|
|
|
(set! didit #t))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(dynamic-wind
|
|
|
|
|
|
(lambda () (autoload-in-progress! dir-hint name))
|
1999-08-29 14:21:30 +00:00
|
|
|
|
(lambda ()
|
2001-04-16 03:42:36 +00:00
|
|
|
|
(let ((file (in-vicinity dir-hint name)))
|
2008-08-09 14:23:20 +02:00
|
|
|
|
(let ((compiled (and load-compiled
|
|
|
|
|
|
(%search-load-path
|
|
|
|
|
|
(string-append file ".go"))))
|
|
|
|
|
|
(source (%search-load-path file)))
|
|
|
|
|
|
(cond ((and source
|
|
|
|
|
|
(or (not compiled)
|
|
|
|
|
|
(< (stat:mtime (stat compiled))
|
|
|
|
|
|
(stat:mtime (stat source)))))
|
|
|
|
|
|
(if compiled
|
|
|
|
|
|
(warn "source file" source "newer than" compiled))
|
2009-03-09 21:40:30 +01:00
|
|
|
|
(with-fluid* current-reader #f
|
|
|
|
|
|
(lambda () (load-file primitive-load source))))
|
2008-08-09 14:23:20 +02:00
|
|
|
|
(compiled
|
|
|
|
|
|
(load-file load-compiled compiled))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(lambda () (set-autoloaded! dir-hint name didit)))
|
|
|
|
|
|
didit))))
|
|
|
|
|
|
|
1998-12-01 17:06:34 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
;;; {Dynamic linking of modules}
|
|
|
|
|
|
;;;
|
1997-01-18 11:29:20 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define autoloads-done '((guile . guile)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (autoload-done-or-in-progress? p m)
|
|
|
|
|
|
(let ((n (cons p m)))
|
|
|
|
|
|
(->bool (or (member n autoloads-done)
|
|
|
|
|
|
(member n autoloads-in-progress)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (autoload-done! p m)
|
|
|
|
|
|
(let ((n (cons p m)))
|
|
|
|
|
|
(set! autoloads-in-progress
|
|
|
|
|
|
(delete! n autoloads-in-progress))
|
|
|
|
|
|
(or (member n autoloads-done)
|
|
|
|
|
|
(set! autoloads-done (cons n autoloads-done)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (autoload-in-progress! p m)
|
|
|
|
|
|
(let ((n (cons p m)))
|
|
|
|
|
|
(set! autoloads-done
|
|
|
|
|
|
(delete! n autoloads-done))
|
|
|
|
|
|
(set! autoloads-in-progress (cons n autoloads-in-progress))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (set-autoloaded! p m done?)
|
|
|
|
|
|
(if done?
|
|
|
|
|
|
(autoload-done! p m)
|
|
|
|
|
|
(let ((n (cons p m)))
|
|
|
|
|
|
(set! autoloads-done (delete! n autoloads-done))
|
|
|
|
|
|
(set! autoloads-in-progress (delete! n autoloads-in-progress)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1997-09-28 20:12:17 +00:00
|
|
|
|
;;; {Run-time options}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1997-09-28 20:12:17 +00:00
|
|
|
|
|
2008-09-01 23:51:30 -07:00
|
|
|
|
(defmacro define-option-interface (option-group)
|
2001-01-26 16:58:48 +00:00
|
|
|
|
(let* ((option-name car)
|
|
|
|
|
|
(option-value cadr)
|
|
|
|
|
|
(option-documentation caddr)
|
|
|
|
|
|
|
|
|
|
|
|
;; Below follow the macros defining the run-time option interfaces.
|
|
|
|
|
|
|
|
|
|
|
|
(make-options (lambda (interface)
|
|
|
|
|
|
`(lambda args
|
|
|
|
|
|
(cond ((null? args) (,interface))
|
|
|
|
|
|
((list? (car args))
|
|
|
|
|
|
(,interface (car args)) (,interface))
|
2008-09-01 23:51:30 -07:00
|
|
|
|
(else (for-each
|
|
|
|
|
|
(lambda (option)
|
|
|
|
|
|
(display (option-name option))
|
|
|
|
|
|
(if (< (string-length
|
|
|
|
|
|
(symbol->string (option-name option)))
|
|
|
|
|
|
8)
|
|
|
|
|
|
(display #\tab))
|
|
|
|
|
|
(display #\tab)
|
|
|
|
|
|
(display (option-value option))
|
|
|
|
|
|
(display #\tab)
|
|
|
|
|
|
(display (option-documentation option))
|
|
|
|
|
|
(newline))
|
|
|
|
|
|
(,interface #t)))))))
|
2001-01-26 16:58:48 +00:00
|
|
|
|
|
|
|
|
|
|
(make-enable (lambda (interface)
|
1997-09-28 20:12:17 +00:00
|
|
|
|
`(lambda flags
|
2001-01-26 16:58:48 +00:00
|
|
|
|
(,interface (append flags (,interface)))
|
|
|
|
|
|
(,interface))))
|
|
|
|
|
|
|
|
|
|
|
|
(make-disable (lambda (interface)
|
|
|
|
|
|
`(lambda flags
|
|
|
|
|
|
(let ((options (,interface)))
|
|
|
|
|
|
(for-each (lambda (flag)
|
|
|
|
|
|
(set! options (delq! flag options)))
|
|
|
|
|
|
flags)
|
|
|
|
|
|
(,interface options)
|
2002-11-04 19:40:49 +00:00
|
|
|
|
(,interface))))))
|
2008-09-01 23:51:30 -07:00
|
|
|
|
(let* ((interface (car option-group))
|
|
|
|
|
|
(options/enable/disable (cadr option-group)))
|
|
|
|
|
|
`(begin
|
|
|
|
|
|
(define ,(car options/enable/disable)
|
|
|
|
|
|
,(make-options interface))
|
|
|
|
|
|
(define ,(cadr options/enable/disable)
|
|
|
|
|
|
,(make-enable interface))
|
|
|
|
|
|
(define ,(caddr options/enable/disable)
|
|
|
|
|
|
,(make-disable interface))
|
|
|
|
|
|
(defmacro ,(caaddr option-group) (opt val)
|
|
|
|
|
|
`(,',(car options/enable/disable)
|
|
|
|
|
|
(append (,',(car options/enable/disable))
|
|
|
|
|
|
(list ',opt ,val))))))))
|
2001-01-26 16:58:48 +00:00
|
|
|
|
|
|
|
|
|
|
(define-option-interface
|
|
|
|
|
|
(eval-options-interface
|
|
|
|
|
|
(eval-options eval-enable eval-disable)
|
|
|
|
|
|
(eval-set!)))
|
|
|
|
|
|
|
|
|
|
|
|
(define-option-interface
|
|
|
|
|
|
(debug-options-interface
|
|
|
|
|
|
(debug-options debug-enable debug-disable)
|
|
|
|
|
|
(debug-set!)))
|
|
|
|
|
|
|
|
|
|
|
|
(define-option-interface
|
|
|
|
|
|
(evaluator-traps-interface
|
|
|
|
|
|
(traps trap-enable trap-disable)
|
|
|
|
|
|
(trap-set!)))
|
|
|
|
|
|
|
|
|
|
|
|
(define-option-interface
|
|
|
|
|
|
(read-options-interface
|
|
|
|
|
|
(read-options read-enable read-disable)
|
|
|
|
|
|
(read-set!)))
|
|
|
|
|
|
|
|
|
|
|
|
(define-option-interface
|
|
|
|
|
|
(print-options-interface
|
|
|
|
|
|
(print-options print-enable print-disable)
|
|
|
|
|
|
(print-set!)))
|
1997-09-28 20:12:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Running Repls}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define (repl read evaler print)
|
1997-03-08 19:02:20 +00:00
|
|
|
|
(let loop ((source (read (current-input-port))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(print (evaler source))
|
1997-03-08 19:02:20 +00:00
|
|
|
|
(loop (read (current-input-port)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
;; A provisional repl that acts like the SCM repl:
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define scm-repl-silent #f)
|
|
|
|
|
|
(define (assert-repl-silence v) (set! scm-repl-silent v))
|
|
|
|
|
|
|
1996-11-02 20:51:30 +00:00
|
|
|
|
(define *unspecified* (if #f #f))
|
|
|
|
|
|
(define (unspecified? v) (eq? v *unspecified*))
|
|
|
|
|
|
|
|
|
|
|
|
(define scm-repl-print-unspecified #f)
|
|
|
|
|
|
(define (assert-repl-print-unspecified v) (set! scm-repl-print-unspecified v))
|
|
|
|
|
|
|
Get Guile to be a little less chatty by default. The new user
should see as little clutter as possible.
* r4rs.scm (%load-verbosely): Make this #f by default.
* boot-9.scm (scm-repl-verbose): Make this #f by default.
(scm-style-repl): Don't run 'pk' on the value passed to quit.
* r4rs.scm: New file.
* boot-9.scm: Load r4rs.scm, first thing.
(OPEN_READ, OPEN_WRITE, OPEN_BOTH, *null-device*, open-input-file,
open-output-file, open-io-file, close-input-port,
close-output-port, close-io-port, call-with-input-file,
call-with-output-file, with-input-from-port, with-output-to-port,
with-error-to-port, with-input-from-file, with-output-to-file,
with-error-to-file, with-input-from-string, with-output-to-string,
with-error-to-string, the-eof-object): Definitions moved to
r4rs.scm. Not all of them are R4RS, but those that are use those
that are not.
(load, %load-verbosely, %load-announce): Moved, along with code to
set %load-hook, to r4rs.scm.
* boot-9.scm (integer?): Definition deleted, in favor of the one
present in libguile (which used to be called int?). I have no
idea why integer? didn't just call int? to begin with.
* boot-9.scm (<, <=, =, >, >=): Definitions in terms of <?, <=?,
=?, >?, and >=? deleted; they're defined that way by libguile now.
1996-10-29 03:47:36 +00:00
|
|
|
|
(define scm-repl-verbose #f)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (assert-repl-verbosity v) (set! scm-repl-verbose v))
|
|
|
|
|
|
|
* * debug.scm: *Warning* This feature is a bit premature. I add
it anyway because 1. it is very useful, and, 2. you can start
making it less premature by complaining to me and by modifying
the source! :-)
(trace): Given one or more procedure objects, trace each one.
Given no arguments, show all traced procedures.
(untrace): Given one or more procedure objects, untrace each one.
Given no arguments, untrace all traced procedures. The tracing in
Guile have an advantage to most other systems: We don't create new
procedure objects, but mark the procedure objects themselves.
This means that also anonymous and internal procedures can be
traced.
* boot-9.scm (error-catching-loop): Added handling of apply-frame
and exit-frame exceptions.
* * boot-9.scm (assert-repl-prompt, the-prompt-string): Removed.
(set-repl-prompt!): Setter for repl prompt.
(scm-style-repl): If prompt is #f, don't prompt; if prompt is a
string, display it; if prompt is a thunk, call it and display its
result; otherwise display "> ".
(Change suggested by Roland Orre <orre@nada.kth.se>.)
1997-02-28 23:11:22 +00:00
|
|
|
|
(define scm-repl-prompt "guile> ")
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* * debug.scm: *Warning* This feature is a bit premature. I add
it anyway because 1. it is very useful, and, 2. you can start
making it less premature by complaining to me and by modifying
the source! :-)
(trace): Given one or more procedure objects, trace each one.
Given no arguments, show all traced procedures.
(untrace): Given one or more procedure objects, untrace each one.
Given no arguments, untrace all traced procedures. The tracing in
Guile have an advantage to most other systems: We don't create new
procedure objects, but mark the procedure objects themselves.
This means that also anonymous and internal procedures can be
traced.
* boot-9.scm (error-catching-loop): Added handling of apply-frame
and exit-frame exceptions.
* * boot-9.scm (assert-repl-prompt, the-prompt-string): Removed.
(set-repl-prompt!): Setter for repl prompt.
(scm-style-repl): If prompt is #f, don't prompt; if prompt is a
string, display it; if prompt is a thunk, call it and display its
result; otherwise display "> ".
(Change suggested by Roland Orre <orre@nada.kth.se>.)
1997-02-28 23:11:22 +00:00
|
|
|
|
(define (set-repl-prompt! v) (set! scm-repl-prompt v))
|
|
|
|
|
|
|
2008-12-26 16:44:02 +01:00
|
|
|
|
(define (default-pre-unwind-handler key . args)
|
|
|
|
|
|
(save-stack pre-unwind-handler-dispatch)
|
1997-03-01 01:01:09 +00:00
|
|
|
|
(apply throw key args))
|
|
|
|
|
|
|
2008-12-26 16:44:02 +01:00
|
|
|
|
(define (pre-unwind-handler-dispatch key . args)
|
|
|
|
|
|
(apply default-pre-unwind-handler key args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* boot-9.scm (beautify-user-module!): Beautify also if public
interface is set to the module itself. In this way we can use
beautify-user-module! to beautify a module prepared for object
code.
(process-define-module): Special case: Try to load object code as
well if a module does :use-module on itself.
* boot-9.scm: Bugfix: Since boot-9.scm is now loaded from
invoke_main_func, we can no longer be sure that all modules have
been registered when boot-9.scm is loaded.
(register-modules): New function: Register and tag modules
registered by scm_register_module_xxx since last call to this
function. Modules are tagged with the dynamic object passed as
argument. (Already linked modules should be tagged with #f.)
(init-dynamic-module, link-dynamic-module): Call register-modules
first to register linked modules.
* boot-9.scm (init-dynamic-module): Remove module from
registered-modules as soon as possible in case we are recursively
invoked; Set public interface before doing the dynamic-call.
* boot-9.scm (map-in-order): Removed (replaced by scm_serial_map).
(abort-hook, before-error-hook, after-error-hook,
before-backtrace-hook, after-backtrace-hook, before-read-hook,
after-read-hook, exit-hook): Make hooks with `make-hook'.
* boot-9.scm: Make hooks first class citizens and make them easier
to use from C:
(make-hook, add-hook!, remove-hook!, run-hooks): Moved to
libguile/feature.c.
* boot-9.scm: Added warnings about bindings used in
libguile/modules.c: the-module, set-current-module,
make-modules-in, beautify-user-module!, module-eval-closure.
1998-11-23 02:36:43 +00:00
|
|
|
|
(define abort-hook (make-hook))
|
1997-03-01 01:34:23 +00:00
|
|
|
|
|
1997-11-09 23:36:17 +00:00
|
|
|
|
;; these definitions are used if running a script.
|
|
|
|
|
|
;; otherwise redefined in error-catching-loop.
|
|
|
|
|
|
(define (set-batch-mode?! arg) #t)
|
|
|
|
|
|
(define (batch-mode?) #t)
|
1997-10-11 20:42:24 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (error-catching-loop thunk)
|
1997-10-11 20:42:24 +00:00
|
|
|
|
(let ((status #f)
|
|
|
|
|
|
(interactive #t))
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(define (loop first)
|
2001-04-28 19:07:38 +00:00
|
|
|
|
(let ((next
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(catch #t
|
1996-10-17 21:45:04 +00:00
|
|
|
|
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(lambda ()
|
2006-02-04 14:36:06 +00:00
|
|
|
|
(call-with-unblocked-asyncs
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(with-traps
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(first)
|
|
|
|
|
|
|
|
|
|
|
|
;; This line is needed because mark
|
|
|
|
|
|
;; doesn't do closures quite right.
|
|
|
|
|
|
;; Unreferenced locals should be
|
|
|
|
|
|
;; collected.
|
|
|
|
|
|
(set! first #f)
|
|
|
|
|
|
(let loop ((v (thunk)))
|
|
|
|
|
|
(loop (thunk)))
|
|
|
|
|
|
#f)))))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(lambda (key . args)
|
|
|
|
|
|
(case key
|
|
|
|
|
|
((quit)
|
|
|
|
|
|
(set! status args)
|
|
|
|
|
|
#f)
|
|
|
|
|
|
|
|
|
|
|
|
((switch-repl)
|
|
|
|
|
|
(apply throw 'switch-repl args))
|
|
|
|
|
|
|
|
|
|
|
|
((abort)
|
|
|
|
|
|
;; This is one of the closures that require
|
|
|
|
|
|
;; (set! first #f) above
|
|
|
|
|
|
;;
|
|
|
|
|
|
(lambda ()
|
1998-11-26 08:31:02 +00:00
|
|
|
|
(run-hook abort-hook)
|
1999-06-09 12:17:03 +00:00
|
|
|
|
(force-output (current-output-port))
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(display "ABORT: " (current-error-port))
|
|
|
|
|
|
(write args (current-error-port))
|
|
|
|
|
|
(newline (current-error-port))
|
1997-10-11 20:42:24 +00:00
|
|
|
|
(if interactive
|
1999-06-09 12:17:03 +00:00
|
|
|
|
(begin
|
|
|
|
|
|
(if (and
|
|
|
|
|
|
(not has-shown-debugger-hint?)
|
|
|
|
|
|
(not (memq 'backtrace
|
|
|
|
|
|
(debug-options-interface)))
|
|
|
|
|
|
(stack? (fluid-ref the-last-stack)))
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(newline (current-error-port))
|
|
|
|
|
|
(display
|
2000-06-05 00:31:24 +00:00
|
|
|
|
"Type \"(backtrace)\" to get more information or \"(debug)\" to enter the debugger.\n"
|
1999-06-09 12:17:03 +00:00
|
|
|
|
(current-error-port))
|
|
|
|
|
|
(set! has-shown-debugger-hint? #t)))
|
|
|
|
|
|
(force-output (current-error-port)))
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(primitive-exit 1)))
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(set! stack-saved? #f)))
|
|
|
|
|
|
|
|
|
|
|
|
(else
|
|
|
|
|
|
;; This is the other cons-leak closure...
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(cond ((= (length args) 4)
|
|
|
|
|
|
(apply handle-system-error key args))
|
|
|
|
|
|
(else
|
2006-02-04 14:36:06 +00:00
|
|
|
|
(apply bad-throw key args)))))))
|
|
|
|
|
|
|
2008-12-26 16:44:02 +01:00
|
|
|
|
;; Note that having just `pre-unwind-handler-dispatch'
|
2006-02-04 14:36:06 +00:00
|
|
|
|
;; here is connected with the mechanism that
|
|
|
|
|
|
;; produces a nice backtrace upon error. If, for
|
|
|
|
|
|
;; example, this is replaced with (lambda args
|
2008-12-26 16:44:02 +01:00
|
|
|
|
;; (apply pre-unwind-handler-dispatch args)), the stack
|
2006-02-04 14:36:06 +00:00
|
|
|
|
;; cutting (in save-stack) goes wrong and ends up
|
|
|
|
|
|
;; saving no stack at all, so there is no
|
|
|
|
|
|
;; backtrace.
|
2008-12-26 16:44:02 +01:00
|
|
|
|
pre-unwind-handler-dispatch)))
|
2006-02-04 14:36:06 +00:00
|
|
|
|
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(if next (loop next) status)))
|
1999-07-29 18:12:21 +00:00
|
|
|
|
(set! set-batch-mode?! (lambda (arg)
|
2001-04-28 19:07:38 +00:00
|
|
|
|
(cond (arg
|
1999-07-29 18:12:21 +00:00
|
|
|
|
(set! interactive #f)
|
|
|
|
|
|
(restore-signals))
|
|
|
|
|
|
(#t
|
|
|
|
|
|
(error "sorry, not implemented")))))
|
|
|
|
|
|
(set! batch-mode? (lambda () (not interactive)))
|
2002-10-09 22:47:34 +00:00
|
|
|
|
(call-with-blocked-asyncs
|
|
|
|
|
|
(lambda () (loop (lambda () #t))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1997-11-29 01:11:21 +00:00
|
|
|
|
;;(define the-last-stack (make-fluid)) Defined by scm_init_backtrace ()
|
1999-09-16 23:44:33 +00:00
|
|
|
|
(define before-signal-stack (make-fluid))
|
1996-11-02 20:51:30 +00:00
|
|
|
|
(define stack-saved? #f)
|
|
|
|
|
|
|
|
|
|
|
|
(define (save-stack . narrowing)
|
1999-03-12 09:48:18 +00:00
|
|
|
|
(or stack-saved?
|
|
|
|
|
|
(cond ((not (memq 'debug (debug-options-interface)))
|
|
|
|
|
|
(fluid-set! the-last-stack #f)
|
|
|
|
|
|
(set! stack-saved? #t))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(fluid-set!
|
|
|
|
|
|
the-last-stack
|
|
|
|
|
|
(case (stack-id #t)
|
|
|
|
|
|
((repl-stack)
|
2001-02-27 03:19:36 +00:00
|
|
|
|
(apply make-stack #t save-stack primitive-eval #t 0 narrowing))
|
1999-03-12 09:48:18 +00:00
|
|
|
|
((load-stack)
|
|
|
|
|
|
(apply make-stack #t save-stack 0 #t 0 narrowing))
|
|
|
|
|
|
((tk-stack)
|
|
|
|
|
|
(apply make-stack #t save-stack tk-stack-mark #t 0 narrowing))
|
|
|
|
|
|
((#t)
|
|
|
|
|
|
(apply make-stack #t save-stack 0 1 narrowing))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(let ((id (stack-id #t)))
|
|
|
|
|
|
(and (procedure? id)
|
|
|
|
|
|
(apply make-stack #t save-stack id #t 0 narrowing))))))
|
|
|
|
|
|
(set! stack-saved? #t)))))
|
1996-10-17 23:43:23 +00:00
|
|
|
|
|
* boot-9.scm (beautify-user-module!): Beautify also if public
interface is set to the module itself. In this way we can use
beautify-user-module! to beautify a module prepared for object
code.
(process-define-module): Special case: Try to load object code as
well if a module does :use-module on itself.
* boot-9.scm: Bugfix: Since boot-9.scm is now loaded from
invoke_main_func, we can no longer be sure that all modules have
been registered when boot-9.scm is loaded.
(register-modules): New function: Register and tag modules
registered by scm_register_module_xxx since last call to this
function. Modules are tagged with the dynamic object passed as
argument. (Already linked modules should be tagged with #f.)
(init-dynamic-module, link-dynamic-module): Call register-modules
first to register linked modules.
* boot-9.scm (init-dynamic-module): Remove module from
registered-modules as soon as possible in case we are recursively
invoked; Set public interface before doing the dynamic-call.
* boot-9.scm (map-in-order): Removed (replaced by scm_serial_map).
(abort-hook, before-error-hook, after-error-hook,
before-backtrace-hook, after-backtrace-hook, before-read-hook,
after-read-hook, exit-hook): Make hooks with `make-hook'.
* boot-9.scm: Make hooks first class citizens and make them easier
to use from C:
(make-hook, add-hook!, remove-hook!, run-hooks): Moved to
libguile/feature.c.
* boot-9.scm: Added warnings about bindings used in
libguile/modules.c: the-module, set-current-module,
make-modules-in, beautify-user-module!, module-eval-closure.
1998-11-23 02:36:43 +00:00
|
|
|
|
(define before-error-hook (make-hook))
|
|
|
|
|
|
(define after-error-hook (make-hook))
|
|
|
|
|
|
(define before-backtrace-hook (make-hook))
|
|
|
|
|
|
(define after-backtrace-hook (make-hook))
|
1996-10-17 23:43:23 +00:00
|
|
|
|
|
1996-11-02 20:51:30 +00:00
|
|
|
|
(define has-shown-debugger-hint? #f)
|
|
|
|
|
|
|
1996-10-17 21:56:22 +00:00
|
|
|
|
(define (handle-system-error key . args)
|
|
|
|
|
|
(let ((cep (current-error-port)))
|
1997-11-29 01:11:21 +00:00
|
|
|
|
(cond ((not (stack? (fluid-ref the-last-stack))))
|
1996-11-02 20:51:30 +00:00
|
|
|
|
((memq 'backtrace (debug-options-interface))
|
2004-09-23 17:56:10 +00:00
|
|
|
|
(let ((highlights (if (or (eq? key 'wrong-type-arg)
|
|
|
|
|
|
(eq? key 'out-of-range))
|
|
|
|
|
|
(list-ref args 3)
|
|
|
|
|
|
'())))
|
|
|
|
|
|
(run-hook before-backtrace-hook)
|
|
|
|
|
|
(newline cep)
|
|
|
|
|
|
(display "Backtrace:\n")
|
|
|
|
|
|
(display-backtrace (fluid-ref the-last-stack) cep
|
|
|
|
|
|
#f #f highlights)
|
|
|
|
|
|
(newline cep)
|
|
|
|
|
|
(run-hook after-backtrace-hook))))
|
1998-11-26 08:31:02 +00:00
|
|
|
|
(run-hook before-error-hook)
|
1997-11-29 01:11:21 +00:00
|
|
|
|
(apply display-error (fluid-ref the-last-stack) cep args)
|
1998-11-26 08:31:02 +00:00
|
|
|
|
(run-hook after-error-hook)
|
1996-10-17 21:56:22 +00:00
|
|
|
|
(force-output cep)
|
|
|
|
|
|
(throw 'abort key)))
|
1996-11-02 20:51:30 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (quit . args)
|
|
|
|
|
|
(apply throw 'quit args))
|
|
|
|
|
|
|
1997-03-02 19:53:32 +00:00
|
|
|
|
(define exit quit)
|
|
|
|
|
|
|
1997-02-10 01:05:50 +00:00
|
|
|
|
;;(define has-shown-backtrace-hint? #f) Defined by scm_init_backtrace ()
|
|
|
|
|
|
|
|
|
|
|
|
;; Replaced by C code:
|
|
|
|
|
|
;;(define (backtrace)
|
1997-11-29 01:11:21 +00:00
|
|
|
|
;; (if (fluid-ref the-last-stack)
|
1997-02-10 01:05:50 +00:00
|
|
|
|
;; (begin
|
|
|
|
|
|
;; (newline)
|
1997-11-29 01:11:21 +00:00
|
|
|
|
;; (display-backtrace (fluid-ref the-last-stack) (current-output-port))
|
1997-02-10 01:05:50 +00:00
|
|
|
|
;; (newline)
|
|
|
|
|
|
;; (if (and (not has-shown-backtrace-hint?)
|
|
|
|
|
|
;; (not (memq 'backtrace (debug-options-interface))))
|
|
|
|
|
|
;; (begin
|
|
|
|
|
|
;; (display
|
|
|
|
|
|
;;"Type \"(debug-enable 'backtrace)\" if you would like a backtrace
|
|
|
|
|
|
;;automatically if an error occurs in the future.\n")
|
|
|
|
|
|
;; (set! has-shown-backtrace-hint? #t))))
|
|
|
|
|
|
;; (display "No backtrace available.\n")))
|
1996-11-02 20:51:30 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (error-catching-repl r e p)
|
2001-05-15 00:51:06 +00:00
|
|
|
|
(error-catching-loop
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(call-with-values (lambda () (e (r)))
|
|
|
|
|
|
(lambda the-values (for-each p the-values))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(define (gc-run-time)
|
|
|
|
|
|
(cdr (assq 'gc-time-taken (gc-stats))))
|
|
|
|
|
|
|
* boot-9.scm (beautify-user-module!): Beautify also if public
interface is set to the module itself. In this way we can use
beautify-user-module! to beautify a module prepared for object
code.
(process-define-module): Special case: Try to load object code as
well if a module does :use-module on itself.
* boot-9.scm: Bugfix: Since boot-9.scm is now loaded from
invoke_main_func, we can no longer be sure that all modules have
been registered when boot-9.scm is loaded.
(register-modules): New function: Register and tag modules
registered by scm_register_module_xxx since last call to this
function. Modules are tagged with the dynamic object passed as
argument. (Already linked modules should be tagged with #f.)
(init-dynamic-module, link-dynamic-module): Call register-modules
first to register linked modules.
* boot-9.scm (init-dynamic-module): Remove module from
registered-modules as soon as possible in case we are recursively
invoked; Set public interface before doing the dynamic-call.
* boot-9.scm (map-in-order): Removed (replaced by scm_serial_map).
(abort-hook, before-error-hook, after-error-hook,
before-backtrace-hook, after-backtrace-hook, before-read-hook,
after-read-hook, exit-hook): Make hooks with `make-hook'.
* boot-9.scm: Make hooks first class citizens and make them easier
to use from C:
(make-hook, add-hook!, remove-hook!, run-hooks): Moved to
libguile/feature.c.
* boot-9.scm: Added warnings about bindings used in
libguile/modules.c: the-module, set-current-module,
make-modules-in, beautify-user-module!, module-eval-closure.
1998-11-23 02:36:43 +00:00
|
|
|
|
(define before-read-hook (make-hook))
|
|
|
|
|
|
(define after-read-hook (make-hook))
|
2001-03-17 15:32:17 +00:00
|
|
|
|
(define before-eval-hook (make-hook 1))
|
|
|
|
|
|
(define after-eval-hook (make-hook 1))
|
|
|
|
|
|
(define before-print-hook (make-hook 1))
|
|
|
|
|
|
(define after-print-hook (make-hook 1))
|
1996-10-17 23:43:23 +00:00
|
|
|
|
|
1998-05-12 23:59:21 +00:00
|
|
|
|
;;; The default repl-reader function. We may override this if we've
|
|
|
|
|
|
;;; the readline library.
|
|
|
|
|
|
(define repl-reader
|
|
|
|
|
|
(lambda (prompt)
|
2008-05-09 16:42:44 +02:00
|
|
|
|
(display (if (string? prompt) prompt (prompt)))
|
1998-05-12 23:59:21 +00:00
|
|
|
|
(force-output)
|
1998-11-26 08:31:02 +00:00
|
|
|
|
(run-hook before-read-hook)
|
2006-01-13 17:36:52 +00:00
|
|
|
|
((or (fluid-ref current-reader) read) (current-input-port))))
|
1998-05-12 23:59:21 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define (scm-style-repl)
|
2001-01-21 22:11:29 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(letrec (
|
|
|
|
|
|
(start-gc-rt #f)
|
|
|
|
|
|
(start-rt #f)
|
|
|
|
|
|
(repl-report-start-timing (lambda ()
|
|
|
|
|
|
(set! start-gc-rt (gc-run-time))
|
|
|
|
|
|
(set! start-rt (get-internal-run-time))))
|
|
|
|
|
|
(repl-report (lambda ()
|
|
|
|
|
|
(display ";;; ")
|
|
|
|
|
|
(display (inexact->exact
|
|
|
|
|
|
(* 1000 (/ (- (get-internal-run-time) start-rt)
|
|
|
|
|
|
internal-time-units-per-second))))
|
|
|
|
|
|
(display " msec (")
|
|
|
|
|
|
(display (inexact->exact
|
|
|
|
|
|
(* 1000 (/ (- (gc-run-time) start-gc-rt)
|
|
|
|
|
|
internal-time-units-per-second))))
|
|
|
|
|
|
(display " msec in gc)\n")))
|
1997-05-13 00:02:05 +00:00
|
|
|
|
|
|
|
|
|
|
(consume-trailing-whitespace
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(let ((ch (peek-char)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eof-object? ch))
|
|
|
|
|
|
((or (char=? ch #\space) (char=? ch #\tab))
|
|
|
|
|
|
(read-char)
|
|
|
|
|
|
(consume-trailing-whitespace))
|
|
|
|
|
|
((char=? ch #\newline)
|
|
|
|
|
|
(read-char))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(-read (lambda ()
|
1998-05-12 23:59:21 +00:00
|
|
|
|
(let ((val
|
|
|
|
|
|
(let ((prompt (cond ((string? scm-repl-prompt)
|
|
|
|
|
|
scm-repl-prompt)
|
|
|
|
|
|
((thunk? scm-repl-prompt)
|
|
|
|
|
|
(scm-repl-prompt))
|
|
|
|
|
|
(scm-repl-prompt "> ")
|
|
|
|
|
|
(else ""))))
|
|
|
|
|
|
(repl-reader prompt))))
|
|
|
|
|
|
|
1997-05-13 00:02:05 +00:00
|
|
|
|
;; As described in R4RS, the READ procedure updates the
|
1999-06-09 12:17:03 +00:00
|
|
|
|
;; port to point to the first character past the end of
|
1997-05-13 00:02:05 +00:00
|
|
|
|
;; the external representation of the object. This
|
|
|
|
|
|
;; means that it doesn't consume the newline typically
|
|
|
|
|
|
;; found after an expression. This means that, when
|
|
|
|
|
|
;; debugging Guile with GDB, GDB gets the newline, which
|
|
|
|
|
|
;; it often interprets as a "continue" command, making
|
|
|
|
|
|
;; breakpoints kind of useless. So, consume any
|
|
|
|
|
|
;; trailing newline here, as well as any whitespace
|
|
|
|
|
|
;; before it.
|
1999-06-09 12:17:03 +00:00
|
|
|
|
;; But not if EOF, for control-D.
|
|
|
|
|
|
(if (not (eof-object? val))
|
|
|
|
|
|
(consume-trailing-whitespace))
|
1998-11-26 08:31:02 +00:00
|
|
|
|
(run-hook after-read-hook)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if (eof-object? val)
|
|
|
|
|
|
(begin
|
1997-03-02 19:53:32 +00:00
|
|
|
|
(repl-report-start-timing)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if scm-repl-verbose
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(display ";;; EOF -- quitting")
|
|
|
|
|
|
(newline)))
|
|
|
|
|
|
(quit 0)))
|
|
|
|
|
|
val)))
|
|
|
|
|
|
|
|
|
|
|
|
(-eval (lambda (sourc)
|
|
|
|
|
|
(repl-report-start-timing)
|
2001-03-17 15:32:17 +00:00
|
|
|
|
(run-hook before-eval-hook sourc)
|
|
|
|
|
|
(let ((val (start-stack 'repl-stack
|
|
|
|
|
|
;; If you change this procedure
|
|
|
|
|
|
;; (primitive-eval), please also
|
|
|
|
|
|
;; modify the repl-stack case in
|
|
|
|
|
|
;; save-stack so that stack cutting
|
|
|
|
|
|
;; continues to work.
|
|
|
|
|
|
(primitive-eval sourc))))
|
|
|
|
|
|
(run-hook after-eval-hook sourc)
|
|
|
|
|
|
val)))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-08-11 00:44:49 +00:00
|
|
|
|
(-print (let ((maybe-print (lambda (result)
|
|
|
|
|
|
(if (or scm-repl-print-unspecified
|
|
|
|
|
|
(not (unspecified? result)))
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(write result)
|
|
|
|
|
|
(newline))))))
|
|
|
|
|
|
(lambda (result)
|
|
|
|
|
|
(if (not scm-repl-silent)
|
|
|
|
|
|
(begin
|
2001-03-17 15:32:17 +00:00
|
|
|
|
(run-hook before-print-hook result)
|
2000-11-26 18:28:57 +00:00
|
|
|
|
(maybe-print result)
|
2001-03-17 15:32:17 +00:00
|
|
|
|
(run-hook after-print-hook result)
|
2000-08-11 00:44:49 +00:00
|
|
|
|
(if scm-repl-verbose
|
|
|
|
|
|
(repl-report))
|
|
|
|
|
|
(force-output))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(-quit (lambda (args)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(if scm-repl-verbose
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(display ";;; QUIT executed, repl exitting")
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(repl-report)))
|
1997-03-02 06:09:41 +00:00
|
|
|
|
args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
(-abort (lambda ()
|
|
|
|
|
|
(if scm-repl-verbose
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(display ";;; ABORT executed.")
|
|
|
|
|
|
(newline)
|
|
|
|
|
|
(repl-report)))
|
|
|
|
|
|
(repl -read -eval -print))))
|
|
|
|
|
|
|
1997-03-02 06:09:41 +00:00
|
|
|
|
(let ((status (error-catching-repl -read
|
|
|
|
|
|
-eval
|
|
|
|
|
|
-print)))
|
|
|
|
|
|
(-quit status))))
|
2001-04-28 19:07:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-10-16 22:29:19 +00:00
|
|
|
|
;;; {IOTA functions: generating lists of numbers}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-06-05 05:59:26 +00:00
|
|
|
|
(define (iota n)
|
|
|
|
|
|
(let loop ((count (1- n)) (result '()))
|
|
|
|
|
|
(if (< count 0) result
|
|
|
|
|
|
(loop (1- count) (cons count result)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1998-11-12 16:03:11 +00:00
|
|
|
|
;;; {collect}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Similar to `begin' but returns a list of the results of all constituent
|
|
|
|
|
|
;;; forms instead of the result of the last form.
|
|
|
|
|
|
;;; (The definition relies on the current left-to-right
|
|
|
|
|
|
;;; order of evaluation of operands in applications.)
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1998-11-12 16:03:11 +00:00
|
|
|
|
|
|
|
|
|
|
(defmacro collect forms
|
|
|
|
|
|
(cons 'list forms))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
1997-07-26 20:03:23 +00:00
|
|
|
|
;;; {with-fluids}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1997-07-26 20:03:23 +00:00
|
|
|
|
|
|
|
|
|
|
;; with-fluids is a convenience wrapper for the builtin procedure
|
|
|
|
|
|
;; `with-fluids*'. The syntax is just like `let':
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; (with-fluids ((fluid val)
|
|
|
|
|
|
;; ...)
|
|
|
|
|
|
;; body)
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro with-fluids (bindings . body)
|
2004-01-07 19:51:07 +00:00
|
|
|
|
(let ((fluids (map car bindings))
|
|
|
|
|
|
(values (map cadr bindings)))
|
|
|
|
|
|
(if (and (= (length fluids) 1) (= (length values) 1))
|
|
|
|
|
|
`(with-fluid* ,(car fluids) ,(car values) (lambda () ,@body))
|
|
|
|
|
|
`(with-fluids* (list ,@fluids) (list ,@values)
|
|
|
|
|
|
(lambda () ,@body)))))
|
1997-07-26 20:03:23 +00:00
|
|
|
|
|
2003-08-12 21:38:21 +00:00
|
|
|
|
;;; {While}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; with `continue' and `break'.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; The inner `do' loop avoids re-establishing a catch every iteration,
|
2003-08-17 00:36:04 +00:00
|
|
|
|
;; that's only necessary if continue is actually used. A new key is
|
|
|
|
|
|
;; generated every time, so break and continue apply to their originating
|
2008-10-11 15:03:00 +02:00
|
|
|
|
;; `while' even when recursing.
|
2003-08-12 21:38:21 +00:00
|
|
|
|
;;
|
2008-10-11 15:03:00 +02:00
|
|
|
|
;; FIXME: This macro is unintentionally unhygienic with respect to let,
|
|
|
|
|
|
;; make-symbol, do, throw, catch, lambda, and not.
|
2005-01-27 21:20:47 +00:00
|
|
|
|
;;
|
2003-08-12 21:38:21 +00:00
|
|
|
|
(define-macro (while cond . body)
|
2008-10-11 15:03:00 +02:00
|
|
|
|
(let ((keyvar (make-symbol "while-keyvar")))
|
|
|
|
|
|
`(let ((,keyvar (make-symbol "while-key")))
|
|
|
|
|
|
(do ()
|
|
|
|
|
|
((catch ,keyvar
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(let ((break (lambda () (throw ,keyvar #t)))
|
|
|
|
|
|
(continue (lambda () (throw ,keyvar #f))))
|
|
|
|
|
|
(do ()
|
|
|
|
|
|
((not ,cond))
|
|
|
|
|
|
,@body)
|
|
|
|
|
|
#t))
|
|
|
|
|
|
(lambda (key arg)
|
|
|
|
|
|
arg)))))))
|
2003-08-17 00:36:04 +00:00
|
|
|
|
|
2003-08-12 21:38:21 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;;; {Module System Macros}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; Return a list of expressions that evaluate to the appropriate
|
|
|
|
|
|
;; arguments for resolve-interface according to SPEC.
|
|
|
|
|
|
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
(eval-when
|
2009-03-06 16:57:17 +01:00
|
|
|
|
(compile)
|
|
|
|
|
|
(if (memq 'prefix (read-options))
|
|
|
|
|
|
(error "boot-9 must be compiled with #:kw, not :kw")))
|
2008-09-09 06:56:06 +02:00
|
|
|
|
|
2001-06-01 20:15:10 +00:00
|
|
|
|
(define (compile-interface-spec spec)
|
|
|
|
|
|
(define (make-keyarg sym key quote?)
|
|
|
|
|
|
(cond ((or (memq sym spec)
|
|
|
|
|
|
(memq key spec))
|
|
|
|
|
|
=> (lambda (rest)
|
|
|
|
|
|
(if quote?
|
|
|
|
|
|
(list key (list 'quote (cadr rest)))
|
|
|
|
|
|
(list key (cadr rest)))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
'())))
|
|
|
|
|
|
(define (map-apply func list)
|
|
|
|
|
|
(map (lambda (args) (apply func args)) list))
|
2001-08-30 23:25:34 +00:00
|
|
|
|
(define keys
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; sym key quote?
|
|
|
|
|
|
'((:select #:select #t)
|
2003-03-11 19:58:14 +00:00
|
|
|
|
(:hide #:hide #t)
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(:prefix #:prefix #t)
|
2001-07-12 23:26:52 +00:00
|
|
|
|
(:renamer #:renamer #f)))
|
2001-06-01 20:15:10 +00:00
|
|
|
|
(if (not (pair? (car spec)))
|
|
|
|
|
|
`(',spec)
|
|
|
|
|
|
`(',(car spec)
|
|
|
|
|
|
,@(apply append (map-apply make-keyarg keys)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (keyword-like-symbol->keyword sym)
|
|
|
|
|
|
(symbol->keyword (string->symbol (substring (symbol->string sym) 1))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (compile-define-module-args args)
|
|
|
|
|
|
;; Just quote everything except #:use-module and #:use-syntax. We
|
|
|
|
|
|
;; need to know about all arguments regardless since we want to turn
|
|
|
|
|
|
;; symbols that look like keywords into real keywords, and the
|
|
|
|
|
|
;; keyword args in a define-module form are not regular
|
|
|
|
|
|
;; (i.e. no-backtrace doesn't take a value).
|
|
|
|
|
|
(let loop ((compiled-args `((quote ,(car args))))
|
|
|
|
|
|
(args (cdr args)))
|
|
|
|
|
|
(cond ((null? args)
|
|
|
|
|
|
(reverse! compiled-args))
|
|
|
|
|
|
;; symbol in keyword position
|
|
|
|
|
|
((symbol? (car args))
|
|
|
|
|
|
(loop compiled-args
|
|
|
|
|
|
(cons (keyword-like-symbol->keyword (car args)) (cdr args))))
|
|
|
|
|
|
((memq (car args) '(#:no-backtrace #:pure))
|
|
|
|
|
|
(loop (cons (car args) compiled-args)
|
|
|
|
|
|
(cdr args)))
|
|
|
|
|
|
((null? (cdr args))
|
|
|
|
|
|
(error "keyword without value:" (car args)))
|
|
|
|
|
|
((memq (car args) '(#:use-module #:use-syntax))
|
|
|
|
|
|
(loop (cons* `(list ,@(compile-interface-spec (cadr args)))
|
|
|
|
|
|
(car args)
|
|
|
|
|
|
compiled-args)
|
|
|
|
|
|
(cddr args)))
|
|
|
|
|
|
((eq? (car args) #:autoload)
|
|
|
|
|
|
(loop (cons* `(quote ,(caddr args))
|
|
|
|
|
|
`(quote ,(cadr args))
|
|
|
|
|
|
(car args)
|
|
|
|
|
|
compiled-args)
|
|
|
|
|
|
(cdddr args)))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(loop (cons* `(quote ,(cadr args))
|
|
|
|
|
|
(car args)
|
|
|
|
|
|
compiled-args)
|
|
|
|
|
|
(cddr args))))))
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(defmacro define-module args
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
`(eval-when
|
|
|
|
|
|
(eval load compile)
|
|
|
|
|
|
(let ((m (process-define-module
|
|
|
|
|
|
(list ,@(compile-define-module-args args)))))
|
|
|
|
|
|
(set-current-module m)
|
|
|
|
|
|
m)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-06-01 20:15:10 +00:00
|
|
|
|
;; The guts of the use-modules macro. Add the interfaces of the named
|
|
|
|
|
|
;; modules to the use-list of the current module, in order.
|
|
|
|
|
|
|
2001-11-23 21:43:44 +00:00
|
|
|
|
;; This function is called by "modules.c". If you change it, be sure
|
|
|
|
|
|
;; to change scm_c_use_module as well.
|
|
|
|
|
|
|
2001-06-01 20:15:10 +00:00
|
|
|
|
(define (process-use-modules module-interface-args)
|
2003-03-12 14:11:42 +00:00
|
|
|
|
(let ((interfaces (map (lambda (mif-args)
|
|
|
|
|
|
(or (apply resolve-interface mif-args)
|
|
|
|
|
|
(error "no such module" mif-args)))
|
|
|
|
|
|
module-interface-args)))
|
|
|
|
|
|
(call-with-deferred-observers
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(module-use-interfaces! (current-module) interfaces)))))
|
1997-04-29 18:22:54 +00:00
|
|
|
|
|
1997-01-05 23:38:10 +00:00
|
|
|
|
(defmacro use-modules modules
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
`(eval-when
|
|
|
|
|
|
(eval load compile)
|
|
|
|
|
|
(process-use-modules
|
|
|
|
|
|
(list ,@(map (lambda (m)
|
|
|
|
|
|
`(list ,@(compile-interface-spec m)))
|
|
|
|
|
|
modules)))
|
|
|
|
|
|
*unspecified*))
|
1997-01-05 23:38:10 +00:00
|
|
|
|
|
1998-06-07 10:29:40 +00:00
|
|
|
|
(defmacro use-syntax (spec)
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
`(eval-when
|
|
|
|
|
|
(eval load compile)
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(issue-deprecation-warning
|
|
|
|
|
|
"`use-syntax' is deprecated. Please contact guile-devel for more info.")
|
|
|
|
|
|
(process-use-modules (list (list ,@(compile-interface-spec spec))))
|
|
|
|
|
|
*unspecified*))
|
1997-09-10 20:07:04 +00:00
|
|
|
|
|
2002-11-24 08:18:19 +00:00
|
|
|
|
;; Dirk:FIXME:: This incorrect (according to R5RS) syntax needs to be changed
|
|
|
|
|
|
;; as soon as guile supports hygienic macros.
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
(define-syntax define-private
|
|
|
|
|
|
(syntax-rules ()
|
|
|
|
|
|
((_ foo bar)
|
|
|
|
|
|
(define foo bar))))
|
|
|
|
|
|
|
|
|
|
|
|
(define-syntax define-public
|
|
|
|
|
|
(syntax-rules ()
|
|
|
|
|
|
((_ (name . args) . body)
|
|
|
|
|
|
(define-public name (lambda args . body)))
|
|
|
|
|
|
((_ name val)
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(define name val)
|
|
|
|
|
|
(export name)))))
|
|
|
|
|
|
|
|
|
|
|
|
(define-syntax defmacro-public
|
|
|
|
|
|
(syntax-rules ()
|
|
|
|
|
|
((_ name args . body)
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(defmacro name args . body)
|
|
|
|
|
|
(export-syntax name)))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-06-04 22:14:16 +00:00
|
|
|
|
;; Export a local variable
|
2001-11-23 21:43:44 +00:00
|
|
|
|
|
|
|
|
|
|
;; This function is called from "modules.c". If you change it, be
|
|
|
|
|
|
;; sure to update "modules.c" as well.
|
|
|
|
|
|
|
2000-06-21 01:16:45 +00:00
|
|
|
|
(define (module-export! m names)
|
|
|
|
|
|
(let ((public-i (module-public-interface m)))
|
|
|
|
|
|
(for-each (lambda (name)
|
2001-06-04 22:14:16 +00:00
|
|
|
|
(let ((var (module-ensure-local-variable! m name)))
|
|
|
|
|
|
(module-add! public-i name var)))
|
|
|
|
|
|
names)))
|
|
|
|
|
|
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(define (module-replace! m names)
|
|
|
|
|
|
(let ((public-i (module-public-interface m)))
|
|
|
|
|
|
(for-each (lambda (name)
|
|
|
|
|
|
(let ((var (module-ensure-local-variable! m name)))
|
|
|
|
|
|
(set-object-property! var 'replace #t)
|
|
|
|
|
|
(module-add! public-i name var)))
|
|
|
|
|
|
names)))
|
|
|
|
|
|
|
2001-06-04 22:14:16 +00:00
|
|
|
|
;; Re-export a imported variable
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (module-re-export! m names)
|
|
|
|
|
|
(let ((public-i (module-public-interface m)))
|
|
|
|
|
|
(for-each (lambda (name)
|
|
|
|
|
|
(let ((var (module-variable m name)))
|
|
|
|
|
|
(cond ((not var)
|
|
|
|
|
|
(error "Undefined variable:" name))
|
|
|
|
|
|
((eq? var (module-local-variable m name))
|
|
|
|
|
|
(error "re-exporting local variable:" name))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(module-add! public-i name var)))))
|
2000-06-21 01:16:45 +00:00
|
|
|
|
names)))
|
|
|
|
|
|
|
1998-07-15 23:01:45 +00:00
|
|
|
|
(defmacro export names
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
`(call-with-deferred-observers
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(module-export! (current-module) ',names))))
|
1998-07-15 23:01:45 +00:00
|
|
|
|
|
2001-06-04 22:14:16 +00:00
|
|
|
|
(defmacro re-export names
|
Replace eval-case with eval-when
* module/ice-9/boot-9.scm (eval-when): Replace eval-case with eval-when.
Eval-when is *much* simpler, and more expressive to boot. Perhaps in
the future we'll get 'visit and 'revisit too.
* module/ice-9/deprecated.scm (eval-case): Provide mostly-working
deprecated version of eval-case.
* module/ice-9/boot-9.scm (defmacro, define-macro): Relax condition: we
can make defmacros that are not at the toplevel now. But in the future
we should replace this implementation of defmacros with one written in
syntax-case.
(define-module, use-modules, use-syntax): Allow at non-toplevel.
(define-public, defmacro-public, export, re-export): Don't evaluate at
compile-time, I can't see how that helps things. Allow `export' and
`re-export' at non-toplevel.
* module/ice-9/getopt-long.scm:
* module/ice-9/i18n.scm:
* module/oop/goops.scm:
* module/oop/goops/compile.scm:
* module/oop/goops/dispatch.scm: Switch to use eval-when, not
eval-case.
* module/language/scheme/compile-ghil.scm (eval-when): Replace eval-case
transformer with eval-when transformer. Sooooo much simpler, and it
will get better once we separate expansion from compilation.
* module/language/scheme/expand.scm (quasiquote): Hm, expand quasiquote
properly. Not hygienic. Syncase needed.
(lambda): Handle internal defines with docstrings propertly.
2009-03-06 13:29:13 +01:00
|
|
|
|
`(call-with-deferred-observers
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(module-re-export! (current-module) ',names))))
|
2001-06-04 22:14:16 +00:00
|
|
|
|
|
2002-11-16 15:05:29 +00:00
|
|
|
|
(defmacro export-syntax names
|
2002-11-16 15:40:27 +00:00
|
|
|
|
`(export ,@names))
|
1998-07-15 23:01:45 +00:00
|
|
|
|
|
2002-11-24 08:28:05 +00:00
|
|
|
|
(defmacro re-export-syntax names
|
|
|
|
|
|
`(re-export ,@names))
|
1998-07-15 23:01:45 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(define load load-module)
|
|
|
|
|
|
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
recompiling with compile environments, fluid languages, cleanups
* ice-9/boot-9.scm (compile-time-environment): Remove definition from
boot-9 -- instead, autoload it and `compile' from (system base
compile).
* libguile/objcodes.h:
* libguile/objcodes.c (scm_objcode_to_program): Add an optional argument,
`external', the external list to set on the returned program.
* libguile/vm-i-system.c (externals): New instruction, returns the
external list. Only used by (compile-time-environment).
* libguile/vm.c (scm_load_compiled_with_vm): Adapt to
scm_objcode_to_program change.
* module/language/scheme/translate.scm (translate): Actually pay
attention to the environment passed as an argument.
(custom-transformer-table): Expand out (compile-time-environment) to
something that can be passed to `compile'.
* module/system/base/compile.scm (*current-language*): Instead of
hard-coding `scheme' in various places, use a current language fluid,
initialized to `scheme'.
(compile-file, load-source-file): Adapt to *current-language*.
(load-source-file): Ada
(scheme-eval): Removed, no one used this.
(compiled-file-name): Don't hard-code "scm" and "go"; instead use the
%load-extensions and %load-compiled-extensions.
(cenv-module, cenv-ghil-env, cenv-externals): Some accessors for
compile-time environments.
(compile-time-environment): Here we define (compile-time-environment)
to something that will return #f; the compiler however produces
different code as noted above.
(compile): New function, compiles an expression into a thunk, then runs
the thunk to get the value. Useful for procedures. The optional second
argument can be either a module or a compile-time-environment; in the
latter case, we can recompile even with lexical bindings.
(compile-in): If the env specifies a module, set that module for the
duration of the compilation.
* module/system/base/syntax.scm (%compute-initargs): Fix a bug where the
default value for a field would always replace a user-supplied value.
Whoops.
* module/system/il/ghil.scm (ghil-env-dereify): New function, takes the
result of ghil-env-reify and turns it back into a GHIL environment.
* scripts/compile (compile): Remove some of the tricky error handling, as
the library procedures handle this for us.
* test-suite/tests/compiler.test: Add a test for the dynamic compilation
bits.
2008-10-30 10:57:36 +01:00
|
|
|
|
;;; {Compiler interface}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; The full compiler interface can be found in (system). Here we put a
|
|
|
|
|
|
;;; few useful procedures into the global namespace.
|
|
|
|
|
|
|
|
|
|
|
|
(module-autoload! the-scm-module
|
|
|
|
|
|
'(system base compile)
|
|
|
|
|
|
'(compile
|
|
|
|
|
|
compile-time-environment))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-03-10 23:18:05 +00:00
|
|
|
|
;;; {Parameters}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define make-mutable-parameter
|
|
|
|
|
|
(let ((make (lambda (fluid converter)
|
|
|
|
|
|
(lambda args
|
|
|
|
|
|
(if (null? args)
|
|
|
|
|
|
(fluid-ref fluid)
|
|
|
|
|
|
(fluid-set! fluid (converter (car args))))))))
|
|
|
|
|
|
(lambda (init . converter)
|
|
|
|
|
|
(let ((fluid (make-fluid))
|
|
|
|
|
|
(converter (if (null? converter)
|
|
|
|
|
|
identity
|
|
|
|
|
|
(car converter))))
|
|
|
|
|
|
(fluid-set! fluid (converter init))
|
|
|
|
|
|
(make fluid converter)))))
|
|
|
|
|
|
|
2003-03-07 13:12:47 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
2003-03-07 13:12:47 +00:00
|
|
|
|
;;; {Handling of duplicate imported bindings}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; Duplicate handlers take the following arguments:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; module importing module
|
|
|
|
|
|
;; name conflicting name
|
|
|
|
|
|
;; int1 old interface where name occurs
|
|
|
|
|
|
;; val1 value of binding in old interface
|
|
|
|
|
|
;; int2 new interface where name occurs
|
|
|
|
|
|
;; val2 value of binding in new interface
|
|
|
|
|
|
;; var previous resolution or #f
|
|
|
|
|
|
;; val value of previous resolution
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; A duplicate handler can take three alternative actions:
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; 1. return #f => leave responsibility to next handler
|
|
|
|
|
|
;; 2. exit with an error
|
|
|
|
|
|
;; 3. return a variable resolving the conflict
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
(define duplicate-handlers
|
|
|
|
|
|
(let ((m (make-module 7)))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
|
|
|
|
|
(define (check module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
(scm-error 'misc-error
|
|
|
|
|
|
#f
|
2003-03-11 20:11:20 +00:00
|
|
|
|
"~A: `~A' imported from both ~A and ~A"
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(list (module-name module)
|
|
|
|
|
|
name
|
|
|
|
|
|
(module-name int1)
|
|
|
|
|
|
(module-name int2))
|
|
|
|
|
|
#f))
|
|
|
|
|
|
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(define (warn module name int1 val1 int2 val2 var val)
|
2007-09-01 16:54:26 +00:00
|
|
|
|
(format (current-error-port)
|
2003-03-12 19:27:15 +00:00
|
|
|
|
"WARNING: ~A: `~A' imported from both ~A and ~A\n"
|
|
|
|
|
|
(module-name module)
|
|
|
|
|
|
name
|
|
|
|
|
|
(module-name int1)
|
|
|
|
|
|
(module-name int2))
|
|
|
|
|
|
#f)
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
|
|
|
|
|
(define (replace module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
(let ((old (or (and var (object-property var 'replace) var)
|
|
|
|
|
|
(module-variable int1 name)))
|
|
|
|
|
|
(new (module-variable int2 name)))
|
|
|
|
|
|
(if (object-property old 'replace)
|
|
|
|
|
|
(and (or (eq? old new)
|
|
|
|
|
|
(not (object-property new 'replace)))
|
|
|
|
|
|
old)
|
|
|
|
|
|
(and (object-property new 'replace)
|
|
|
|
|
|
new))))
|
|
|
|
|
|
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(define (warn-override-core module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
(and (eq? int1 the-scm-module)
|
|
|
|
|
|
(begin
|
2007-09-01 16:54:26 +00:00
|
|
|
|
(format (current-error-port)
|
2003-03-12 19:27:15 +00:00
|
|
|
|
"WARNING: ~A: imported module ~A overrides core binding `~A'\n"
|
|
|
|
|
|
(module-name module)
|
|
|
|
|
|
(module-name int2)
|
|
|
|
|
|
name)
|
|
|
|
|
|
(module-local-variable int2 name))))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(define (first module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
(or var (module-local-variable int1 name)))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(define (last module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
(module-local-variable int2 name))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(define (noop module name int1 val1 int2 val2 var val)
|
|
|
|
|
|
#f)
|
|
|
|
|
|
|
2003-03-07 13:12:47 +00:00
|
|
|
|
(set-module-name! m 'duplicate-handlers)
|
|
|
|
|
|
(set-module-kind! m 'interface)
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(module-define! m 'check check)
|
|
|
|
|
|
(module-define! m 'warn warn)
|
|
|
|
|
|
(module-define! m 'replace replace)
|
|
|
|
|
|
(module-define! m 'warn-override-core warn-override-core)
|
|
|
|
|
|
(module-define! m 'first first)
|
|
|
|
|
|
(module-define! m 'last last)
|
2003-03-12 19:27:15 +00:00
|
|
|
|
(module-define! m 'merge-generics noop)
|
|
|
|
|
|
(module-define! m 'merge-accessors noop)
|
2003-03-07 13:12:47 +00:00
|
|
|
|
m))
|
|
|
|
|
|
|
2003-03-10 23:18:05 +00:00
|
|
|
|
(define (lookup-duplicates-handlers handler-names)
|
2003-03-11 15:58:02 +00:00
|
|
|
|
(and handler-names
|
|
|
|
|
|
(map (lambda (handler-name)
|
|
|
|
|
|
(or (module-symbol-local-binding
|
|
|
|
|
|
duplicate-handlers handler-name #f)
|
|
|
|
|
|
(error "invalid duplicate handler name:"
|
|
|
|
|
|
handler-name)))
|
|
|
|
|
|
(if (list? handler-names)
|
|
|
|
|
|
handler-names
|
|
|
|
|
|
(list handler-names)))))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2003-03-12 10:03:25 +00:00
|
|
|
|
(define default-duplicate-binding-procedures
|
|
|
|
|
|
(make-mutable-parameter #f))
|
|
|
|
|
|
|
|
|
|
|
|
(define default-duplicate-binding-handler
|
2003-03-12 17:16:36 +00:00
|
|
|
|
(make-mutable-parameter '(replace warn-override-core warn last)
|
2003-03-12 10:03:25 +00:00
|
|
|
|
(lambda (handler-names)
|
|
|
|
|
|
(default-duplicate-binding-procedures
|
|
|
|
|
|
(lookup-duplicates-handlers handler-names))
|
|
|
|
|
|
handler-names)))
|
2003-03-10 23:18:05 +00:00
|
|
|
|
|
2001-05-11 05:41:03 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {`cond-expand' for SRFI-0 support.}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; This syntactic form expands into different commands or
|
|
|
|
|
|
;;; definitions, depending on the features provided by the Scheme
|
|
|
|
|
|
;;; implementation.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Syntax:
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; <cond-expand>
|
|
|
|
|
|
;;; --> (cond-expand <cond-expand-clause>+)
|
|
|
|
|
|
;;; | (cond-expand <cond-expand-clause>* (else <command-or-definition>))
|
|
|
|
|
|
;;; <cond-expand-clause>
|
|
|
|
|
|
;;; --> (<feature-requirement> <command-or-definition>*)
|
|
|
|
|
|
;;; <feature-requirement>
|
|
|
|
|
|
;;; --> <feature-identifier>
|
|
|
|
|
|
;;; | (and <feature-requirement>*)
|
|
|
|
|
|
;;; | (or <feature-requirement>*)
|
|
|
|
|
|
;;; | (not <feature-requirement>)
|
|
|
|
|
|
;;; <feature-identifier>
|
|
|
|
|
|
;;; --> <a symbol which is the name or alias of a SRFI>
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Additionally, this implementation provides the
|
|
|
|
|
|
;;; <feature-identifier>s `guile' and `r5rs', so that programs can
|
|
|
|
|
|
;;; determine the implementation type and the supported standard.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Currently, the following feature identifiers are supported:
|
|
|
|
|
|
;;;
|
2005-12-06 21:32:09 +00:00
|
|
|
|
;;; guile r5rs srfi-0 srfi-4 srfi-6 srfi-13 srfi-14 srfi-55 srfi-61
|
2001-05-11 05:41:03 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
;;; Remember to update the features list when adding more SRFIs.
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
2001-05-11 05:41:03 +00:00
|
|
|
|
|
2001-05-23 05:08:17 +00:00
|
|
|
|
(define %cond-expand-features
|
2001-05-15 20:20:51 +00:00
|
|
|
|
;; Adjust the above comment when changing this.
|
2004-07-09 23:44:48 +00:00
|
|
|
|
'(guile
|
|
|
|
|
|
r5rs
|
|
|
|
|
|
srfi-0 ;; cond-expand itself
|
2004-10-26 17:05:32 +00:00
|
|
|
|
srfi-4 ;; homogenous numeric vectors
|
2004-07-09 23:44:48 +00:00
|
|
|
|
srfi-6 ;; open-input-string etc, in the guile core
|
2004-08-24 22:20:47 +00:00
|
|
|
|
srfi-13 ;; string library
|
|
|
|
|
|
srfi-14 ;; character sets
|
2005-02-12 06:12:21 +00:00
|
|
|
|
srfi-55 ;; require-extension
|
2005-12-06 21:32:09 +00:00
|
|
|
|
srfi-61 ;; general cond clause
|
2004-07-09 23:44:48 +00:00
|
|
|
|
))
|
2001-05-14 19:09:50 +00:00
|
|
|
|
|
2001-05-23 05:08:17 +00:00
|
|
|
|
;; This table maps module public interfaces to the list of features.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define %cond-expand-table (make-hash-table 31))
|
|
|
|
|
|
|
|
|
|
|
|
;; Add one or more features to the `cond-expand' feature list of the
|
|
|
|
|
|
;; module `module'.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (cond-expand-provide module features)
|
|
|
|
|
|
(let ((mod (module-public-interface module)))
|
|
|
|
|
|
(and mod
|
|
|
|
|
|
(hashq-set! %cond-expand-table mod
|
|
|
|
|
|
(append (hashq-ref %cond-expand-table mod '())
|
|
|
|
|
|
features)))))
|
|
|
|
|
|
|
2001-05-25 13:18:52 +00:00
|
|
|
|
(define cond-expand
|
|
|
|
|
|
(procedure->memoizing-macro
|
|
|
|
|
|
(lambda (exp env)
|
|
|
|
|
|
(let ((clauses (cdr exp))
|
|
|
|
|
|
(syntax-error (lambda (cl)
|
|
|
|
|
|
(error "invalid clause in `cond-expand'" cl))))
|
|
|
|
|
|
(letrec
|
|
|
|
|
|
((test-clause
|
|
|
|
|
|
(lambda (clause)
|
2001-05-11 05:41:03 +00:00
|
|
|
|
(cond
|
2001-05-25 13:18:52 +00:00
|
|
|
|
((symbol? clause)
|
|
|
|
|
|
(or (memq clause %cond-expand-features)
|
|
|
|
|
|
(let lp ((uses (module-uses (env-module env))))
|
|
|
|
|
|
(if (pair? uses)
|
|
|
|
|
|
(or (memq clause
|
|
|
|
|
|
(hashq-ref %cond-expand-table
|
|
|
|
|
|
(car uses) '()))
|
|
|
|
|
|
(lp (cdr uses)))
|
|
|
|
|
|
#f))))
|
|
|
|
|
|
((pair? clause)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq? 'and (car clause))
|
|
|
|
|
|
(let lp ((l (cdr clause)))
|
|
|
|
|
|
(cond ((null? l)
|
|
|
|
|
|
#t)
|
|
|
|
|
|
((pair? l)
|
|
|
|
|
|
(and (test-clause (car l)) (lp (cdr l))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(syntax-error clause)))))
|
|
|
|
|
|
((eq? 'or (car clause))
|
|
|
|
|
|
(let lp ((l (cdr clause)))
|
|
|
|
|
|
(cond ((null? l)
|
|
|
|
|
|
#f)
|
|
|
|
|
|
((pair? l)
|
|
|
|
|
|
(or (test-clause (car l)) (lp (cdr l))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(syntax-error clause)))))
|
|
|
|
|
|
((eq? 'not (car clause))
|
|
|
|
|
|
(cond ((not (pair? (cdr clause)))
|
|
|
|
|
|
(syntax-error clause))
|
|
|
|
|
|
((pair? (cddr clause))
|
|
|
|
|
|
((syntax-error clause))))
|
|
|
|
|
|
(not (test-clause (cadr clause))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(syntax-error clause))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(syntax-error clause))))))
|
|
|
|
|
|
(let lp ((c clauses))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null? c)
|
|
|
|
|
|
(error "Unfulfilled `cond-expand'"))
|
|
|
|
|
|
((not (pair? c))
|
2001-05-11 05:41:03 +00:00
|
|
|
|
(syntax-error c))
|
2001-05-25 13:18:52 +00:00
|
|
|
|
((not (pair? (car c)))
|
|
|
|
|
|
(syntax-error (car c)))
|
|
|
|
|
|
((test-clause (caar c))
|
|
|
|
|
|
`(begin ,@(cdar c)))
|
|
|
|
|
|
((eq? (caar c) 'else)
|
|
|
|
|
|
(if (pair? (cdr c))
|
|
|
|
|
|
(syntax-error c))
|
|
|
|
|
|
`(begin ,@(cdar c)))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(lp (cdr c))))))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-05-15 20:20:51 +00:00
|
|
|
|
;; This procedure gets called from the startup code with a list of
|
|
|
|
|
|
;; numbers, which are the numbers of the SRFIs to be loaded on startup.
|
|
|
|
|
|
;;
|
|
|
|
|
|
(define (use-srfis srfis)
|
2007-01-15 23:22:36 +00:00
|
|
|
|
(process-use-modules
|
|
|
|
|
|
(map (lambda (num)
|
|
|
|
|
|
(list (list 'srfi (string->symbol
|
|
|
|
|
|
(string-append "srfi-" (number->string num))))))
|
|
|
|
|
|
srfis)))
|
2001-05-18 17:28:03 +00:00
|
|
|
|
|
1998-10-19 13:49:29 +00:00
|
|
|
|
|
2001-01-21 22:11:29 +00:00
|
|
|
|
|
2005-02-12 06:12:21 +00:00
|
|
|
|
;;; srfi-55: require-extension
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define-macro (require-extension extension-spec)
|
|
|
|
|
|
;; This macro only handles the srfi extension, which, at present, is
|
|
|
|
|
|
;; the only one defined by the standard.
|
|
|
|
|
|
(if (not (pair? extension-spec))
|
|
|
|
|
|
(scm-error 'wrong-type-arg "require-extension"
|
|
|
|
|
|
"Not an extension: ~S" (list extension-spec) #f))
|
|
|
|
|
|
(let ((extension (car extension-spec))
|
|
|
|
|
|
(extension-args (cdr extension-spec)))
|
|
|
|
|
|
(case extension
|
|
|
|
|
|
((srfi)
|
|
|
|
|
|
(let ((use-list '()))
|
|
|
|
|
|
(for-each
|
|
|
|
|
|
(lambda (i)
|
|
|
|
|
|
(if (not (integer? i))
|
|
|
|
|
|
(scm-error 'wrong-type-arg "require-extension"
|
|
|
|
|
|
"Invalid srfi name: ~S" (list i) #f))
|
|
|
|
|
|
(let ((srfi-sym (string->symbol
|
|
|
|
|
|
(string-append "srfi-" (number->string i)))))
|
|
|
|
|
|
(if (not (memq srfi-sym %cond-expand-features))
|
|
|
|
|
|
(set! use-list (cons `(use-modules (srfi ,srfi-sym))
|
|
|
|
|
|
use-list)))))
|
|
|
|
|
|
extension-args)
|
|
|
|
|
|
(if (pair? use-list)
|
|
|
|
|
|
;; i.e. (begin (use-modules x) (use-modules y) (use-modules z))
|
|
|
|
|
|
`(begin ,@(reverse! use-list)))))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(scm-error
|
|
|
|
|
|
'wrong-type-arg "require-extension"
|
|
|
|
|
|
"Not a recognized extension type: ~S" (list extension) #f)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-10-19 13:49:29 +00:00
|
|
|
|
;;; {Load emacs interface support if emacs option is given.}
|
2004-05-29 08:40:38 +00:00
|
|
|
|
;;;
|
1998-10-19 13:49:29 +00:00
|
|
|
|
|
2001-02-13 01:07:45 +00:00
|
|
|
|
(define (named-module-use! user usee)
|
2001-06-04 22:14:16 +00:00
|
|
|
|
(module-use! (resolve-module user) (resolve-interface usee)))
|
2001-02-13 01:07:45 +00:00
|
|
|
|
|
1998-10-19 13:49:29 +00:00
|
|
|
|
(define (load-emacs-interface)
|
2001-05-10 22:00:22 +00:00
|
|
|
|
(and (provided? 'debug-extensions)
|
|
|
|
|
|
(debug-enable 'backtrace))
|
2001-02-13 01:07:45 +00:00
|
|
|
|
(named-module-use! '(guile-user) '(ice-9 emacs)))
|
1998-10-19 13:49:29 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1999-09-11 18:27:52 +00:00
|
|
|
|
(define using-readline?
|
|
|
|
|
|
(let ((using-readline? (make-fluid)))
|
|
|
|
|
|
(make-procedure-with-setter
|
|
|
|
|
|
(lambda () (fluid-ref using-readline?))
|
|
|
|
|
|
(lambda (v) (fluid-set! using-readline? v)))))
|
|
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
(define (top-repl)
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(let ((guile-user-module (resolve-module '(guile-user))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Load emacs interface support if emacs option is given.
|
2002-10-20 21:51:16 +00:00
|
|
|
|
(if (and (module-defined? guile-user-module 'use-emacs-interface)
|
|
|
|
|
|
(module-ref guile-user-module 'use-emacs-interface))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(load-emacs-interface))
|
|
|
|
|
|
|
|
|
|
|
|
;; Use some convenient modules (in reverse order)
|
2001-08-30 23:25:34 +00:00
|
|
|
|
|
2007-01-15 23:22:36 +00:00
|
|
|
|
(set-current-module guile-user-module)
|
|
|
|
|
|
(process-use-modules
|
|
|
|
|
|
(append
|
|
|
|
|
|
'(((ice-9 r5rs))
|
|
|
|
|
|
((ice-9 session))
|
|
|
|
|
|
((ice-9 debug)))
|
|
|
|
|
|
(if (provided? 'regex)
|
|
|
|
|
|
'(((ice-9 regex)))
|
|
|
|
|
|
'())
|
|
|
|
|
|
(if (provided? 'threads)
|
|
|
|
|
|
'(((ice-9 threads)))
|
|
|
|
|
|
'())))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
;; load debugger on demand
|
2007-05-05 20:38:57 +00:00
|
|
|
|
(module-autoload! guile-user-module '(ice-9 debugger) '(debug))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
|
2007-01-15 23:22:36 +00:00
|
|
|
|
;; Note: SIGFPE, SIGSEGV and SIGBUS are actually "query-only" (see
|
|
|
|
|
|
;; scmsigs.c scm_sigaction_for_thread), so the handlers setup here have
|
|
|
|
|
|
;; no effect.
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(let ((old-handlers #f)
|
2008-09-09 08:23:10 +02:00
|
|
|
|
(start-repl (module-ref (resolve-interface '(system repl repl))
|
|
|
|
|
|
'start-repl))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(signals (if (provided? 'posix)
|
|
|
|
|
|
`((,SIGINT . "User interrupt")
|
|
|
|
|
|
(,SIGFPE . "Arithmetic error")
|
|
|
|
|
|
(,SIGSEGV
|
|
|
|
|
|
. "Bad memory access (Segmentation violation)"))
|
|
|
|
|
|
'())))
|
2007-01-15 23:22:36 +00:00
|
|
|
|
;; no SIGBUS on mingw
|
|
|
|
|
|
(if (defined? 'SIGBUS)
|
|
|
|
|
|
(set! signals (acons SIGBUS "Bad memory access (bus error)"
|
|
|
|
|
|
signals)))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
|
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
|
|
|
|
|
|
|
;; call at entry
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(let ((make-handler (lambda (msg)
|
|
|
|
|
|
(lambda (sig)
|
|
|
|
|
|
;; Make a backup copy of the stack
|
|
|
|
|
|
(fluid-set! before-signal-stack
|
|
|
|
|
|
(fluid-ref the-last-stack))
|
2002-10-09 22:47:34 +00:00
|
|
|
|
(save-stack 2)
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(scm-error 'signal
|
|
|
|
|
|
#f
|
|
|
|
|
|
msg
|
|
|
|
|
|
#f
|
|
|
|
|
|
(list sig))))))
|
|
|
|
|
|
(set! old-handlers
|
|
|
|
|
|
(map (lambda (sig-msg)
|
|
|
|
|
|
(sigaction (car sig-msg)
|
|
|
|
|
|
(make-handler (cdr sig-msg))))
|
|
|
|
|
|
signals))))
|
2001-08-30 23:25:34 +00:00
|
|
|
|
|
2001-06-01 14:01:27 +00:00
|
|
|
|
;; the protected thunk.
|
|
|
|
|
|
(lambda ()
|
2008-09-09 08:23:10 +02:00
|
|
|
|
(let ((status (start-repl 'scheme)))
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(run-hook exit-hook)
|
|
|
|
|
|
status))
|
2001-08-30 23:25:34 +00:00
|
|
|
|
|
2001-06-01 14:01:27 +00:00
|
|
|
|
;; call at exit.
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(map (lambda (sig-msg old-handler)
|
|
|
|
|
|
(if (not (car old-handler))
|
|
|
|
|
|
;; restore original C handler.
|
|
|
|
|
|
(sigaction (car sig-msg) #f)
|
|
|
|
|
|
;; restore Scheme handler, SIG_IGN or SIG_DFL.
|
|
|
|
|
|
(sigaction (car sig-msg)
|
|
|
|
|
|
(car old-handler)
|
|
|
|
|
|
(cdr old-handler))))
|
|
|
|
|
|
signals old-handlers))))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1998-10-31 16:46:55 +00:00
|
|
|
|
;;; This hook is run at the very end of an interactive session.
|
|
|
|
|
|
;;;
|
* boot-9.scm (beautify-user-module!): Beautify also if public
interface is set to the module itself. In this way we can use
beautify-user-module! to beautify a module prepared for object
code.
(process-define-module): Special case: Try to load object code as
well if a module does :use-module on itself.
* boot-9.scm: Bugfix: Since boot-9.scm is now loaded from
invoke_main_func, we can no longer be sure that all modules have
been registered when boot-9.scm is loaded.
(register-modules): New function: Register and tag modules
registered by scm_register_module_xxx since last call to this
function. Modules are tagged with the dynamic object passed as
argument. (Already linked modules should be tagged with #f.)
(init-dynamic-module, link-dynamic-module): Call register-modules
first to register linked modules.
* boot-9.scm (init-dynamic-module): Remove module from
registered-modules as soon as possible in case we are recursively
invoked; Set public interface before doing the dynamic-call.
* boot-9.scm (map-in-order): Removed (replaced by scm_serial_map).
(abort-hook, before-error-hook, after-error-hook,
before-backtrace-hook, after-backtrace-hook, before-read-hook,
after-read-hook, exit-hook): Make hooks with `make-hook'.
* boot-9.scm: Make hooks first class citizens and make them easier
to use from C:
(make-hook, add-hook!, remove-hook!, run-hooks): Moved to
libguile/feature.c.
* boot-9.scm: Added warnings about bindings used in
libguile/modules.c: the-module, set-current-module,
make-modules-in, beautify-user-module!, module-eval-closure.
1998-11-23 02:36:43 +00:00
|
|
|
|
(define exit-hook (make-hook))
|
1998-10-31 16:46:55 +00:00
|
|
|
|
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; {Deprecated stuff}
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(begin-deprecated
|
|
|
|
|
|
(define (feature? sym)
|
|
|
|
|
|
(issue-deprecation-warning
|
|
|
|
|
|
"`feature?' is deprecated. Use `provided?' instead.")
|
|
|
|
|
|
(provided? sym)))
|
|
|
|
|
|
|
|
|
|
|
|
(begin-deprecated
|
2008-09-25 13:46:09 +02:00
|
|
|
|
(primitive-load-path "ice-9/deprecated"))
|
2004-05-29 08:40:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Place the user in the guile-user module.
|
|
|
|
|
|
;;;
|
2001-06-10 20:44:45 +00:00
|
|
|
|
|
syncase early in boot-9, defmacros in terms of syntax-case -- halfway working
* module/ice-9/boot-9.scm
(eval-when): Remove, as syncase is going to handle this one for us.
(sc-expand, sc-expand3, sc-chi, install-global-transformer)
(syntax-dispatch, syntax-error, annotation?, bound-identifier=?)
(datum->syntax-object, free-identifier=?, generate-temporaries)
(identifier?, syntax-object->datum, void, andmap): Oh, ugly of uglies:
add these exciting definitions to the main environment. Hopefully we
can pull them back out soon.
(make-module-ref, resolve-module): Stub these out, as a replacement for
expand-support.
(%pre-modules-transformer): Define to sc-expand, so that we are using
syncase from the very start.
(defmacro, define-macro): Define in terms of syntax-case.
(macroexpand, macroexpand-1): Remove, there should be a different way
to get at this -- though perhaps with the same name.
(make-module): Make sc-expand the default module-transformer.
(process-define-module): Issue a deprecation warning when using ice-9
syncase.
(primitive-macro?): Remove, no meaning...
(use-syntax): Deprecate.
(define-private, define-public, defmacro-public): Rework in terms of
syntax-rules.
* module/ice-9/syncase.scm: Gut, as syncase is provided by core now.
2009-04-24 13:54:38 +02:00
|
|
|
|
;;; FIXME: annotate ?
|
|
|
|
|
|
;; (define (syncase exp)
|
|
|
|
|
|
;; (with-fluids ((expansion-eval-closure
|
|
|
|
|
|
;; (module-eval-closure (current-module))))
|
|
|
|
|
|
;; (deannotate/source-properties (sc-expand (annotate exp)))))
|
|
|
|
|
|
|
2001-06-01 14:01:27 +00:00
|
|
|
|
(define-module (guile-user))
|
2001-01-24 21:45:09 +00:00
|
|
|
|
|
2001-04-28 19:07:38 +00:00
|
|
|
|
;;; boot-9.scm ends here
|