From 3f619266b1e3420ad760275af542c128bc57cb8c Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Wed, 6 Nov 2002 00:29:24 +0000 Subject: [PATCH] Fix error in recent define-option-interface "simplification". Fix source breakpoints to cope with port whose filename is #f. Ensure that position recording is enabled when source breakpoint module loaded. --- ice-9/ChangeLog | 9 +++++++++ ice-9/boot-9.scm | 3 ++- ice-9/debugger/breakpoints/source.scm | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 22ab2fe6e..abc8f72d9 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,12 @@ +2002-11-05 Neil Jerram + + * boot-9.scm (define-option-interface): Fix to "simplification" + change below. + + * debugger/breakpoints/source.scm: Enable source property + recording when module is loaded. + (##): Cope with ports whose `filename' is not a string. + 2002-11-04 Neil Jerram * boot-9.scm (define-option-interface): Simplify code-generation diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index b6f010c9f..ebbfd4d00 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -2033,7 +2033,8 @@ ,(make-disable interface)) (defmacro ,(caaddr option-group) (opt val) `(,,(car options/enable/disable) - (list ',opt ,val))))))))) + (append (,,(car options/enable/disable)) + (list ',opt ,val)))))))))) (define-option-interface (eval-options-interface diff --git a/ice-9/debugger/breakpoints/source.scm b/ice-9/debugger/breakpoints/source.scm index 2dc4d8b9e..fd50e2ef9 100644 --- a/ice-9/debugger/breakpoints/source.scm +++ b/ice-9/debugger/breakpoints/source.scm @@ -257,9 +257,15 @@ (set-source-property! x' 'column column) x')))) + ;; Don't allow breakpointed expression to have + ;; a filename property that isn't a string. + (or (string? filename) + (set-source-property! x' 'filename "")) (break! x x') x')))) +(read-enable 'positions) + ; (define g (make-guardian)) ; (read-hash-extend #\g ; (lambda (c port)