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

* slib.scm (slib:load): Use load-from-path instead of

Browse source 
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:
Mikael Djurfeldt 1997-08-14 18:24:46 +00:00
parent 0824b52425
commit 096d5f90c3
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ice-9/ChangeLog
View file

@ -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> 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. * boot-9.scm (move->fdes, dup->port): use dup->fdes, not primitive-dup.

3
ice-9/boot-9.scm
View file

@ -2307,7 +2307,7 @@
((repl-stack) ((repl-stack)
(apply make-stack #t save-stack eval narrowing)) (apply make-stack #t save-stack eval narrowing))
((load-stack) ((load-stack)
(apply make-stack #t save-stack gsubr-apply narrowing)) (apply make-stack #t save-stack 0 narrowing))
((tk-stack) ((tk-stack)
(apply make-stack #t save-stack tk-stack-mark narrowing)) (apply make-stack #t save-stack tk-stack-mark narrowing))
((#t) ((#t)
@ -2676,6 +2676,7 @@
(lambda () (lambda ()
(let ((make-handler (lambda (msg) (let ((make-handler (lambda (msg)
(lambda (sig) (lambda (sig)
(save-stack %deliver-signals)
(scm-error 'signal (scm-error 'signal
#f #f
msg msg

6
ice-9/slib.scm
View file

@ -109,7 +109,7 @@
;;; FIXME: Because uers want require to search the path, this uses ;;; 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 ;;; 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 ;;; bug reports at some point complaining that the wrong file gets
;;; loaded when something accidentally appears in the path before ;;; loaded when something accidentally appears in the path before
@ -123,13 +123,13 @@
(set-current-module slib-module) (set-current-module slib-module)
(let* ((errinfo (catch 'system-error (let* ((errinfo (catch 'system-error
(lambda () (lambda ()
(primitive-load-path name) (load-from-path name)
#f) #f)
(lambda args args))) (lambda args args)))
(errinfo (and errinfo (errinfo (and errinfo
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(primitive-load-path (load-from-path
(string-append name ".scm")) (string-append name ".scm"))
#f) #f)
(lambda args args))))) (lambda args args)))))