Changeset c28afead for src/Common/SemanticError.h

Timestamp:

Apr 19, 2018, 6:11:07 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

8633f060

Parents:

9dc31c10 (diff), 60ba456 (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:

fix conflict

File:

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

src/Common/SemanticError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 18 16:28:16 2018
-// Update Count     : 18
+// Last Modified On : Thu Apr 19 17:52:03 2018
+// Update Count     : 19
 //
 
@@ -36 +36 @@
 // Warnings
 
-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",
+enum class Severity {
+        Suppress,
+        Warn,
+        Error,
+        Critical
+};
+
+struct WarningData {
+        const char * const name;
+        const char * const message;
+        mutable Severity 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},
+        {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
 };
 
@@ -54 +67 @@
 );
 
-// ## used here to allow empty __VA_ARGS__
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));