mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-19 19:20:23 +02:00
* slib.scm (slib:load): Use load-from-path instead of
primitive-load-path so that backtraces get narrowed properly at the top. * boot-9.scm (top-repl): Save stack already in signal handler in order to narrow it correctly. (save-stack): Adjust narrowing tag for the top of load-stacks.
This commit is contained in:
parent
0824b52425
commit
096d5f90c3
3 changed files with 15 additions and 4 deletions
|
@ -1,3 +1,13 @@
|
|||
Thu Aug 14 19:55:37 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
|
||||
|
||||
* slib.scm (slib:load): Use load-from-path instead of
|
||||
primitive-load-path so that backtraces get narrowed properly at
|
||||
the top.
|
||||
|
||||
* boot-9.scm (top-repl): Save stack already in signal handler in
|
||||
order to narrow it correctly.
|
||||
(save-stack): Adjust narrowing tag for the top of load-stacks.
|
||||
|
||||
Tue Jul 29 01:18:08 1997 Gary Houston <ghouston@actrix.gen.nz>
|
||||
|
||||
* boot-9.scm (move->fdes, dup->port): use dup->fdes, not primitive-dup.
|
||||
|
|
|
@ -2307,7 +2307,7 @@
|
|||
((repl-stack)
|
||||
(apply make-stack #t save-stack eval narrowing))
|
||||
((load-stack)
|
||||
(apply make-stack #t save-stack gsubr-apply narrowing))
|
||||
(apply make-stack #t save-stack 0 narrowing))
|
||||
((tk-stack)
|
||||
(apply make-stack #t save-stack tk-stack-mark narrowing))
|
||||
((#t)
|
||||
|
@ -2676,6 +2676,7 @@
|
|||
(lambda ()
|
||||
(let ((make-handler (lambda (msg)
|
||||
(lambda (sig)
|
||||
(save-stack %deliver-signals)
|
||||
(scm-error 'signal
|
||||
#f
|
||||
msg
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
|
||||
|
||||
;;; FIXME: Because uers want require to search the path, this uses
|
||||
;;; primitive-load-path, which probably isn't a hot idea. slib
|
||||
;;; load-from-path, which probably isn't a hot idea. slib
|
||||
;;; doesn't expect this function to search a path, so I expect to get
|
||||
;;; bug reports at some point complaining that the wrong file gets
|
||||
;;; loaded when something accidentally appears in the path before
|
||||
|
@ -123,13 +123,13 @@
|
|||
(set-current-module slib-module)
|
||||
(let* ((errinfo (catch 'system-error
|
||||
(lambda ()
|
||||
(primitive-load-path name)
|
||||
(load-from-path name)
|
||||
#f)
|
||||
(lambda args args)))
|
||||
(errinfo (and errinfo
|
||||
(catch 'system-error
|
||||
(lambda ()
|
||||
(primitive-load-path
|
||||
(load-from-path
|
||||
(string-append name ".scm"))
|
||||
#f)
|
||||
(lambda args args)))))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue