Changeset b1f2007 for src/Common

Timestamp:

Dec 13, 2023, 9:17:13 AM (12 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

4c2fe47

Parents:

c40157e

Message:

first attempt at simplifying SemanticError? and its usage

Location:

src/Common

Files:

• SemanticError.cc (modified) (3 diffs)
• SemanticError.h (modified) (5 diffs)

src/Common/SemanticError.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  7 08:05:26 2018
-// Update Count     : 10
+// Last Modified On : Mon Dec 11 15:59:09 2023
+// Update Count     : 14
 //
 
@@ -70 +70 @@
 //-----------------------------------------------------------------------------
 // Semantic Error
+
 bool SemanticErrorThrow = false;
 
@@ -101 +102 @@
                 std::cerr << ErrorHelpers::bold() << err.location << ErrorHelpers::error_str() << ErrorHelpers::reset_font() << err.description << std::endl;
         }
+}
+
+void SemanticError( CodeLocation location, const char * fmt, ... ) {
+        char msg[2048];                                                                         // worst-case error-message buffer
+        va_list args;
+        va_start( args, fmt );
+        vsnprintf( msg, sizeof(msg), fmt, args );                       // always null terminated, but may be truncated
+        va_end( args );
+
+        SemanticErrorThrow = true;
+        throw SemanticErrorException( location, msg );          // convert msg to string
 }
 

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 : Mon Dec 11 21:54:22 2023
+// Update Count     : 54
 //
 
@@ -18 +18 @@
 #include "ErrorObjects.h"
 #include "AST/Node.hpp"
+#include "AST/ParseNode.hpp"
 #include <cstring>
 
@@ -25 +26 @@
 extern bool SemanticErrorThrow;
 
+__attribute__((noreturn, format(printf, 2, 3))) void SemanticError( CodeLocation location, const char fmt[], ... );
+
 __attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
 
-template< typename T >
-__attribute__((noreturn)) static inline void SemanticError( const T * obj, const std::string & 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 +55 @@
 
 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 +76 @@
         CppCopy,
         DeprecTraitSyntax,
-        NUMBER_OF_WARNINGS, // This MUST be the last warning
+        NUMBER_OF_WARNINGS, // MUST be the last warning
 };