* (ikarus syntax) now uses (ikarus system $all) instead of (scheme)
to construct scheme-stx objects.
This commit is contained in:
parent
5a488fe96c
commit
a41b08894d
BIN
src/ikarus.boot
BIN
src/ikarus.boot
Binary file not shown.
|
@ -566,7 +566,7 @@
|
||||||
(lambda (sym)
|
(lambda (sym)
|
||||||
(let-values ([(subst env)
|
(let-values ([(subst env)
|
||||||
(library-subst/env
|
(library-subst/env
|
||||||
(find-library-by-name '(scheme)))])
|
(find-library-by-name '(ikarus system $all)))])
|
||||||
(cond
|
(cond
|
||||||
[(assq sym subst) =>
|
[(assq sym subst) =>
|
||||||
(lambda (x)
|
(lambda (x)
|
||||||
|
|
|
@ -95,7 +95,8 @@
|
||||||
[or (macro . or)]))
|
[or (macro . or)]))
|
||||||
|
|
||||||
(define library-legend
|
(define library-legend
|
||||||
'([s (ikarus system)]
|
'([$all (ikarus system $all)]
|
||||||
|
[s (ikarus system)]
|
||||||
[u (ikarus system unsafe)]
|
[u (ikarus system unsafe)]
|
||||||
[i (ikarus)]
|
[i (ikarus)]
|
||||||
[r (r6rs)]
|
[r (r6rs)]
|
||||||
|
@ -1101,12 +1102,16 @@
|
||||||
[version '()]
|
[version '()]
|
||||||
[import-libs '()]
|
[import-libs '()]
|
||||||
[visit-libs '()]
|
[visit-libs '()]
|
||||||
[invoke-libs '()]
|
[invoke-libs '()])
|
||||||
[subst (get-export-subset key export-subst)]
|
(let-values ([(subst env)
|
||||||
[env (if (equal? name '(ikarus system)) export-env '())])
|
(if (equal? name '(ikarus system $all))
|
||||||
`(install-library
|
(values export-subst export-env)
|
||||||
',id ',name ',version ',import-libs ',visit-libs ',invoke-libs
|
(values
|
||||||
',subst ',env void void))))
|
(get-export-subset key export-subst)
|
||||||
|
'()))])
|
||||||
|
`(install-library
|
||||||
|
',id ',name ',version ',import-libs ',visit-libs ',invoke-libs
|
||||||
|
',subst ',env void void)))))
|
||||||
(let ([code `(library (ikarus primlocs)
|
(let ([code `(library (ikarus primlocs)
|
||||||
(export) ;;; must be empty
|
(export) ;;; must be empty
|
||||||
(import
|
(import
|
||||||
|
|
Loading…
Reference in New Issue