Skip to content
Browse files

Merge pull request #1 from ayamada/myfix

fix fasps installer for guile
  • Loading branch information...
2 parents 4988cd9 + 2da377d commit 92bbfe996158da8f7609f3b4d7eadf47be542254 @aliclark committed May 11, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 bin/install
  2. +1 −1 src/hasp.scm
  3. +1 −1 src/load-file.scm
  4. +1 −1 src/sugar-read.scm
View
2 bin/install
@@ -85,7 +85,7 @@ SCHEME_HASPS="guile -l \$(dirname \"\$0\")/../src/preload.scm \
-l \$(dirname \"\$0\")/../src/load-file.scm \
-s \$(dirname \"\$0\")/../src/acc-term.scm"
-SCHEME_FASPS="guile -l \$(dirname \"$\0\")/../src/preload.scm \
+SCHEME_FASPS="guile -l \$(dirname \"\$0\")/../src/preload.scm \
-l \$(dirname \"\$0\")/../src/sugar-read.scm \
-l \$(dirname \"\$0\")/../src/load-file.scm \
-s \$(dirname \"\$0\")/../src/acc-file.scm"
View
2 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))))
View
2 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))))
View
2 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)

0 comments on commit 92bbfe9

Please sign in to comment.
Something went wrong with that request. Please try again.