From c6248c48f344a68d8f9cc82232eff12b8d708096 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Fri, 16 Apr 2010 20:36:26 +0200 Subject: Guile: evaluation output collection reactivated. with-output-to-string was broken in guile prior to 1.9.10. --- geiser/evaluation.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'geiser/evaluation.scm') 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) -- cgit v1.2.3