From 10486e76d527cf53786664ecee164d0398b029c9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 8 Apr 2018 07:40:21 -0700 Subject: trace: refer usr:catch operator rather than sys:catch. * share/txr/stdlib/trace.tl (sys:trace, sys:untrace): Now that library code is being read in the sys package, catch refers to the sys:catch special form; we want the usr:catch macro here. --- share/txr/stdlib/trace.tl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/txr/stdlib/trace.tl b/share/txr/stdlib/trace.tl index 4815ab4f..ca7a78c2 100644 --- a/share/txr/stdlib/trace.tl +++ b/share/txr/stdlib/trace.tl @@ -61,7 +61,7 @@ (n [mapcar sys:trace-canonicalize-name names])) (unless [sys:*trace-hash* n] (when (neq n orig-n) - (catch + (usr:catch (throwf 'warning "~s: ~s is actually ~s: tracing that instead" 'trace orig-n n) (continue ()))) @@ -89,7 +89,7 @@ (let ((prev (del [sys:*trace-hash* name]))) (when prev (when (neq name-orig name) - (catch + (usr:catch (throwf 'warning "~s: ~s is actually ~s: untracing that instead" 'trace name-orig name) (continue ()))) @@ -104,7 +104,7 @@ (defun sys:trace-redefine-check (orig-name) (let ((name (sys:trace-canonicalize-name orig-name))) (when [sys:*trace-hash* name] - (catch + (usr:catch (cond ((neq name orig-name) (throwf 'warning "~!~s won't be traced, though it overrides\n\ -- cgit v1.2.3