steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FUEL: small fixes for debug buffers.

db4
Jose A. Ortega Ruiz 2008-12-21 22:12:46 +01:00
parent 06273fddfd
commit 41b0bc0dd9
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/fuel/fuel.factor
View File

@ -122,8 +122,8 @@ M: source-file fuel-pprint path>> fuel-pprint ;
fuel-forget-result fuel-forget-result
fuel-forget-output ; fuel-forget-output ;
: (fuel-end-eval) ( quot -- ) : (fuel-end-eval) ( result -- )
with-string-writer fuel-eval-output set-global fuel-retort fuel-eval-output set-global fuel-retort
pop-fuel-status ; inline pop-fuel-status ; inline
: (fuel-eval) ( lines -- ) : (fuel-eval) ( lines -- )
@ -141,11 +141,9 @@ M: source-file fuel-pprint path>> fuel-pprint ;
[ dup "IN: " prepend 1vector (fuel-eval) in set ] when* ; inline [ dup "IN: " prepend 1vector (fuel-eval) in set ] when* ; inline
: fuel-eval-in-context ( lines in usings -- ) : fuel-eval-in-context ( lines in usings -- )
(fuel-begin-eval) [ (fuel-begin-eval)
(fuel-eval-usings) [ (fuel-eval-usings) (fuel-eval-in) (fuel-eval) ] with-string-writer
(fuel-eval-in) (fuel-end-eval) ;
(fuel-eval)
] (fuel-end-eval) ;
: fuel-run-file ( path -- ) run-file ; inline : fuel-run-file ( path -- ) run-file ; inline

22
misc/fuel/fuel-debug.el
View File

@ -106,11 +106,11 @@
(when err (when err
(fuel-debug--display-restarts err) (fuel-debug--display-restarts err)
(delete-blank-lines) (delete-blank-lines)
(newline) (newline))
(let ((hstr (fuel-debug--help-string err file))) (let ((hstr (fuel-debug--help-string err file)))
(if fuel-debug-show-short-help (if fuel-debug-show-short-help
(insert "-----------\n" hstr "\n") (insert "-----------\n" hstr "\n")
(message "%s" hstr)))) (message "%s" hstr)))
(setq fuel-debug--last-ret ret) (setq fuel-debug--last-ret ret)
(setq fuel-debug--file file) (setq fuel-debug--file file)
(goto-char (point-max)) (goto-char (point-max))
@ -174,16 +174,16 @@
(defun fuel-debug-goto-error () (defun fuel-debug-goto-error ()
(interactive) (interactive)
(let* ((err (or (fuel-debug--buffer-error) (let* ((err (fuel-debug--buffer-error))
(error "No errors reported")))
(file (or (fuel-debug--buffer-file) (file (or (fuel-debug--buffer-file)
(error "No file associated with error"))) (error "No file associated with compilation")))
(l/c (fuel-eval--error-line/column err)) (l/c (and err (fuel-eval--error-line/column err)))
(line (or (car l/c) 1)) (line (or (car l/c) 1))
(col (or (cdr l/c) 0))) (col (or (cdr l/c) 0)))
(find-file-other-window file) (find-file-other-window file)
(when line
(goto-line line) (goto-line line)
(forward-char col))) (when col (forward-char col)))))
(defun fuel-debug--read-restart-no () (defun fuel-debug--read-restart-no ()
(let ((rs (fuel-debug--buffer-restarts))) (let ((rs (fuel-debug--buffer-restarts)))
@ -219,9 +219,11 @@
(unless (re-search-forward (format "^%s" info) nil t) (unless (re-search-forward (format "^%s" info) nil t)
(error "%s information not available" info)) (error "%s information not available" info))
(message "Retrieving %s info ..." info) (message "Retrieving %s info ..." info)
(unless (fuel-debug--display-retort (unless (fuel-debug--display-retort (fuel-eval--send/wait
(fuel-eval--send/wait `(:fuel ((:factor ,info)))) `(:fuel ((:factor ,info))))
"" (fuel-debug--buffer-file)) ""
nil
(fuel-debug--buffer-file))
(error "Sorry, no %s info available" info)))) (error "Sorry, no %s info available" info))))