Changeset ff29f08 for src/Common/SemanticError.h

Timestamp:

May 18, 2018, 2:09:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

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

src/Common/SemanticError.h

@@ -7 +7 @@
 // SemanticError.h --
 //
-// Author           : Richard C. Bilson
+// Author           : Thierry Delisle
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 19 17:52:03 2018
-// Update Count     : 19
+// Last Modified On : Wed May 16 15:01:23 2018
+// Update Count     : 30
 //
 
@@ -17 +17 @@
 
 #include "ErrorObjects.h"
+#include <cstring>
 
 //-----------------------------------------------------------------------------
 // Errors
+
+extern bool SemanticErrorThrow;
 
 __attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
@@ -46 +49 @@
         const char * const name;
         const char * const message;
-        mutable Severity severity;
+        const Severity default_severity;
 };
 
-constexpr const WarningData WarningFormats[] = {
-        {"self-assign"         , "self assignment of expression: %s"           , Severity::Warn},
-        {"reference-conversion", "rvalue to reference conversion of rvalue: %s", Severity::Warn},
+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},
 };
@@ -71 +74 @@
 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;
+}
 
 //-----------------------------------------------------------------------------