mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

rework eval-case handling to be like cl's eval-when

Browse source 
* module/language/scheme/translate.scm (trans): Remove the hacky case for
  the unspecified value, not needed any more.
  (primitive-syntax-table): Rework eval-case to understand
  compile-toplevel and evaluate contexts, as in common lisp's eval-when:
  http://www.lisp.org/HyperSpec/Body/speope_eval-when.html
  This is the Right Thing.
This commit is contained in:
Andy Wingo 2008-05-15 00:38:31 +02:00
parent 0658041d11
commit e009240547
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
module/language/scheme/translate.scm
View file

@ -88,11 +88,6 @@
((symbol? x) ((symbol? x)
(make-ghil-ref e l (ghil-lookup e x))) (make-ghil-ref e l (ghil-lookup e x)))
;; this is for the eval-case defmacro stuff. dunno what to do
;; about it though.
((unspecified? x)
(make-ghil-void e l))
;; fixme: non-self-quoting objects like #<foo> ;; fixme: non-self-quoting objects like #<foo>
(else (else
(make-ghil-quote e l x)))) (make-ghil-quote e l x))))
@ -252,13 +247,34 @@
(make-ghil-lambda env l vars rest (trans-body env l body))))))) (make-ghil-lambda env l vars rest (trans-body env l body)))))))
(eval-case (eval-case
(() (retrans '(begin))) (,clauses
(((else . ,body)) (retrans `(begin ,@body)))
(((,keys . ,body) . ,rest) (guard (list? keys) (and-map symbol? keys))
(retrans (retrans
(if (memq 'load-toplevel keys) `(begin
`(begin ,(primitive-eval `(begin ,@(copy-tree body)))) ,@(let ((toplevel? (ghil-env-toplevel? e)))
`(eval-case ,@rest))))))) (let loop ((seen '()) (in clauses) (runtime '()))
(cond
((null? in) runtime)
(else
(pmatch (car in)
((else . ,body)
(if (and toplevel? (not (memq 'compile-toplevel seen)))
(primitive-eval `(begin ,@body)))
(if (memq (if toplevel? 'load-toplevel 'evaluate) seen)
runtime
body))
((,keys . ,body) (guard (list? keys) (and-map symbol? keys))
(for-each (lambda (k)
(if (memq k seen)
(syntax-error l "eval-case condition seen twice" k)))
keys)
(if (and toplevel? (memq 'compile-toplevel keys))
(primitive-eval `(begin ,@body)))
(loop (append keys seen)
(cdr in)
(if (memq (if toplevel? 'load-toplevel 'evaluate) keys)
(append runtime body)
runtime)))
(else (syntax-error l "bad eval-case clause" (car in))))))))))))))
(define (trans-quasiquote e l x) (define (trans-quasiquote e l x)
(cond ((not (pair? x)) x) (cond ((not (pair? x)) x)