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

* expand-mode is gone

This commit is contained in:
Abdulaziz Ghuloum 2007-05-02 20:36:23 -04:00
parent 9a80586934
commit d83bff5f5e
5 changed files with 8 additions and 16 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.

14
src/libcompile.ss
View File

@ -385,11 +385,9 @@
(make-primref var))] (make-primref var))]
[(top-level-value) [(top-level-value)
(let ([var (quoted-sym (cadr x))]) (let ([var (quoted-sym (cadr x))])
(if (eq? (expand-mode) 'bootstrap) (make-funcall
(error 'compile "reference to ~s in bootstrap mode" var) (make-primref 'top-level-value)
(make-funcall (list (make-constant var))))]
(make-primref 'top-level-value)
(list (make-constant var)))))]
[(set-top-level-value!) [(set-top-level-value!)
(make-funcall (make-primref 'set-top-level-value!) (make-funcall (make-primref 'set-top-level-value!)
(map E (cdr x)))] (map E (cdr x)))]
@ -5275,8 +5273,7 @@
(let ([code (let ([code
(if (code? x) (if (code? x)
x x
(parameterize ([expand-mode 'eval]) (compile-expr x))])
(compile-expr x)))])
(let ([proc ($code->closure code)]) (let ([proc ($code->closure code)])
(proc))))) (proc)))))
@ -5285,8 +5282,7 @@
(let ([code (let ([code
(if (code? x) (if (code? x)
x x
(parameterize ([expand-mode 'eval]) (alt-compile-expr x))])
(alt-compile-expr x)))])
(let ([proc ($code->closure code)]) (let ([proc ($code->closure code)])
(proc))))) (proc)))))

1
src/library-manager.ss
View File

@ -405,7 +405,6 @@
[compile-core-expr-to-port compile-core-expr-to-port-label (core-prim . compile-core-expr-to-port)] [compile-core-expr-to-port compile-core-expr-to-port-label (core-prim . compile-core-expr-to-port)]
[eval eval-label (core-prim . eval)] [eval eval-label (core-prim . eval)]
[load load-label (core-prim . load)] [load load-label (core-prim . load)]
[expand-mode expand-mode-label (core-prim . expand-mode)]
[assembler-output assembler-output-label (core-prim . assembler-output)] [assembler-output assembler-output-label (core-prim . assembler-output)]
[current-expand current-expand-label (core-prim . current-expand)] [current-expand current-expand-label (core-prim . current-expand)]
[expand expand-label (core-prim . expand)] [expand expand-label (core-prim . expand)]

6
src/libsyntax.ss
View File

@ -2011,9 +2011,9 @@
;;; visit-code, invoke-code ;;; visit-code, invoke-code
(let ([id (gensym)] (let ([id (gensym)]
[name name] [name name]
[ver '()] [ver '()] ;;; FIXME
[imp* (map library-spec imp*)] [imp* (map library-spec imp*)]
[vis* '()] [vis* '()] ;;; FIXME
[inv* (map library-spec run*)] [inv* (map library-spec run*)]
[exp-subst [exp-subst
(map (lambda (x) (cons (car x) (cadr x))) exp*)] (map (lambda (x) (cons (car x) (cadr x))) exp*)]
@ -2024,7 +2024,7 @@
exp*)]) exp*)])
(install-library id name ver (install-library id name ver
imp* vis* inv* exp-subst exp-env imp* vis* inv* exp-subst exp-env
void void ;;; FIXME
(lambda () (compile-time-eval-hook invoke-code))) (lambda () (compile-time-eval-hook invoke-code)))
(invoke-library (find-library-by-name name)) (invoke-library (find-library-by-name name))
(build-void))))) (build-void)))))

3
src/libtoplevel.ss
View File

@ -15,9 +15,6 @@
(cadr x) (cadr x)
(chi-top-library x)))) (chi-top-library x))))
(primitive-set! 'expand-mode
(make-parameter 'eval))
(primitive-set! 'current-expand (primitive-set! 'current-expand
(make-parameter sc-expand (make-parameter sc-expand
(lambda (f) (lambda (f)