Changes in src/Common/SemanticError.cc [4358c1e:6040e67d]

File:

• src/Common/SemanticError.cc (modified) (3 diffs)

src/Common/SemanticError.cc

@@ -7 +7 @@
 // SemanticError.cc --
 //
-// Author           : Thierry Delisle
+// Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 16 15:01:20 2018
-// Update Count     : 9
+// Last Modified On : Tue Aug 29 18:17:35 2017
+// Update Count     : 3
 //
 
 #include <cstdarg>
 #include <cstdio>                                                                               // for fileno, stderr
-#include <cstring>
 #include <unistd.h>                                                                             // for isatty
 #include <iostream>                                                                             // for basic_ostream, operator<<, ostream
 #include <list>                                                                                 // for list, _List_iterator
 #include <string>                                                                               // for string, operator<<, operator+, to_string
-#include <vector>
 
 #include "Common/utility.h"                                                             // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
-
-//-----------------------------------------------------------------------------
-// Severity Handling
-std::vector<Severity> & get_severities() {
-        static std::vector<Severity> severities;
-        if(severities.empty()) {
-                severities.reserve((size_t)Warning::NUMBER_OF_WARNINGS);
-                for ( const auto w : WarningFormats ) {
-                        severities.push_back( w.default_severity );
-                } // for
-        }
-        return severities;
-}
-
-void SemanticWarning_SuppressAll() {
-        for( auto & s : get_severities() ) {
-                s = Severity::Suppress;
-        }
-}
-
-void SemanticWarning_EnableAll() {
-        for( auto & s : get_severities() ) {
-                s = Severity::Warn;
-        }
-}
-
-void SemanticWarning_WarningAsError() {
-        for( auto & s : get_severities() ) {
-                if(s == Severity::Warn) s = Severity::Error;
-        }
-}
-
-void SemanticWarning_Set(const char * const name, Severity s) {
-        size_t idx = 0;
-        for ( const auto & w : WarningFormats ) {
-                if ( std::strcmp( name, w.name ) == 0 ) {
-                        get_severities()[idx] = s;
-                        break;
-                }
-                idx++;
-        }
-}
-
-//-----------------------------------------------------------------------------
-// Semantic Error
-bool SemanticErrorThrow = false;
 
 SemanticErrorException::SemanticErrorException( CodeLocation location, std::string error ) {
@@ -96 +48 @@
 
 void SemanticError( CodeLocation location, std::string error ) {
-        SemanticErrorThrow = true;
         throw SemanticErrorException(location, error);
 }
@@ -118 +69 @@
 
 void SemanticWarningImpl( CodeLocation location, Warning warning, const char * const fmt, ... ) {
-        Severity severity = get_severities()[(int)warning];
+        Severity severity = WarningFormats[(int)warning].severity;
         switch(severity) {
         case Severity::Suppress :