mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-03 05:20:16 +02:00
Code Activity

show args to subr calls in backtraces

Browse source 
* module/system/vm/frame.scm (frame-arguments): For subrs, we don't get
  names in the lambda-list, we get #f instead. But still, parse out the
  args in that case, assuming they are on the stack in that order.
This commit is contained in:
Andy Wingo 2010-01-10 23:10:24 +01:00
parent cf8ec359cc
commit ecdf15573b
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
module/system/vm/frame.scm
View file

@ -1,6 +1,6 @@
;;; Guile VM frame functions ;;; Guile VM frame functions
;;; Copyright (C) 2001, 2005, 2009 Free Software Foundation, Inc. ;;; Copyright (C) 2001, 2005, 2009, 2010 Free Software Foundation, Inc.
;;; ;;;
;;; This library is free software; you can redistribute it and/or ;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Lesser General Public ;;; modify it under the terms of the GNU Lesser General Public
@ -74,16 +74,21 @@
(frame-instruction-pointer frame)) (frame-instruction-pointer frame))
;; case 1 ;; case 1
=> (lambda (formals) => (lambda (formals)
(let lp ((formals formals)) (let lp ((formals formals) (i 0))
(pmatch formals (pmatch formals
(() '()) (() '())
((,x . ,rest) (guard (symbol? x)) ((,x . ,rest) (guard (symbol? x))
(cons (frame-binding-ref frame x) (lp rest))) (cons (frame-binding-ref frame x) (lp rest (1+ i))))
((,x . ,rest) ((,x . ,rest) (guard (keyword? x))
;; could be a keyword (cons x (lp rest i)))
(cons x (lp rest))) ((,x . ,rest) (guard (not x) (< i (frame-num-locals frame)))
;; an arg, but we don't know the name. ref by index.
(cons (frame-local-ref frame i) (lp rest (1+ i))))
(,rest (guard (symbol? rest)) (,rest (guard (symbol? rest))
(frame-binding-ref frame rest)) (frame-binding-ref frame rest))
(,rest (guard (not rest) (< i (frame-num-locals frame)))
;; again, no name.
(frame-local-ref frame i))
;; let's not error here, as we are called during ;; let's not error here, as we are called during
;; backtraces... ;; backtraces...
(else '???))))) (else '???)))))