summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1997-08-14 18:24:46 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1997-08-14 18:24:46 +0000
commit096d5f90c3f227966e68d8b6a2d87d36b6a01028 (patch)
treeab11858719f627b301feaada797ac4ce69708009
parent0824b52425e03fe1b3c0b6e6b29b127b39ad37ef (diff)
downloadguile-096d5f90c3f227966e68d8b6a2d87d36b6a01028.tar.gz
* 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.
-rw-r--r--ice-9/ChangeLog10
-rw-r--r--ice-9/boot-9.scm3
-rw-r--r--ice-9/slib.scm6
3 files changed, 15 insertions, 4 deletions
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 124ae049e..c4e6daaed 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -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.
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 80f1190cc..ec6ed2272 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -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
diff --git a/ice-9/slib.scm b/ice-9/slib.scm
index 71ecb8d5b..43eaa1db6 100644
--- a/ice-9/slib.scm
+++ b/ice-9/slib.scm
@@ -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)))))