(else
(loop (cdr clauses))))))))
-(define (compile-time-environment)
- "A special function known to the compiler that, when compiled, will
-return a representation of the lexical environment in place at compile
-time. Useful for supporting some forms of dynamic compilation. Returns
-#f if called from the interpreter."
- #f)
-
\f
;; Before compiling, make sure any symbols are resolved in the (guile)
;; Indeed, all references to global variables are memoized into such
;; variable objects.
-;; FIXME: these don't work with the compiler
(define-macro (@ mod-name var-name)
(let ((var (module-variable (resolve-interface mod-name) var-name)))
(if (not var)
\f
+;;; {Compiler interface}
+;;;
+;;; The full compiler interface can be found in (system). Here we put a
+;;; few useful procedures into the global namespace.
+
+(module-autoload! the-scm-module
+ '(system base compile)
+ '(compile
+ compile-time-environment))
+
+
+\f
+
;;; {Parameters}
;;;
}
#undef FUNC_NAME
-SCM_DEFINE (scm_objcode_to_program, "objcode->program", 1, 0, 0,
- (SCM objcode),
+SCM_DEFINE (scm_objcode_to_program, "objcode->program", 1, 1, 0,
+ (SCM objcode, SCM external),
"")
#define FUNC_NAME s_scm_objcode_to_program
{
struct scm_program *p;
SCM_VALIDATE_OBJCODE (1, objcode);
+ if (SCM_UNBNDP (external))
+ external = SCM_EOL;
+ else
+ SCM_VALIDATE_LIST (2, external);
base = SCM_OBJCODE_BASE (objcode);
size = SCM_OBJCODE_SIZE (objcode);
p = SCM_PROGRAM_DATA (prog);
p->nlocs = base[8];
p->nexts = base[9];
+ p->external = external;
return prog;
}
#undef FUNC_NAME
#define SCM_OBJCODE_FD(x) (SCM_OBJCODE_DATA (x)->fd)
extern SCM scm_load_objcode (SCM file);
-extern SCM scm_objcode_to_program (SCM objcode);
+extern SCM scm_objcode_to_program (SCM objcode, SCM external);
extern SCM scm_objcode_p (SCM obj);
extern SCM scm_bytecode_to_objcode (SCM bytecode, SCM nlocs, SCM nexts);
extern SCM scm_objcode_to_u8vector (SCM objcode);
NEXT;
}
+VM_DEFINE_INSTRUCTION (externals, "externals", 0, 0, 1)
+{
+ PUSH (external);
+ NEXT;
+}
+
\f
/*
* branch and jump
SCM scm_load_compiled_with_vm (SCM file)
{
- SCM program = scm_objcode_to_program (scm_load_objcode (file));
+ SCM program = scm_objcode_to_program (scm_load_objcode (file), SCM_EOL);
return vm_run (scm_the_vm (), program, SCM_EOL);
}
(define (translate x e)
- (call-with-ghil-environment (make-ghil-toplevel-env) '()
+ (call-with-ghil-environment e '()
(lambda (env vars)
(make-ghil-lambda env #f vars #f '() (trans env (location x) x)))))
((,x) (retrans x))
(,args (make-ghil-values e l (map retrans args))))
+ ;; (compile-time-environment)
+ ;; => (MODULE LEXICALS . EXTERNALS)
(compile-time-environment
- (() (make-ghil-reified-env e l)))))
+ (() (make-ghil-inline
+ e l 'cons
+ (list (retrans '(current-module))
+ (make-ghil-inline
+ e l 'cons
+ (list (make-ghil-reified-env e l)
+ (make-ghil-inline e l 'externals '())))))))
+ ))
(define (lookup-apply-transformer proc)
(cond ((eq? proc values)
(define-module (system base compile)
#:use-syntax (system base syntax)
#:use-module (system base language)
- #:use-module (system il compile)
+ #:use-module ((system il compile) #:select ((compile . compile-il)))
+ #:use-module (system il ghil)
#:use-module (system il glil)
#:use-module (system vm objcode)
- #:use-module (system vm vm) ;; for compile-time evaluation
#:use-module (system vm assemble)
+ #:use-module (system vm vm) ;; for compile-time evaluation
#:use-module (ice-9 regex)
+ #:use-module (ice-9 optargs)
#:export (syntax-error compile-file load-source-file load-file
- compiled-file-name
- scheme-eval read-file-in compile-in
- load/compile))
+ *current-language*
+ compiled-file-name
+ compile-time-environment
+ compile read-file-in compile-in
+ load/compile)
+ #:export-syntax (call-with-compile-error-catch))
;;;
;;; Compiler environment
(format (current-error-port)
"unknown location: ~A: ~A~%" msg exp)))))
-(export-syntax call-with-compile-error-catch)
-
-
\f
;;;
;;; Compiler
;;;
-(define (scheme) (lookup-language 'scheme))
+(define *current-language* (make-fluid))
(define (call-with-output-file/atomic filename proc)
(let* ((template (string-append filename ".XXXXXX"))
(define (compile-file file . opts)
(let ((comp (compiled-file-name file))
- (scheme (scheme)))
+ (lang (fluid-ref *current-language*)))
(catch 'nothing-at-all
(lambda ()
(call-with-compile-error-catch
(lambda ()
(call-with-output-file/atomic comp
(lambda (port)
- (let* ((source (read-file-in file scheme))
+ (let* ((source (read-file-in file lang))
(objcode (apply compile-in source (current-module)
- scheme opts)))
+ lang opts)))
(if (memq #:c opts)
(pprint-glil objcode port)
(uniform-vector-write (objcode->u8vector objcode) port)))))
; result))))
(define (load-source-file file . opts)
- (let ((source (read-file-in file (scheme))))
- (apply compile-in source (current-module) (scheme) opts)))
+ (let ((lang (fluid-ref *current-language*)))
+ (let ((source (read-file-in file lang)))
+ (apply compile-in source (current-module) lang opts))))
(define (load-file file . opts)
(let ((comp (compiled-file-name file)))
(apply load-source-file file opts))))
(define (compiled-file-name file)
- (let ((base (basename file)))
- (let ((m (string-match "\\.scm$" base)))
- (string-append (if m (match:prefix m) base) ".go"))))
-
-(define (scheme-eval x e)
- (vm-load (the-vm) (compile-in x e (scheme))))
+ (let ((base (basename file))
+ (cext (cond ((or (null? %load-compiled-extensions)
+ (string-null? (car %load-compiled-extensions)))
+ (warn "invalid %load-compiled-extensions"
+ %load-compiled-extensions)
+ ".go")
+ (else (car %load-compiled-extensions)))))
+ (let lp ((exts %load-extensions))
+ (cond ((null? exts) (string-append base cext))
+ ((string-null? (car exts)) (lp (cdr exts)))
+ ((string-suffix? (car exts) base)
+ (string-append
+ (substring base 0
+ (- (string-length base) (string-length (car exts))))
+ cext))
+ (else (lp (cdr exts)))))))
+
+;;; 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-ghil-env env)
+ (cond ((not env) (make-ghil-toplevel-env))
+ ((module? env) (make-ghil-toplevel-env))
+ ((pair? env)
+ (ghil-env-dereify (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 (compile-time-environment)
+ "A special function known to the compiler that, when compiled, will
+return a representation of the lexical environment in place at compile
+time. Useful for supporting some forms of dynamic compilation. Returns
+#f if called from the interpreter."
+ #f)
+
+(define* (compile x #:optional env)
+ (let ((thunk (objcode->program
+ (compile-in x env (fluid-ref *current-language*))
+ (cenv-externals env))))
+ (if (not env)
+ (thunk)
+ (save-module-excursion
+ (lambda ()
+ (set-current-module (cenv-module env))
+ (thunk))))))
\f
;;;
(lambda ()
(catch 'result
(lambda ()
+ (and=> (cenv-module e) set-current-module)
+ (set! e (cenv-ghil-env e))
;; expand
(set! x ((language-expander lang) x e))
(if (memq #:e opts) (throw 'result x))
(set! x ((language-translator lang) x e))
(if (memq #:t opts) (throw 'result x))
;; compile
- (set! x (apply compile x e opts))
+ (set! x (apply compile-il x e opts))
(if (memq #:c opts) (throw 'result x))
;; assemble
(apply assemble x e opts))
(not (string=? (dirname oldname) ".")))
(string-append (dirname oldname) "/" filename)
filename)))
+
+(fluid-set! *current-language* (lookup-language 'scheme))
(error "too many initargs" args slots))
(else
(lp (cdr in) (cdr positional)
- (acons (car positional) (car in) out))))))
+ (let ((slot (car positional)))
+ (acons (if (pair? slot) (car slot) slot)
+ (car in)
+ out)))))))
(define-macro (record-case record . clauses)
(let ((r (gensym)))
ghil-reified-env-env ghil-reified-env-loc
ghil-env-add!
- ghil-env-reify
+ ghil-env-reify ghil-env-dereify
ghil-var-is-bound? ghil-var-for-ref! ghil-var-for-set! ghil-var-define!
ghil-var-at-module!
call-with-ghil-environment call-with-ghil-bindings))
(filter (lambda (v) (eq? (ghil-var-kind v) 'external))
variables)))))))
+(define (ghil-env-dereify name-index-alist)
+ (let* ((e (make-ghil-env (make-ghil-toplevel-env)))
+ (vars (map (lambda (pair)
+ (make-ghil-var e (car pair) 'external (cdr pair)))
+ name-index-alist)))
+ (set! (ghil-env-table e)
+ (map (lambda (v) (cons (ghil-var-name v) v)) vars))
+ (set! (ghil-env-variables e) vars)
+ e))
+
\f
;;;
;;; Parser
(if expand-only? '(#:e) '())
(if translate-only? '(#:t) '())
(if compile-only? '(#:c) '()))))
-
- (catch #t
- (lambda ()
- (for-each (lambda (file)
- (apply compile-file file compile-opts))
- (option-ref options '() '())))
- (lambda (key . args)
- (format (current-error-port) "exception `~a' caught~a~%" key
- (if (null? args) ""
- (if (string? (car args))
- (string-append " in subr `" (car args) "'")
- "")))
-
- (format (current-error-port) "removing compiled files due to errors~%")
- (false-if-exception
- (for-each unlink (map compiled-file-name files)))
- (exit 1))))))
+ (for-each (lambda (file)
+ (apply compile-file file compile-opts))
+ (option-ref options '() '())))))
--- /dev/null
+;;;; compiler.test --- tests for the compiler -*- scheme -*-
+;;;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1999, 2001, 2006 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
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+(define-module (test-suite tests compiler)
+ :use-module (test-suite lib)
+ :use-module (test-suite guile-test)
+ :use-module (system vm program))
+
+
+(with-test-prefix "environments"
+
+ (pass-if "compile-time-environment in evaluator"
+ (eq? (primitive-eval '(compile-time-environment)) #f))
+
+ (pass-if "compile-time-environment in compiler"
+ (equal? (compile '(compile-time-environment))
+ (cons (current-module)
+ (cons '() '()))))
+
+ (let ((env (compile
+ '(let ((x 0)) (set! x 1) (compile-time-environment)))))
+ (pass-if "compile-time-environment in compiler, heap-allocated var"
+ (equal? env
+ (cons (current-module)
+ (cons '((x . 0)) '(1)))))
+
+ ;; fixme: compiling with #t or module
+ (pass-if "recompiling with environment"
+ (equal? ((compile '(lambda () x) env))
+ 1))
+
+ (pass-if "recompiling with environment/2"
+ (equal? ((compile '(lambda () (set! x (1+ x)) x) env))
+ 2))
+
+ (pass-if "recompiling with environment/3"
+ (equal? ((compile '(lambda () x) env))
+ 2))
+ )
+
+ (pass-if "compile environment is #f"
+ (equal? ((compile '(lambda () 10)))
+ 10))
+
+ (pass-if "compile environment is a module"
+ (equal? ((compile '(lambda () 10) (current-module)))
+ 10))
+ )
\ No newline at end of file
HCoop / bpt / guile.git / commitdiff