Changes in / [61323a7:3265399]

Location:

src/Common

Files:

• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -68 +68 @@
 }
 
-void SemanticWarningImpl( CodeLocation location, Warning warning, const char * const fmt, ... ) {
-        Severity severity = WarningFormats[(int)warning].severity;
-        switch(severity) {
-        case Severity::Suppress :
-                break;
-        case Severity::Warn :
-                {
-                        va_list args;
-                        va_start(args, fmt);
-                        std::string msg = fmtToString( fmt, args );
-                        va_end(args);
-                        std::cerr << ErrorHelpers::bold() << location << ErrorHelpers::warning_str() << ErrorHelpers::reset_font() << msg << std::endl;
-                }
-                break;
-        case Severity::Error :
-                {
-                        va_list args;
-                        va_start(args, fmt);
-                        std::string msg = fmtToString( fmt, args );
-                        va_end(args);
-                        SemanticError(location, msg);
-                }
-                break;
-        case Severity::Critical :
-                assertf(false, "Critical errors not implemented yet");
-                break;
-        }
+void SemanticWarningImpl( CodeLocation location, Warning, const char * const fmt, ... ) {
+        va_list args;
+        va_start(args, fmt);
+        std::string msg = fmtToString( fmt, args );
+        va_end(args);
+        std::cerr << ErrorHelpers::bold() << location << ErrorHelpers::warning_str() << ErrorHelpers::reset_font() << msg << std::endl;
 }
 

src/Common/SemanticError.h

@@ -36 +36 @@
 // Warnings
 
-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},
+constexpr const char * const WarningFormats[] = {
+        "self assignment of expression: %s",
+        "rvalue to reference conversion of rvalue: %s",
 };
 
@@ -65 +52 @@
 );
 
-#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)));