fix :scm and other eval code for guile

aliclark · May 10, 2012 · 2da377d · 2da377d
1 parent 3580935
commit 2da377d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/hasp.scm b/src/hasp.scm
@@ -488,7 +488,7 @@
   (implode ", "
     (map
       (lambda (x)
-        (let ((rv (eval x)))
+        (let ((rv (eval x (interaction-environment))))
           (if (equal? rv (cond (#f #f)))
             "()"
             (data-str rv))))

diff --git a/src/load-file.scm b/src/load-file.scm
@@ -551,7 +551,7 @@
   (implode ", "
     (map
       (lambda (x)
-        (let ((rv (eval x)))
+        (let ((rv (eval x (interaction-environment))))
           (if (equal? rv (cond (#f #f)))
             "()"
             (data-str rv))))

diff --git a/src/sugar-read.scm b/src/sugar-read.scm
@@ -215,7 +215,7 @@
 (define (sugar-load filename)
   (define (load port)
     (let ((inp (sugar-read-style #t port)))
-      (if (eof-object? inp) #t (begin (eval inp) (load port)))))
+      (if (eof-object? inp) #t (begin (eval inp (interaction-environment)) (load port)))))
   (load (open-input-file filename)))
 
 (define (sugar-enable)