Changeset 5546eee4 for src/Common/SemanticError.h

Timestamp:

Dec 16, 2023, 1:01:44 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/SemanticError.h (modified) (6 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 : Sat Feb 25 12:01:31 2023
-// Update Count     : 37
+// Last Modified On : Thu Dec 14 13:48:07 2023
+// Update Count     : 72
 //
 
@@ -18 +18 @@
 #include "ErrorObjects.h"
 #include "AST/Node.hpp"
+#include "AST/ParseNode.hpp"
 #include <cstring>
 
@@ -25 +26 @@
 extern bool SemanticErrorThrow;
 
-__attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
+__attribute__((noreturn, format(printf, 2, 3))) void SemanticError( CodeLocation location, const char fmt[], ... );
 
-template< typename T >
-__attribute__((noreturn)) static inline void SemanticError( const T * obj, const std::string & error ) {
+__attribute__((noreturn)) static inline void SemanticError( CodeLocation location, std::string error ) {
+        SemanticErrorThrow = true;
+        throw SemanticErrorException( location, error );
+}
+
+__attribute__((noreturn)) static inline void SemanticError( const ast::ParseNode * obj, const std::string & error ) {
         SemanticError( obj->location, toString( error, obj ) );
 }
 
-template< typename T >
-__attribute__((noreturn)) static inline void SemanticError( CodeLocation location, const T * obj, const std::string & error ) {
+__attribute__((noreturn)) static inline void SemanticError( CodeLocation location, const ast::Node * obj, const std::string & error ) {
         SemanticError( location, toString( error, obj ) );
 }
@@ -54 +58 @@
 
 constexpr WarningData WarningFormats[] = {
-        {"self-assign"              , Severity::Warn    , "self assignment of expression: %s"                          },
-        {"reference-conversion"     , Severity::Warn    , "rvalue to reference conversion of rvalue: %s"               },
-        {"qualifiers-zero_t-one_t"  , Severity::Warn    , "questionable use of type qualifier(s) with %s"              },
-        {"aggregate-forward-decl"   , Severity::Warn    , "forward declaration of nested aggregate: %s"                },
-        {"superfluous-decl"         , Severity::Warn    , "declaration does not allocate storage: %s"                  },
-        {"superfluous-else"         , Severity::Warn    , "else clause never executed for empty loop conditional"      },
-        {"gcc-attributes"           , Severity::Warn    , "invalid attribute: %s"                                      },
-        {"c++-like-copy"            , Severity::Warn    , "Constructor from reference is not a valid copy constructor" },
-        {"depreciated-trait-syntax" , Severity::Warn    , "trait type-parameters are now specified using the forall clause" },
+        {"self-assign"              , Severity::Warn, "self assignment of expression: %s"                          },
+        {"reference-conversion"     , Severity::Warn, "rvalue to reference conversion of rvalue: %s"               },
+        {"qualifiers-zero_t-one_t"  , Severity::Warn, "questionable use of type qualifier(s) with %s"              },
+        {"aggregate-forward-decl"   , Severity::Warn, "forward declaration of nested aggregate: %s"                },
+        {"superfluous-decl"         , Severity::Warn, "declaration does not allocate storage: %s"                  },
+        {"superfluous-else"         , Severity::Warn, "else clause never executed for empty loop conditional"      },
+        {"gcc-attributes"           , Severity::Warn, "invalid attribute: %s"                                      },
+        {"c++-like-copy"            , Severity::Warn, "Constructor from reference is not a valid copy constructor" },
+        {"depreciated-trait-syntax" , Severity::Warn, "trait type-parameters are now specified using the forall clause" },
 };
 
@@ -75 +79 @@
         CppCopy,
         DeprecTraitSyntax,
-        NUMBER_OF_WARNINGS, // This MUST be the last warning
+        NUMBER_OF_WARNINGS, // MUST be last warning
 };
 
@@ -83 +87 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, ##__VA_ARGS__)
+void SemanticWarning( CodeLocation loc, Warning warn, ... );
 
-void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));
-
-void SemanticWarning_SuppressAll   ();
-void SemanticWarning_EnableAll     ();
+void SemanticWarning_SuppressAll();
+void SemanticWarning_EnableAll();
 void SemanticWarning_WarningAsError();
-void SemanticWarning_Set           (const char * const name, Severity s);
+void SemanticWarning_Set(const char * const name, Severity s);
 
 // SKULLDUGGERY: cfa.cc is built before SemanticError.cc but needs this routine.