From: "Ludovic Courtès" <ludo@gnu.org>
To: 40077@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#40077] [PATCH 3/4] repl: Return stack traces along with exceptions.
Date: Sun, 15 Mar 2020 18:15:06 +0100 [thread overview]
Message-ID: <20200315171507.22910-3-ludo@gnu.org> (raw)
In-Reply-To: <20200315171507.22910-1-ludo@gnu.org>
* guix/repl.scm (repl-prompt): New variable.
(stack->frames): New procedure.
(send-repl-response)[frame->sexp, handle-exception]: New procedure.
Pass HANDLE-EXCEPTION as a pre-unwind handler.
(machine-repl): Define 'tag'. Bump protocol version to (0 1 1).
Wrap 'loop' call in 'call-with-prompt'.
---
guix/repl.scm | 64 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 54 insertions(+), 10 deletions(-)
diff --git a/guix/repl.scm b/guix/repl.scm
index a141003812..0ace5976cf 100644
--- a/guix/repl.scm
+++ b/guix/repl.scm
@@ -17,6 +17,8 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix repl)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:export (send-repl-response
machine-repl))
@@ -39,6 +41,17 @@
(one-of symbol? string? keyword? pair? null? array?
number? boolean? char?)))
+(define repl-prompt
+ ;; Current REPL prompt or #f.
+ (make-parameter #f))
+
+(define (stack->frames stack)
+ "Return STACK's frames as a list."
+ (unfold (cute >= <> (stack-length stack))
+ (cut stack-ref stack <>)
+ 1+
+ 0))
+
(define* (send-repl-response exp output
#:key (version '(0 0)))
"Write the response corresponding to the evaluation of EXP to PORT, an
@@ -49,6 +62,32 @@ output port. VERSION is the client's protocol version we are targeting."
`(non-self-quoting ,(object-address value)
,(object->string value))))
+ (define (frame->sexp frame)
+ `(,(frame-procedure-name frame)
+ ,(match (frame-source frame)
+ ((_ (? string? file) (? integer? line) . (? integer? column))
+ (list file line column))
+ (_
+ '(#f #f #f)))))
+
+ (define (handle-exception key . args)
+ (define reply
+ (match version
+ ((0 1 (? positive?) _ ...)
+ ;; Protocol (0 1 1) and later.
+ (let ((stack (if (repl-prompt)
+ (make-stack #t handle-exception (repl-prompt))
+ (make-stack #t))))
+ `(exception (arguments ,key ,@(map value->sexp args))
+ (stack ,@(map frame->sexp (stack->frames stack))))))
+ (_
+ ;; Protocol (0 0).
+ `(exception ,key ,@(map value->sexp args)))))
+
+ (write reply output)
+ (newline output)
+ (force-output output))
+
(catch #t
(lambda ()
(let ((results (call-with-values
@@ -59,10 +98,8 @@ output port. VERSION is the client's protocol version we are targeting."
output)
(newline output)
(force-output output)))
- (lambda (key . args)
- (write `(exception ,key ,@(map value->sexp args)))
- (newline output)
- (force-output output))))
+ (const #t)
+ handle-exception))
(define* (machine-repl #:optional
(input (current-input-port))
@@ -73,6 +110,9 @@ The protocol of this REPL is meant to be machine-readable and provides proper
support to represent multiple-value returns, exceptions, objects that lack a
read syntax, and so on. As such it is more convenient and robust than parsing
Guile's REPL prompt."
+ (define tag
+ (make-prompt-tag "repl-prompt"))
+
(define (loop exp version)
(match exp
((? eof-object?) #t)
@@ -81,7 +121,7 @@ Guile's REPL prompt."
#:version version)
(loop (read input) version))))
- (write `(repl-version 0 1) output)
+ (write `(repl-version 0 1 1) output)
(newline output)
(force-output output)
@@ -91,8 +131,12 @@ Guile's REPL prompt."
;; recent client that sends (() repl-version ...). This form is chosen to
;; be unambiguously distinguishable from a regular Scheme expression.
- (match (read input)
- ((() 'repl-version version ...)
- (loop (read input) version))
- (exp
- (loop exp '(0 0)))))
+ (call-with-prompt tag
+ (lambda ()
+ (parameterize ((repl-prompt tag))
+ (match (read input)
+ ((() 'repl-version version ...)
+ (loop (read input) version))
+ (exp
+ (loop exp '(0 0))))))
+ (const #f)))
--
2.25.1
next prev parent reply other threads:[~2020-03-15 17:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-15 17:00 [bug#40077] [PATCH 0/4] Inferior provide stack traces along with exceptions Ludovic Courtès
2020-03-15 17:15 ` [bug#40077] [PATCH 1/4] repl: Allow clients to send their protocol version Ludovic Courtès
2020-03-15 17:15 ` [bug#40077] [PATCH 2/4] inferior: Adjust to protocol (0 1) Ludovic Courtès
2020-03-15 17:15 ` Ludovic Courtès [this message]
2020-03-15 17:15 ` [bug#40077] [PATCH 4/4] inferior: '&inferior-exception' includes a stack trace Ludovic Courtès
2020-03-19 14:15 ` bug#40077: [PATCH 0/4] Inferior provide stack traces along with exceptions Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200315171507.22910-3-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=40077@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).