diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-04-16 20:36:26 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-04-16 20:36:26 +0200 |
| commit | c6248c48f344a68d8f9cc82232eff12b8d708096 (patch) | |
| tree | 8c8eb569182a6bd5dc254c6f1f4922ca98e39b8a /geiser/evaluation.scm | |
| parent | 7b0d68b3f82f7595b6c753702d2e3858bbb3833d (diff) | |
| download | geiser-guile-c6248c48f344a68d8f9cc82232eff12b8d708096.tar.gz geiser-guile-c6248c48f344a68d8f9cc82232eff12b8d708096.tar.bz2 | |
Guile: evaluation output collection reactivated.
with-output-to-string was broken in guile prior to 1.9.10.
Diffstat (limited to 'geiser/evaluation.scm')
| -rw-r--r-- | geiser/evaluation.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/geiser/evaluation.scm b/geiser/evaluation.scm index 22817ea..4fec3ed 100644 --- a/geiser/evaluation.scm +++ b/geiser/evaluation.scm @@ -31,7 +31,6 @@ (display-error stack (current-output-port) subr msg args rest)) (else (display (format "ERROR: ~a, args: ~a" (car args) (cdr args))))) `(error (key . ,(car args)))) -(nested-ref the-root-module '(%app modules geiser)) (define (find-module module-name) (and (list? module-name) @@ -48,9 +47,8 @@ (set! result (call-with-values (lambda () (compile form #:env module)) (lambda vs (map object->string vs))))))) - (let (#;(output (with-output-to-string ev))) - (ev) - (write `(,(cons 'result result) (output . ""))) + (let ((output (with-output-to-string ev))) + (write `(,(cons 'result result) (output . ,output))) (newline)))) (define ge:eval ge:compile) |