mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 06:41:13 +02:00
* boot-9.scm (macroexpand-1, macroexpand), slib.scm
(slib:features), r4rs.scm (%load-verbosely): "defined?" is now a function, use it accordingly.
This commit is contained in:
parent
84abd24334
commit
b1818df3c3
3 changed files with 9 additions and 9 deletions
|
@ -1829,7 +1829,7 @@
|
||||||
(define (macroexpand-1 e)
|
(define (macroexpand-1 e)
|
||||||
(cond
|
(cond
|
||||||
((pair? e) (let* ((a (car e))
|
((pair? e) (let* ((a (car e))
|
||||||
(val (and (symbol? a) (eval `(defined? ,a)) (eval a))))
|
(val (and (symbol? a) (defined? a) (eval a))))
|
||||||
(if (defmacro? val)
|
(if (defmacro? val)
|
||||||
(apply (defmacro-transformer val) (cdr e))
|
(apply (defmacro-transformer val) (cdr e))
|
||||||
e)))
|
e)))
|
||||||
|
@ -1838,7 +1838,7 @@
|
||||||
(define (macroexpand e)
|
(define (macroexpand e)
|
||||||
(cond
|
(cond
|
||||||
((pair? e) (let* ((a (car e))
|
((pair? e) (let* ((a (car e))
|
||||||
(val (and (symbol? a) (eval `(defined? ,a)) (eval a))))
|
(val (and (symbol? a) (defined? a) (eval a))))
|
||||||
(if (defmacro? val)
|
(if (defmacro? val)
|
||||||
(macroexpand (apply (defmacro-transformer val) (cdr e)))
|
(macroexpand (apply (defmacro-transformer val) (cdr e)))
|
||||||
e)))
|
e)))
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
|
|
||||||
;;;; Loading
|
;;;; Loading
|
||||||
|
|
||||||
(if (not (defined? %load-verbosely))
|
(if (not (defined? '%load-verbosely))
|
||||||
(define %load-verbosely #f))
|
(define %load-verbosely #f))
|
||||||
(define (assert-load-verbosity v) (set! %load-verbosely v))
|
(define (assert-load-verbosity v) (set! %load-verbosely v))
|
||||||
|
|
||||||
|
|
|
@ -56,27 +56,27 @@
|
||||||
string-port
|
string-port
|
||||||
with-file)
|
with-file)
|
||||||
|
|
||||||
(if (defined? getenv)
|
(if (defined? 'getenv)
|
||||||
'(getenv)
|
'(getenv)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
(if (defined? current-time)
|
(if (defined? 'current-time)
|
||||||
'(current-time)
|
'(current-time)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
(if (defined? system)
|
(if (defined? 'system)
|
||||||
'(system)
|
'(system)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
(if (defined? array?)
|
(if (defined? 'array?)
|
||||||
'(array)
|
'(array)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
(if (defined? char-ready?)
|
(if (defined? 'char-ready?)
|
||||||
'(char-ready?)
|
'(char-ready?)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
(if (defined? array-for-each)
|
(if (defined? 'array-for-each)
|
||||||
'(array-for-each)
|
'(array-for-each)
|
||||||
'())
|
'())
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue