summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2015-09-10 04:22:10 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2015-09-10 04:22:10 +0200
commitdb8ab30c7587616edd99cb90bfdfa77fe4e702ac (patch)
tree9565261d5cd73da56699b863cafd83cc29667703
parent4f31a25509f5d4a93559a3feb751cdfbef0464b5 (diff)
downloadgeiser-guile-db8ab30c7587616edd99cb90bfdfa77fe4e702ac.tar.gz
geiser-guile-db8ab30c7587616edd99cb90bfdfa77fe4e702ac.tar.bz2
Speeding up debugger check (addresses #64)
Soooo, the long delay experienced when evaluating long string lists in Guile had nothing to do with the time took by emacs to read the response from the scheme process; that process is always a breeze, no matter or its format or number of newlines. The delay was provoked by an innocent looking function that scans the received string (which includes a prompt at the end as an EOT marker) to check whether Guile (or any other scheme) has just entered the debugger (that's done inside `geiser-con--connection-update-debugging`). For some reason, `string-match` on that kind of string using Guile's regexp for a debug prompt takes forever. Instead of trying to optimize the regular expression, i've just applied it to the *second* line of the received string, which is the one that contains the response's prompt.
-rw-r--r--elisp/geiser-connection.el14
-rw-r--r--scheme/guile/geiser/evaluation.scm8
2 files changed, 8 insertions, 14 deletions
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 69dd6a9..e466cd3 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -156,7 +156,8 @@
(defun geiser-con--has-entered-debugger (con answer)
(and (not (geiser-con--connection-is-debugging con))
- (geiser-con--connection-update-debugging con answer)))
+ (let ((p (car (last (split-string answer "\n" t)))))
+ (and p (geiser-con--connection-update-debugging con p)))))
(defun geiser-con--connection-eot-p (con txt)
(and txt
@@ -201,15 +202,12 @@
`((error (key . geiser-debugger))
(output . ,answer))
(condition-case err
- (let* ((start (string-match "((\\(?:result)?\\|error\\) " answer))
- (form (or (and start (car (read-from-string answer start)))
- `((error (key . retort-syntax))
- (output . ,answer)))))
- form)
+ (let ((start (string-match "((\\(?:result)?\\|error\\) " answer)))
+ (or (and start (car (read-from-string answer start)))
+ `((error (key . retort-syntax)) (output . ,answer))))
(error `((error (key . geiser-con-error))
(output . ,(format "%s\n(%s)"
- answer
- (error-message-string err)))))))))
+ answer (error-message-string err)))))))))
(defun geiser-con--process-completed-request (req answer)
(let ((cont (geiser-con--request-continuation req))
diff --git a/scheme/guile/geiser/evaluation.scm b/scheme/guile/geiser/evaluation.scm
index ea4071d..4c87532 100644
--- a/scheme/guile/geiser/evaluation.scm
+++ b/scheme/guile/geiser/evaluation.scm
@@ -49,11 +49,6 @@
(ge:set-warnings 'none)
-(define (stringify obj)
- (object->string obj
- (lambda (o . ps)
- (pretty-print o (car ps) #:max-expr-width 100))))
-
(define (call-with-result thunk)
(letrec* ((result #f)
(output
@@ -62,7 +57,8 @@
(with-fluids ((*current-warning-port* (current-output-port))
(*current-warning-prefix* ""))
(with-error-to-port (current-output-port)
- (lambda () (set! result (map stringify (thunk))))))))))
+ (lambda () (set! result
+ (map object->string (thunk))))))))))
(write `((result ,@result) (output . ,output)))
(newline)))