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 | 4ab8dda507e77b0cc089144b533b3f23f35519ca (patch) | |
| tree | 1d310ab7e5a7efa9090263020e84487e8b63f84b | |
| parent | 5685fad662ea2568a8e16dcfdc709f1476abd15c (diff) | |
| download | geiser-guile-4ab8dda507e77b0cc089144b533b3f23f35519ca.tar.gz geiser-guile-4ab8dda507e77b0cc089144b533b3f23f35519ca.tar.bz2 | |
Guile: evaluation output collection reactivated.
with-output-to-string was broken in guile prior to 1.9.10.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | scheme/guile/geiser/evaluation.scm | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -22,7 +22,7 @@ * Supported scheme implementations - - Guile 1.9.9 or better. + - Guile 1.9.10 or better. - PLT Scheme 4.2 or better. * Installation diff --git a/scheme/guile/geiser/evaluation.scm b/scheme/guile/geiser/evaluation.scm index 22817ea..4fec3ed 100644 --- a/scheme/guile/geiser/evaluation.scm +++ b/scheme/guile/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) |