diff options
author | Andy Wingo <wingo@pobox.com> | 2009-10-16 15:27:10 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-10-16 15:33:32 +0200 |
commit | f95f82f8e183f2744740bdc950dba9c856e09094 (patch) | |
tree | dae9d13d354a09c516245ec25e2f03aac5eecb30 /module/language | |
parent | 40867c9776de71b0a822e15234711f5259df76aa (diff) | |
download | guile-f95f82f8e183f2744740bdc950dba9c856e09094.tar.gz |
compilation enviroments are always modules; simplifications & refactorings
* module/ice-9/boot-9.scm (make-fresh-user-module): New public function,
makes an anonymous beautified module.
* module/language/objcode/spec.scm: We used to have some things in here
that allowed lexical variable names and values to be a part of the
environment, but no more. Now an environment is just a module. If you
want to "inject" free variables into code, just use lambda.
* module/language/scheme/compile-tree-il.scm (compile-tree-il): Same
here. Also, rely on the fact that an environment *will* be a module --
because (system base compile) guarantees that for us.
* module/language/scheme/spec.scm (scheme): In the reader, rely on the
environment being a module. Define a #:make-default-environment
handler, which returns a beautified module, augmented with a fresh
definition for current-reader, so that side effects to current-reader
are restricted to the compilation unit.
* module/language/tree-il/analyze.scm
(report-possibly-unbound-variables):
* module/language/tree-il/compile-glil.scm (compile-glil):
* module/language/tree-il/optimize.scm (optimize!): The environment will
be a module.
* module/system/base/language.scm (<language>): New field,
`make-default-environment'. Defaults to `make-fresh-user-module'.
(default-environment): New accessor, returns a default environment for
a language.
* module/system/repl/common.scm (repl-compile): Always compile relative
to the current module, because a module is always acceptable as an
environment.
* module/system/base/compile.scm (compile-file, compile-and-load): Both
of these have a new keyword argument, #:env. For `compile-file', it
defaults to the default environment of the source language, and for
`compile-and-load', to the current module.
(read-and-compile): If there are no expressions read, pass the joiner
its default environment (via `default-environment joint').
Diffstat (limited to 'module/language')
-rw-r--r-- | module/language/objcode/spec.scm | 22 | ||||
-rw-r--r-- | module/language/scheme/compile-tree-il.scm | 35 | ||||
-rw-r--r-- | module/language/scheme/spec.scm | 17 | ||||
-rw-r--r-- | module/language/tree-il/analyze.scm | 119 | ||||
-rw-r--r-- | module/language/tree-il/compile-glil.scm | 4 | ||||
-rw-r--r-- | module/language/tree-il/optimize.scm | 5 |
6 files changed, 79 insertions, 123 deletions
diff --git a/module/language/objcode/spec.scm b/module/language/objcode/spec.scm index 42110271d..9837c5c1c 100644 --- a/module/language/objcode/spec.scm +++ b/module/language/objcode/spec.scm @@ -22,25 +22,17 @@ #:use-module (system base language) #:use-module (system vm objcode) #:use-module (system vm program) - #:export (objcode make-objcode-env)) - -(define (make-objcode-env module externals) - (cons module externals)) - -(define (objcode-env-module env) - (if env (car env) (current-module))) - -(define (objcode-env-externals env) - (and env (vector? (cdr env)) (cdr env))) + #:export (objcode)) (define (objcode->value x e opts) - (let ((thunk (make-program x #f (objcode-env-externals e)))) - (if e + (let ((thunk (make-program x #f #f))) + (if (eq? e (current-module)) + ;; save a cons in this case + (values (thunk) e e) (save-module-excursion (lambda () - (set-current-module (objcode-env-module e)) - (values (thunk) #f e))) - (values (thunk) #f e)))) + (set-current-module e) + (values (thunk) e e)))))) ;; since locals are allocated on the stack and can have limited scope, ;; in many cases we use one local for more than one lexical variable. so diff --git a/module/language/scheme/compile-tree-il.scm b/module/language/scheme/compile-tree-il.scm index 4ac33d77e..5d01a2651 100644 --- a/module/language/scheme/compile-tree-il.scm +++ b/module/language/scheme/compile-tree-il.scm @@ -1,6 +1,6 @@ ;;; Guile Scheme specification -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2009 Free Software Foundation, Inc. ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -24,40 +24,11 @@ ;;; environment := #f ;;; | MODULE -;;; | COMPILE-ENV -;;; compile-env := (MODULE LEXICALS . EXTERNALS) -(define (cenv-module env) - (cond ((not env) #f) - ((module? env) env) - ((and (pair? env) (module? (car env))) (car env)) - (else (error "bad environment" env)))) - -(define (cenv-lexicals env) - (cond ((not env) '()) - ((module? env) '()) - ((pair? env) (cadr env)) - (else (error "bad environment" env)))) - -(define (cenv-externals env) - (cond ((not env) '()) - ((module? env) '()) - ((pair? env) (cddr env)) - (else (error "bad environment" env)))) - -(define (make-cenv module lexicals externals) - (cons module (cons lexicals externals))) - -(define (location x) - (and (pair? x) - (let ((props (source-properties x))) - (and (not (null? props)) - props)))) (define (compile-tree-il x e opts) (save-module-excursion (lambda () - (and=> (cenv-module e) set-current-module) + (set-current-module e) (let* ((x (sc-expand x 'c '(compile load eval))) - (cenv (make-cenv (current-module) - (cenv-lexicals e) (cenv-externals e)))) + (cenv (current-module))) (values x cenv cenv))))) diff --git a/module/language/scheme/spec.scm b/module/language/scheme/spec.scm index c05236126..6cfbc422f 100644 --- a/module/language/scheme/spec.scm +++ b/module/language/scheme/spec.scm @@ -41,11 +41,7 @@ #:reader (lambda (port env) ;; Use the binding of current-reader from the environment. ;; FIXME: Handle `read-options' as well? - ((or (and=> (and=> (module-variable - (cond ((pair? env) (car env)) - (env) - (else (current-module))) - 'current-reader) + ((or (and=> (and=> (module-variable env 'current-reader) variable-ref) fluid-ref) read) @@ -55,4 +51,13 @@ #:decompilers `((tree-il . ,decompile-tree-il)) #:evaluator (lambda (x module) (primitive-eval x)) #:printer write - ) + #:make-default-environment + (lambda () + ;; Ideally we'd duplicate the whole module hierarchy so that `set!', + ;; `fluid-set!', etc. don't have any effect in the current environment. + (let ((m (make-fresh-user-module))) + ;; Provide a separate `current-reader' fluid so that + ;; compile-time changes to `current-reader' are + ;; limited to the current compilation unit. + (module-define! m 'current-reader (make-fluid)) + m))) diff --git a/module/language/tree-il/analyze.scm b/module/language/tree-il/analyze.scm index 46e467791..42ad74d7d 100644 --- a/module/language/tree-il/analyze.scm +++ b/module/language/tree-il/analyze.scm @@ -633,76 +633,67 @@ (defs toplevel-info-defs) ;; (VARIABLE-NAME ...) (locs toplevel-info-locs)) ;; (LOCATION ...) -(define (env-module e) - "Return the module corresponding to E." - ;; XXX: This is a bit of a hack since since representation of compile-time - ;; environments is hidden in `(language scheme compile-tree-il)'. - (cond ((pair? e) (car e)) - ((module? e) e) - (else (current-module)))) - ;; TODO: Combine with `report-unused-variables' so we don't traverse the tree ;; once for each warning type. (define (report-possibly-unbound-variables tree env) "Return possibly unbound variables in TREE. Return TREE." (define toplevel - (let ((env (env-module env))) - (tree-il-fold (lambda (x info) - ;; X is a leaf: extend INFO's refs accordingly. - (let ((refs (toplevel-info-refs info)) - (defs (toplevel-info-defs info)) - (locs (toplevel-info-locs info))) - (define (bound? name) - (or (and (module? env) - (module-variable env name)) - (memq name defs))) - - (record-case x - ((<toplevel-ref> name src) - (if (bound? name) - info - (let ((src (or src (find pair? locs)))) - (make-toplevel-info (alist-cons name src refs) - defs - locs)))) - (else info)))) - - (lambda (x info) - ;; Going down into X. - (let* ((refs (toplevel-info-refs info)) - (defs (toplevel-info-defs info)) - (src (tree-il-src x)) - (locs (cons src (toplevel-info-locs info)))) - (define (bound? name) - (or (and (module? env) - (module-variable env name)) - (memq name defs))) - - (record-case x - ((<toplevel-set> name src) - (if (bound? name) - (make-toplevel-info refs defs locs) - (let ((src (find pair? locs))) - (make-toplevel-info (alist-cons name src refs) - defs - locs)))) - ((<toplevel-define> name) - (make-toplevel-info (alist-delete name refs eq?) - (cons name defs) - locs)) - (else - (make-toplevel-info refs defs locs))))) - - (lambda (x info) - ;; Leaving X's scope. - (let ((refs (toplevel-info-refs info)) - (defs (toplevel-info-defs info)) - (locs (toplevel-info-locs info))) - (make-toplevel-info refs defs (cdr locs)))) - - (make-toplevel-info '() '() '()) - tree))) + (tree-il-fold (lambda (x info) + ;; X is a leaf: extend INFO's refs accordingly. + (let ((refs (toplevel-info-refs info)) + (defs (toplevel-info-defs info)) + (locs (toplevel-info-locs info))) + (define (bound? name) + (or (and (module? env) + (module-variable env name)) + (memq name defs))) + + (record-case x + ((<toplevel-ref> name src) + (if (bound? name) + info + (let ((src (or src (find pair? locs)))) + (make-toplevel-info (alist-cons name src refs) + defs + locs)))) + (else info)))) + + (lambda (x info) + ;; Going down into X. + (let* ((refs (toplevel-info-refs info)) + (defs (toplevel-info-defs info)) + (src (tree-il-src x)) + (locs (cons src (toplevel-info-locs info)))) + (define (bound? name) + (or (and (module? env) + (module-variable env name)) + (memq name defs))) + + (record-case x + ((<toplevel-set> name src) + (if (bound? name) + (make-toplevel-info refs defs locs) + (let ((src (find pair? locs))) + (make-toplevel-info (alist-cons name src refs) + defs + locs)))) + ((<toplevel-define> name) + (make-toplevel-info (alist-delete name refs eq?) + (cons name defs) + locs)) + (else + (make-toplevel-info refs defs locs))))) + + (lambda (x info) + ;; Leaving X's scope. + (let ((refs (toplevel-info-refs info)) + (defs (toplevel-info-defs info)) + (locs (toplevel-info-locs info))) + (make-toplevel-info refs defs (cdr locs)))) + + (make-toplevel-info '() '() '()) + tree)) (for-each (lambda (name+loc) (let ((name (car name+loc)) diff --git a/module/language/tree-il/compile-glil.scm b/module/language/tree-il/compile-glil.scm index e8b699eb5..4ab03bf25 100644 --- a/module/language/tree-il/compile-glil.scm +++ b/module/language/tree-il/compile-glil.scm @@ -65,10 +65,10 @@ (x (optimize! x e opts)) (allocation (analyze-lexicals x))) - (with-fluid* *comp-module* (or (and e (car e)) (current-module)) + (with-fluid* *comp-module* e (lambda () (values (flatten-lambda x #f allocation) - (and e (cons (car e) (cddr e))) + e e))))) diff --git a/module/language/tree-il/optimize.scm b/module/language/tree-il/optimize.scm index 0e490a636..dbbc21655 100644 --- a/module/language/tree-il/optimize.scm +++ b/module/language/tree-il/optimize.scm @@ -25,11 +25,8 @@ #:use-module (language tree-il fix-letrec) #:export (optimize!)) -(define (env-module e) - (if e (car e) (current-module))) - (define (optimize! x env opts) (inline! (fix-letrec! (expand-primitives! - (resolve-primitives! x (env-module env)))))) + (resolve-primitives! x env))))) |