summaryrefslogtreecommitdiff
path: root/geiser/evaluation.scm
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-12 01:33:09 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-12 01:33:09 +0100
commitfa4e0bc54a0c6cf21efd7d74bf82dca97fb96b6c (patch)
treeb25c6e5da21dab09175a4b7559a8b2eff5f90519 /geiser/evaluation.scm
parent57e300954933f7b1b0672d8ebc9049202d3948b0 (diff)
downloadgeiser-guile-fa4e0bc54a0c6cf21efd7d74bf82dca97fb96b6c.tar.gz
geiser-guile-fa4e0bc54a0c6cf21efd7d74bf82dca97fb96b6c.tar.bz2
Guile reconnected (but not debuggable (yet))
Or the importance of EOL. Switching to a transaction queue for communication with the Scheme process means that i had to care about sending eols in the queries... Guile was waiting for ever reading a metacommand taking a variable number of arguments. Argh: this has taken me a few hours -- i'm getting old.
Diffstat (limited to 'geiser/evaluation.scm')
-rw-r--r--geiser/evaluation.scm18
1 files changed, 4 insertions, 14 deletions
diff --git a/geiser/evaluation.scm b/geiser/evaluation.scm
index ef082db..305ccfd 100644
--- a/geiser/evaluation.scm
+++ b/geiser/evaluation.scm
@@ -25,20 +25,6 @@
#:use-module (system vm program)
#:use-module (ice-9 pretty-print))
-(define (handle-error stack . args)
- (pmatch args
- ((,key ,subr ,msg ,args . ,rest)
- (display "Backtrace:\n")
- (if (stack? stack)
- (display-backtrace stack (current-output-port)))
- (newline)
- (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))))
-
-(define (write-result result output)
- (write (list (cons 'result result) (cons 'output output)))
- (newline))
(define compile-opts '())
(define compile-file-opts '())
@@ -62,6 +48,10 @@
(ge:set-warnings 'none)
+(define (write-result result output)
+ (write (list (cons 'result result) (cons 'output output)))
+ (newline))
+
(define (call-with-result thunk)
(letrec* ((result #f)
(output