Ticket #1437: toplevel-evals.diff

batch-driver.scm

@@ -187 +187 @@
                              `((uses ,@default-units)))))
                      ,@(if explicit-use-flag
                            '()
-                           `((import ,@default-imports)))
-                     ;; Ensure the same default environment is
-                     ;; available from eval, as well.  See notes at
-                     ;; the end of internal.scm and modules.scm.
-                     ,@(if explicit-use-flag
-                           '()
-                           `((scheme#eval '(import-for-syntax ,@default-syntax-imports))
-                             (scheme#eval '(import ,@default-imports))))))
+                           `((import ,@default-imports)))))
         (verbose (memq 'verbose options))
         (outfile (cond ((memq 'output-file options) 
                         => (lambda (node)

eval.scm

@@ -739 +739 @@
   (make-parameter
    (lambda (x #!optional env)
      (let ((se (##sys#current-environment)))
+       ;; When se is empty, it's the first time eval was called:
+       ;; ensure an active default environment.  We do it here because
+       ;; eval does not work yet at the end of modules.scm, and we
+       ;; don't want to inject calls into every toplevel (see #1437)
+       (when (null? se)
+         ((compile-to-closure
+           `(##core#begin (import-for-syntax ,@default-syntax-imports)
+                          (import ,@default-imports))
+           '() se #f #f #f #t) '()))
        (cond (env
               (##sys#check-structure env 'environment 'eval)
               (let ((se2 (##sys#slot env 2)))

modules.scm

@@ -1133 +1133 @@
 
 ;; Ensure default modules are available in "eval", too
 ;; TODO: Figure out a better way to make this work for static programs.
-;; The actual imports are handled by the prelude inserted by
-;; batch-driver.scm
+;; The actual imports are handled lazily by eval when first called.
 (include "chicken.base.import.scm")
 (include "chicken.syntax.import.scm")

tests/scrutiny.expected

@@ -43 +43 @@
   assignment of value of type `fixnum' to toplevel variable `scheme#car' does not match declared type `(forall (a) (procedure scheme#car ((pair a *)) a))'
 
 Warning: at toplevel:
-  expected a single result in `let' binding of `g118', but received 2 results
+  expected a single result in `let' binding of `g127', but received 2 results
 
 Warning: at toplevel:
-  in procedure call to `g118', expected a value of type `(procedure () *)' but was given a value of type `fixnum'
+  in procedure call to `g127', expected a value of type `(procedure () *)' but was given a value of type `fixnum'
 
 Note: in toplevel procedure `foo':
   expected a value of type boolean in conditional, but was given a value of type `(procedure bar () *)' which is always true: