mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00
Code Activity

further repl tweaks

Browse source 
* module/system/repl/error-handling.scm (error-string): Refactor a
  little.
  (call-with-error-handling): Ensure a trailing newline when printing
  the error-msg.

* module/system/repl/repl.scm (run-repl): We don't know the name of the
  meta-command here.
This commit is contained in:
Andy Wingo 2010-10-08 19:27:45 +02:00
parent 7cd6d77c64
commit a627100bf3
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
module/system/repl/error-handling.scm
View file

@ -34,15 +34,15 @@
;;;
(define (error-string stack key args)
(with-output-to-string
(lambda ()
(pmatch args
((,subr ,msg ,args . ,rest)
(guard (> (vector-length stack) 0))
(pmatch args
((,subr ,msg ,args . ,rest)
(guard (> (vector-length stack) 0))
(with-output-to-string
(lambda ()
(display-error (vector-ref stack 0) (current-output-port)
subr msg args rest))
(else
(format #t "Throw to key `~a' with args `~s'." key args))))))
subr msg args rest))))
(else
(format #f "Throw to key `~a' with args `~s'." key args))))
(define* (call-with-error-handling thunk #:key
(on-error 'debug) (post-error 'catch)
@ -148,7 +148,7 @@
(debug (make-debug stack 0 error-msg)))
(with-saved-ports
(lambda ()
(display error-msg)
(format #t "~a~%" error-msg)
(format #t "Entering a new prompt. ")
(format #t "Type `,bt' for a backtrace or `,q' to continue.\n")
((@ (system repl repl) start-repl) #:debug debug))))))

2
module/system/repl/repl.scm
View file

@ -129,7 +129,7 @@
(if (eq? k 'quit)
(abort args)
(begin
(format #t "While executing meta-command `~A'~%" string)
(format #t "While executing meta-command:~%")
(pmatch args
((,subr ,msg ,args . ,rest)
(display-error #f (current-output-port) subr msg args rest))