From: Daniel Kochmański <daniel@turtleware.eu>
Date: Thu, 1 Oct 2015 09:03:46 +0000 (+0200)
Subject: cmp: remove deprecated verbosity variables
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=03045d98ae83b585bdc8b4c3db7a0686d71ee947;p=ecl.git

cmp: remove deprecated verbosity variables

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
---

diff --git a/CHANGELOG b/CHANGELOG
index 3d6cd8e..82270ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,9 @@
    - When cl-truename encounters a broken symlink it returns it's path
      instead of signalling a file-error
 
+   - Deprecated variables has been removed
+     c::*suppress-compiler-warnings*, c::*suppress-compiler-notes*
+
 ** Enhancements:
 
    - Added code walker (present as *feature* :walker)
diff --git a/src/cmp/cmpglobals.lsp b/src/cmp/cmpglobals.lsp
index 54567bd..b2cea3e 100644
--- a/src/cmp/cmpglobals.lsp
+++ b/src/cmp/cmpglobals.lsp
@@ -66,9 +66,6 @@ running the compiler. It may be updated by running ")
   #+ecl-min 'compiler-debug-note #-ecl-min 'compiler-note
   "A type denoting which compiler messages and conditions are _not_ displayed.")
 
-(defvar *suppress-compiler-notes* nil) ; Deprecated
-(defvar *suppress-compiler-warnings* nil) ; Deprecated
-
 (defvar *compiler-break-enable* nil)
 
 (defvar *compiler-in-use* nil)
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 9f7e742..dd422e5 100755
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -5,6 +5,7 @@
 ;;;;  Copyright (c) 1984, Taiichi Yuasa and Masami Hagiya.
 ;;;;  Copyright (c) 1990, Giuseppe Attardi.
 ;;;;  Copyright (c) 2001, Juan Jose Garcia Ripoll
+;;;;  Copyright (c) 2015, Daniel Kochmański
 ;;;;
 ;;;;    This program is free software; you can redistribute it and/or
 ;;;;    modify it under the terms of the GNU Library General Public
@@ -395,14 +396,6 @@ filesystem or in the database of ASDF modules."
                 &aux
                 (*suppress-compiler-messages* (or *suppress-compiler-messages*
                                                   (not *compile-verbose*))))
-  ;; Deprecated, to be removed in next release
-  (when *suppress-compiler-notes*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-note)))
-  (when *suppress-compiler-warnings*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-warning)))
-
   ;;
   ;; The epilogue-code can be either a string made of C code, or a
   ;; lisp form.  In the latter case we add some additional C code to
@@ -579,13 +572,6 @@ specifies whether to load the generated fasl file after compilation.  The
 :O-FILE, :C-FILE, :H-FILE, and :DATA-FILE keyword parameters allow you to
 control the intermediate files generated by the ECL compiler.If the file was
 compiled successfully, returns the pathname of the compiled file"
-  ;; Deprecated, to be removed in next release
-  (when *suppress-compiler-notes*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-note)))
-  (when *suppress-compiler-warnings*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-warning)))
 
   #-dlopen
   (unless system-p
@@ -728,14 +714,6 @@ files, whose filenames begin with \"gazonk\", which are automatically deleted
 after compilation."
   (unless (symbolp name) (error "~s is not a symbol." name))
 
-  ;; Deprecated, to be removed in next release
-  (when *suppress-compiler-notes*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-note)))
-  (when *suppress-compiler-warnings*
-    (setf *suppress-compiler-messages*
-          `(or ,*suppress-compiler-messages* compiler-warning)))
-
   (cond ((and supplied-p def)
          (when (functionp def)
            (unless (function-lambda-expression def)
diff --git a/src/tests/regressions/doit.lsp b/src/tests/regressions/doit.lsp
index ed53406..9deacb8 100644
--- a/src/tests/regressions/doit.lsp
+++ b/src/tests/regressions/doit.lsp
@@ -14,8 +14,6 @@
 (require 'rt)
 
 #+ecl (compile nil '(lambda () nil))
-#+(and ecl (not ecl-bytecmp))
-(setq c::*suppress-compiler-warnings* t c::*suppress-compiler-notes* t)
 
 (setq *load-verbose* nil
       *load-print* nil
diff --git a/src/tests/regressions/tools.lsp b/src/tests/regressions/tools.lsp
index 74831b2..f0e983b 100644
--- a/src/tests/regressions/tools.lsp
+++ b/src/tests/regressions/tools.lsp
@@ -35,11 +35,7 @@ evaluated. The output is stored in a string and output as a second value."
              (with-output-to-string (*standard-output*)
                (let ((*error-output* *standard-output*)
                      (*compile-verbose* t)
-                     (*compile-print* t)
-                     #-ecl-bytecmp
-                     (c::*suppress-compiler-warnings* nil)
-                     #-ecl-bytecmp
-                     (c::*suppress-compiler-notes* nil))
+                     (*compile-print* t))
                  (setf ok (compile-file ,filename ,@compiler-args))))))
        (values ok output))))