FUEL: make it so fuel-con-error is shown in *fuel debug*

db4
Björn Lindqvist 2014-04-25 17:39:44 +02:00 committed by John Benediktsson
parent e0087723c3
commit 6c6df7279b
2 changed files with 15 additions and 8 deletions

View File

@ -143,13 +143,16 @@ the debugger."
(fuel-debug--display-output ret)
(delete-blank-lines)
(newline)
(when (and (not err) success-msg)
(cond
((and (not err) success-msg)
(message "%s" success-msg)
(insert "\n" success-msg "\n"))
(when err
((eq (car err) 'fuel-con-error)
(fuel-debug--display-parse-error (second err)))
(err
(fuel-debug--display-restarts err)
(delete-blank-lines)
(newline))
(newline)))
(fuel-debug--display-uses ret)
(let ((hstr (fuel-debug--help-string err fuel-debug--file)))
(if fuel-debug-show-short-help
@ -202,6 +205,7 @@ the debugger."
(newline)))
(defun fuel-debug--display-output (ret)
"Diplays the retort `ret' in fuels debug buffer."
(let* ((last (fuel-eval--retort-output fuel-debug--last-ret))
(current (fuel-eval--retort-output ret))
(llen (length last))
@ -216,6 +220,11 @@ the debugger."
(when err
(insert (format "\nError: %S\n\n" (fuel-eval--error-name err))))))
(defun fuel-debug--display-parse-error (str)
(insert
(format
"FUEL failed to parse the connection response, displayed below:\n\n%s\n\n" str)))
(defun fuel-debug--display-restarts (err)
(let* ((rs (fuel-eval--error-restarts err))
(rsn (length rs)))

View File

@ -130,13 +130,11 @@
(defsubst fuel-eval--retort-p (ret)
(and (listp ret) (= 3 (length ret))))
(defsubst fuel-eval--make-parse-error-retort (str)
(fuel-eval--retort-make (cons 'fuel-parse-retort-error str) nil))
(defun fuel-eval--parse-retort (ret)
(fuel-log--info "RETORT: %S" ret)
(if (fuel-eval--retort-p ret) ret
(fuel-eval--make-parse-error-retort ret)))
(if (fuel-eval--retort-p ret)
ret
(list ret nil nil)))
(defsubst fuel-eval--error-name (err) (car err))