mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

chi-top-sequence refactor

Browse source 
* module/ice-9/psyntax.scm (chi-top-sequence): Reimplement, more like
  chi-body.  Instead of adding empty definitions to the toplevel, add
  toplevel definitions to the wrap shared by all forms in the sequence.
This commit is contained in:
Andy Wingo 2011-11-04 13:47:24 +01:00
parent f698b7286f
commit 45f584674a
1 changed files with 114 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

165
module/ice-9/psyntax.scm
View file

@ -910,135 +910,120 @@
;; ;;
(define chi-top-sequence (define chi-top-sequence
(lambda (body r w s m esew mod) (lambda (body r w s m esew mod)
(define (scan body r w s m esew mod exps) (let* ((r (cons '("placeholder" . (placeholder)) r))
(cond (ribcage (make-empty-ribcage))
((null? body) (w (make-wrap (wrap-marks w) (cons ribcage (wrap-subst w)))))
;; in reversed order (define (record-definition! id label)
exps) (extend-ribcage! ribcage id label))
(else (define (parse body r w s m esew mod)
(scan (let lp ((body body) (exps '()))
(cdr body) r w s m esew mod (if (null? body)
exps
(lp (cdr body)
(append (parse1 (car body) r w s m esew mod)
exps)))))
(define (parse1 x r w s m esew mod)
(call-with-values (call-with-values
(lambda () (lambda ()
(let ((e (car body))) (syntax-type x r w (source-annotation x) ribcage mod #f))
(syntax-type e r w (or (source-annotation e) s) #f mod #f)))
(lambda (type value e w s mod) (lambda (type value e w s mod)
(case type (case type
((define-form)
(let* ((id (wrap value w mod))
(label (gen-label))
(var (syntax-object-expression id)))
(record-definition! id var)
(list
(if (eq? m 'c&e)
(let ((x (build-global-definition s var (chi e r w mod))))
(top-level-eval-hook x mod)
(lambda () x))
(lambda ()
(build-global-definition s var (chi e r w mod)))))))
((define-syntax-form)
(let* ((id (wrap value w mod))
(label (gen-label))
(var (syntax-object-expression id)))
(record-definition! id var)
(case m
((c)
(cond
((memq 'compile esew)
(let ((e (chi-install-global var (chi e r w mod))))
(top-level-eval-hook e mod)
(if (memq 'load esew)
(list (lambda () e))
'())))
((memq 'load esew)
(list (lambda ()
(chi-install-global var (chi e r w mod)))))
(else '())))
((c&e)
(let ((e (chi-install-global var (chi e r w mod))))
(top-level-eval-hook e mod)
(list (lambda () e))))
(else
(if (memq 'eval esew)
(top-level-eval-hook
(chi-install-global var (chi e r w mod))
mod))
'()))))
((begin-form) ((begin-form)
(syntax-case e () (syntax-case e ()
((_) exps) ((_ e1 ...)
((_ e1 e2 ...) (parse #'(e1 ...) r w s m esew mod))))
(scan #'(e1 e2 ...) r w s m esew mod exps))))
((local-syntax-form) ((local-syntax-form)
(chi-local-syntax value e r w s mod (chi-local-syntax value e r w s mod
(lambda (body r w s mod) (lambda (forms r w s mod)
(scan body r w s m esew mod exps)))) (parse forms r w s m esew mod))))
((eval-when-form) ((eval-when-form)
(syntax-case e () (syntax-case e ()
((_ (x ...) e1 e2 ...) ((_ (x ...) e1 e2 ...)
(let ((when-list (chi-when-list e #'(x ...) w)) (let ((when-list (chi-when-list e #'(x ...) w))
(body #'(e1 e2 ...))) (body #'(e1 e2 ...)))
(define (recurse m esew)
(parse body r w s m esew mod))
(cond (cond
((eq? m 'e) ((eq? m 'e)
(if (memq 'eval when-list) (if (memq 'eval when-list)
(scan body r w s (recurse (if (memq 'expand when-list) 'c&e 'e)
(if (memq 'expand when-list) 'c&e 'e) '(eval))
'(eval)
mod exps)
(begin (begin
(if (memq 'expand when-list) (if (memq 'expand when-list)
(top-level-eval-hook (top-level-eval-hook
(chi-top-sequence body r w s 'e '(eval) mod) (chi-top-sequence body r w s 'e '(eval) mod)
mod)) mod))
exps))) '())))
((memq 'load when-list) ((memq 'load when-list)
(if (or (memq 'compile when-list) (if (or (memq 'compile when-list)
(memq 'expand when-list) (memq 'expand when-list)
(and (eq? m 'c&e) (memq 'eval when-list))) (and (eq? m 'c&e) (memq 'eval when-list)))
(scan body r w s 'c&e '(compile load) mod exps) (recurse 'c&e '(compile load))
(if (memq m '(c c&e)) (if (memq m '(c c&e))
(scan body r w s 'c '(load) mod exps) (recurse 'c '(load))
exps))) '())))
((or (memq 'compile when-list) ((or (memq 'compile when-list)
(memq 'expand when-list) (memq 'expand when-list)
(and (eq? m 'c&e) (memq 'eval when-list))) (and (eq? m 'c&e) (memq 'eval when-list)))
(top-level-eval-hook (top-level-eval-hook
(chi-top-sequence body r w s 'e '(eval) mod) (chi-top-sequence body r w s 'e '(eval) mod)
mod) mod)
exps) '())
(else (else
exps)))))) '()))))))
((define-syntax-form)
(let ((n (id-var-name value w)) (r (macros-only-env r)))
(case m
((c)
(if (memq 'compile esew)
(let ((e (chi-install-global n (chi e r w mod))))
(top-level-eval-hook e mod)
(if (memq 'load esew)
(cons e exps)
exps))
(if (memq 'load esew)
(cons (chi-install-global n (chi e r w mod))
exps)
exps)))
((c&e)
(let ((e (chi-install-global n (chi e r w mod))))
(top-level-eval-hook e mod)
(cons e exps)))
(else (else
(if (memq 'eval esew) (list
(top-level-eval-hook (if (eq? m 'c&e)
(chi-install-global n (chi e r w mod))
mod))
exps))))
((define-form)
(let* ((n (id-var-name value w))
;; Lookup the name in the module of the define form.
(type (binding-type (lookup n r mod))))
(case type
((global core macro module-ref)
;; affect compile-time environment (once we have booted)
(if (and (memq m '(c c&e))
(not (module-local-variable (current-module) n))
(current-module))
(let ((old (module-variable (current-module) n)))
;; use value of the same-named imported variable, if
;; any
(if (and (variable? old) (variable-bound? old))
(module-define! (current-module) n (variable-ref old))
(module-add! (current-module) n (make-undefined-variable)))))
(cons (if (eq? m 'c&e)
(let ((x (build-global-definition s n (chi e r w mod))))
(top-level-eval-hook x mod)
x)
(lambda ()
(build-global-definition s n (chi e r w mod))))
exps))
((displaced-lexical)
(syntax-violation #f "identifier out of context"
e (wrap value w mod)))
(else
(syntax-violation #f "cannot define keyword at top level"
e (wrap value w mod))))))
(else
(cons (if (eq? m 'c&e)
(let ((x (chi-expr type value e r w s mod))) (let ((x (chi-expr type value e r w s mod)))
(top-level-eval-hook x mod) (top-level-eval-hook x mod)
x) (lambda () x))
(lambda () (lambda ()
(chi-expr type value e r w s mod))) (chi-expr type value e r w s mod)))))))))
exps))))))))) (let ((exps (map (lambda (x) (x))
(let ((exps (scan body r w s m esew mod '()))) (reverse (parse body r w s m esew mod)))))
(if (null? exps) (if (null? exps)
(build-void s) (build-void s)
(build-sequence (build-sequence s exps))))))
s
(let lp ((in exps) (out '()))
(if (null? in) out
(let ((e (car in)))
(lp (cdr in)
(cons (if (procedure? e) (e) e) out))))))))))
(define chi-install-global (define chi-install-global
(lambda (name e) (lambda (name e)