Macro stepper: fixed display of same-module identifer binding
svn: r5680 original commit: 1198412bae3b81b5d0e954c1ae167e5d98b6f2b7
This commit is contained in:
parent
8cb207118a
commit
a7a18146d8
|
@ -23,28 +23,17 @@
|
|||
(map (lambda (x) (format " <= ~s" x)) (cdr mps)))]
|
||||
[(and (pair? mps) (null? (cdr mps)))
|
||||
(format "~s" (car mps))]
|
||||
[(null? mps) "self"]))
|
||||
[(null? mps) "this module"]))
|
||||
(format "~s" mpi)))
|
||||
|
||||
(define (mpi->list mpi)
|
||||
(if mpi
|
||||
(let-values ([(path rel) (module-path-index-split mpi)])
|
||||
(if (and (pair? path) (memq (car path) '(file lib planet)))
|
||||
(cons path null)
|
||||
(cons path (mpi->list rel))))
|
||||
(cond [(and (pair? path) (memq (car path) '(file lib planet)))
|
||||
(cons path null)]
|
||||
[path
|
||||
(cons path (mpi->list rel))]
|
||||
[else '()]))
|
||||
'()))
|
||||
|
||||
; ;; mpi->string : module-path-index -> string
|
||||
; ;; Human-readable form of module-path-index
|
||||
; (define (mpi->string x)
|
||||
; (cond [(module-path-index? x)
|
||||
; (let-values ([(path base) (module-path-index-split x)])
|
||||
; (cond [(eq? path #f)
|
||||
; "self module"]
|
||||
; [(eq? base #f)
|
||||
; (format "top-level => ~a" path)]
|
||||
; [else
|
||||
; (format "~a => ~a" (mpi->string base) path)]))]
|
||||
; [else x]))
|
||||
|
||||
)
|
|
@ -167,7 +167,7 @@
|
|||
(cond [(pair? b)
|
||||
(let ([name (cadr b)]
|
||||
[mod (car b)])
|
||||
(format "~a'~s' from module ~a"
|
||||
(format "~a'~s' from ~a"
|
||||
prefix
|
||||
name
|
||||
(mpi->string mod)))]
|
||||
|
|
Loading…
Reference in New Issue
Block a user