[Guile-commits] GNU Guile branch, master, updated. release_1-9-12-179-ga627100

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=a627100bf39c64f986536e9faff564e5602e0efa

The branch, master has been updated
       via  a627100bf39c64f986536e9faff564e5602e0efa (commit)
      from  7cd6d77c640115d64768ac2e6d81b82e272a706f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a627100bf39c64f986536e9faff564e5602e0efa
Author: Andy Wingo <address@hidden>
Date:   Fri Oct 8 19:27:45 2010 +0200

    further repl tweaks
    
    * 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.

-----------------------------------------------------------------------

Summary of changes:
 module/system/repl/error-handling.scm |   18 +++++++++---------
 module/system/repl/repl.scm           |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/system/repl/error-handling.scm 
b/module/system/repl/error-handling.scm
index 609d9c3..58317a8 100644
--- a/module/system/repl/error-handling.scm
+++ b/module/system/repl/error-handling.scm
@@ -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))))))
diff --git a/module/system/repl/repl.scm b/module/system/repl/repl.scm
index 9691dfb..fbe7b12 100644
--- a/module/system/repl/repl.scm
+++ b/module/system/repl/repl.scm
@@ -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))


hooks/post-receive
-- 
GNU Guile