conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* the global bindings are now a pair of <library,gensym-location>.

This commit is contained in:
Abdulaziz Ghuloum 2007-05-06 23:42:10 -04:00
parent 08a0bb0989
commit 90da5334bd
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/ikarus.boot
View File

Binary file not shown.

23
src/ikarus.library-manager.ss
View File

@ -16,7 +16,7 @@
(library (ikarus library-manager) (library (ikarus library-manager)
(export imported-label->binding library-subst/env (export imported-label->binding library-subst/env
current-library-collection installed-libraries current-library-collection installed-libraries
find-library-by-name imported-loc->library install-library find-library-by-name install-library
library-spec invoke-library) library-spec invoke-library)
(import (except (ikarus) current-library-collection)) (import (except (ikarus) current-library-collection))
@ -82,26 +82,19 @@
exp-subst exp-env visit-code invoke-code)]) exp-subst exp-env visit-code invoke-code)])
(for-each (for-each
(lambda (x) (lambda (x)
(put-hash-table! label->binding-table (car x) (cdr x))) (let ([label (car x)] [binding (cdr x)])
(let ([binding
(case (car binding)
[(global)
(cons 'global (cons lib (cdr binding)))]
[else binding])])
(put-hash-table! label->binding-table label binding))))
exp-env) exp-env)
((current-library-collection) lib)))) ((current-library-collection) lib))))
(define (imported-label->binding lab) (define (imported-label->binding lab)
(get-hash-table label->binding-table lab #f)) (get-hash-table label->binding-table lab #f))
(define (imported-loc->library loc)
(define (loc-in-env? ls)
(and (pair? ls)
(let ([a (car ls)])
(let ([binding (cdr a)])
(or (and (eq? (car binding) 'global)
(eq? (cdr binding) loc))
(loc-in-env? (cdr ls)))))))
(let f ([ls ((current-library-collection))])
(cond
[(null? ls) #f]
[(loc-in-env? (library-env (car ls))) (car ls)]
[else (f (cdr ls))])))
(define (invoke-library lib) (define (invoke-library lib)
(let ([invoke (library-invoke-state lib)]) (let ([invoke (library-invoke-state lib)])

6
src/ikarus.syntax.ss
View File

@ -1585,10 +1585,8 @@
(let ([transformer (core-macro-transformer value)]) (let ([transformer (core-macro-transformer value)])
(transformer e r mr))] (transformer e r mr))]
[(global) [(global)
(let* ([loc value] (let* ([lib (car value)]
[lib (imported-loc->library loc)]) [loc (cdr value)])
(unless lib
(stx-error e "BUG: cannot find defining library"))
((run-collector) lib) ((run-collector) lib)
(build-global-reference no-source loc))] (build-global-reference no-source loc))]
[(core-prim) [(core-prim)