Changes in src/Common/SemanticError.h [4358c1e:9dc31c10]

File:

• src/Common/SemanticError.h (modified) (4 diffs)

src/Common/SemanticError.h

@@ -7 +7 @@
 // SemanticError.h --
 //
-// 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:23 2018
-// Update Count     : 30
+// Last Modified On : Wed Apr 18 16:28:16 2018
+// Update Count     : 18
 //
 
@@ -17 +17 @@
 
 #include "ErrorObjects.h"
-#include <cstring>
 
 //-----------------------------------------------------------------------------
 // Errors
-
-extern bool SemanticErrorThrow;
 
 __attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
@@ -39 +36 @@
 // Warnings
 
-enum class Severity {
-        Suppress,
-        Warn,
-        Error,
-        Critical
-};
-
-struct WarningData {
-        const char * const name;
-        const char * const message;
-        const Severity default_severity;
-};
-
-constexpr WarningData WarningFormats[] = {
-        {"self-assign"            , "self assignment of expression: %s"            , Severity::Warn},
-        {"reference-conversion"   , "rvalue to reference conversion of rvalue: %s" , Severity::Warn},
-        {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
+constexpr const char * const WarningFormats[] = {
+        "self assignment of expression: %s",
+        "rvalue to reference conversion of rvalue: %s",
+        "questionable use of type qualifier %s with %s",
 };
 
@@ -70 +54 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
+// ## used here to allow empty __VA_ARGS__
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));
 
-void SemanticWarning_SuppressAll   ();
-void SemanticWarning_EnableAll     ();
-void SemanticWarning_WarningAsError();
-void SemanticWarning_Set           (const char * const name, Severity s);
-
-// SKULLDUGGERY: cfa.cc is built before SemanticError.cc but needs this routine.
-static inline bool SemanticWarning_Exist(const char * const name) {
-        for ( const auto & w : WarningFormats ) {
-                if ( std::strcmp( name, w.name ) == 0 ) return true;
-        }
-        return false;
-}
 
 //-----------------------------------------------------------------------------