>From 6da4234d81aa861c75154506d5150f7360cf09db Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Tue, 13 May 2014 07:03:22 +1200 Subject: [PATCH] Generalize deprecation type warnings This is to avoid referring to them as "library procedures", since deprecated identifiers need not be procedures. --- scrutinizer.scm | 4 ++-- tests/scrutiny.expected | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scrutinizer.scm b/scrutinizer.scm index 77d9de2..a7a08cf 100644 --- a/scrutinizer.scm +++ b/scrutinizer.scm @@ -165,13 +165,13 @@ ((eq? a 'deprecated) (report loc - (sprintf "use of deprecated library procedure `~a'" id) ) + (sprintf "use of deprecated `~a'" id) ) '(*)) ((and (pair? a) (eq? (car a) 'deprecated)) (report loc (sprintf - "use of deprecated library procedure `~a' - consider using `~a' instead" + "use of deprecated `~a' - consider using `~a' instead" id (cadr a))) '(*)) (else (list a))))) diff --git a/tests/scrutiny.expected b/tests/scrutiny.expected index c4c21a2..ebba6a2 100644 --- a/tests/scrutiny.expected +++ b/tests/scrutiny.expected @@ -94,10 +94,10 @@ Warning: in toplevel procedure `foo#blabla': (scrutiny-tests.scm:133) in procedure call to `+', expected argument #2 of type `number', but was given an argument of type `symbol' Warning: at toplevel: - use of deprecated library procedure `deprecated-procedure' + use of deprecated `deprecated-procedure' Warning: at toplevel: - use of deprecated library procedure `another-deprecated-procedure' - consider using `replacement-procedure' instead + use of deprecated `another-deprecated-procedure' - consider using `replacement-procedure' instead Warning: at toplevel: (scrutiny-tests.scm:158) in procedure call to `apply1', expected argument #2 of type `(list-of number)', but was given an argument of type `(list symbol fixnum fixnum)' -- 1.7.10.4