[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-247-g4f96911

[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=4f9691174ddf83c6b5502b6b71262484c7f936e0

The branch, master has been updated
       via  4f9691174ddf83c6b5502b6b71262484c7f936e0 (commit)
       via  3d4f8e3c2dd917bee6c5a55be3349234211faab1 (commit)
       via  5bc97ad5dd7baa1d9f19571fed0fe6a339ed0688 (commit)
      from  66ad445dcfaa712a0f0b3f7d23c49b90165e1eaf (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 4f9691174ddf83c6b5502b6b71262484c7f936e0
Author: Andy Wingo <address@hidden>
Date:   Fri Aug 6 17:42:04 2010 +0200

    more NEWS updates
    
    * NEWS: Update some more.

commit 3d4f8e3c2dd917bee6c5a55be3349234211faab1
Author: Andy Wingo <address@hidden>
Date:   Fri Aug 6 17:39:44 2010 +0200

    fix stack narrowing for tail-call to throw
    
    * module/system/repl/debug.scm (narrow-stack->vector): Fix for the
      tail-call to `throw' case, as in `(quit)'.

commit 5bc97ad5dd7baa1d9f19571fed0fe6a339ed0688
Author: Andy Wingo <address@hidden>
Date:   Fri Aug 6 17:28:10 2010 +0200

    ,x unbound does not quit repl
    
    * module/system/repl/repl.scm (run-repl): Catch errors executing
      metacommands. Feature on top of feature...

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

Summary of changes:
 NEWS                         |   12 ++++--------
 module/system/repl/debug.scm |    6 +++++-
 module/system/repl/repl.scm  |   16 +++++++++++++---
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index c40147f..c6caed3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,14 +4,9 @@ See the end for copying conditions.
 
 Please send Guile bug reports to address@hidden
 
-FIXME:
 
-  * ,x of failing computation
-  * (quit)
-
-
-(During the 1.9 series, we will keep an incremental NEWS for the latest
-prerelease, and a full NEWS corresponding to 1.8 -> 2.0.)
+Note: During the 1.9 series, we will keep an incremental NEWS for the
+latest prerelease, and a full NEWS corresponding to 1.8 -> 2.0.
 
 Changes in 1.9.12 (since the 1.9.11 prerelease):
 
@@ -333,7 +328,8 @@ better with `make' tools.
 ** Simplifications to the `(system foreign)' API.
     
 Guile's foreign function interface was simplified a great
-deal. Interested users should see the documentation for 
+deal. Interested users should see "Foreign Function Interface" in the
+manual, for full details.
 
 ** User Scheme code may be placed in a version-specific path
 
diff --git a/module/system/repl/debug.scm b/module/system/repl/debug.scm
index 01b1b4c..293b790 100644
--- a/module/system/repl/debug.scm
+++ b/module/system/repl/debug.scm
@@ -195,7 +195,11 @@
     v))
 
 (define (narrow-stack->vector stack . args)
-  (stack->vector (apply make-stack (stack-ref stack 0) args)))
+  (let ((narrowed (apply make-stack (stack-ref stack 0) args)))
+    (if narrowed
+        (stack->vector narrowed)
+        #()))) ; ? Can be the case for a tail-call to `throw' tho
+
 
 ;; (define (debug)
 ;;   (run-debugger
diff --git a/module/system/repl/repl.scm b/module/system/repl/repl.scm
index 21998ba..9e364dd 100644
--- a/module/system/repl/repl.scm
+++ b/module/system/repl/repl.scm
@@ -121,10 +121,20 @@
            (cond
             ((eqv? exp *unspecified*))  ; read error, pass
             ((eq? exp meta-command-token)
-             (catch 'quit
-               (lambda () (meta-command repl))
+             (catch #t
+               (lambda ()
+                 (meta-command repl))
                (lambda (k . args)
-                 (abort args))))
+                 (if (eq? k 'quit)
+                     (abort args)
+                     (begin
+                       (format #t "While executing meta-command:~%" string)
+                       (pmatch args
+                         ((,subr ,msg ,args . ,rest)
+                          (display-error #f (current-output-port) subr msg 
args rest))
+                         (else
+                          (format #t "ERROR: Throw to key `~a' with args 
`~s'.\n" key args)))
+                       (force-output))))))
             ((eof-object? exp)
              (newline)
              (abort '()))


hooks/post-receive
-- 
GNU Guile