Changes in src/Common/SemanticError.h [d48e529:fd2debf]

File:

• src/Common/SemanticError.h (modified) (1 diff)

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 : Tue Aug 29 22:03:36 2017
-// Update Count     : 17
+// Last Modified On : Thu Jul 19 10:09:17 2018
+// Update Count     : 31
 //
 
 #pragma once
 
-#include <exception>                                                                    // for exception
-#include <iostream>                                                                             // for ostream
-#include <list>                                                                                 // for list
-#include <string>                                                                               // for string
-#include <unistd.h>                                                                             // for isatty
+#include "ErrorObjects.h"
+#include <cstring>
 
-#include "CodeLocation.h"                                                               // for CodeLocation, toString
+//-----------------------------------------------------------------------------
+// Errors
 
-struct error {
-        std::string description;
-        CodeLocation location;
+extern bool SemanticErrorThrow;
 
-        error() = default;
-        error( const std::string & str ) : description( str ) {}
+__attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
 
-        void maybeSet( const CodeLocation & location ) {
-                if( this->location.isUnset() ) {
-                        this->location = location;
-                }
-        }
+template< typename T >
+__attribute__((noreturn)) static inline void SemanticError( const T * 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 ) {
+        SemanticError( location, toString( error, obj ) );
+}
+
+//-----------------------------------------------------------------------------
+// Warnings
+
+enum class Severity {
+        Suppress,
+        Warn,
+        Error,
+        Critical
 };
 
-class SemanticError : public std::exception {
-  public:
-        SemanticError();
-        SemanticError( std::string error );
-        template< typename T > SemanticError( const std::string & error, const T * obj );
-        ~SemanticError() throw() {}
-
-        static inline const std::string & error_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
-                return str;
-        }
-
-        void append( SemanticError & other );
-        void append( const std::string & );
-        bool isEmpty() const;
-        void print( std::ostream & os );
-
-        void set_location( const CodeLocation & location );
-        // constructs an exception using the given message and the printed representation of the obj (T must have a print
-        // method)
-  private:
-        std::list< error > errors;
+struct WarningData {
+        const char * const name;
+        const char * const message;
+        const Severity default_severity;
 };
 
-template< typename T >
-SemanticError::SemanticError( const std::string & error, const T * obj ) {
-        append( toString( error, obj ) );
+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},
+        {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
+        {"superfluous-decl"       , "declaration does not allocate storage: %s"    , Severity::Warn},
+        {"gcc-attributes"         , "invalid attribute: %s"                        , Severity::Warn},
+};
+
+enum class Warning {
+        SelfAssignment,
+        RvalueToReferenceConversion,
+        BadQualifiersZeroOne,
+        AggrForwardDecl,
+        SuperfluousDecl,
+        GccAttributes,
+        NUMBER_OF_WARNINGS, // This MUST be the last warning
+};
+
+static_assert(
+        (sizeof(WarningFormats) / sizeof(WarningFormats[0])) == ((unsigned long)Warning::NUMBER_OF_WARNINGS),
+        "Each warning format should have a corresponding warning enum value"
+);
+
+#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)));
+
+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;
+}
+
+//-----------------------------------------------------------------------------
+// Helpers
+namespace ErrorHelpers {
+        const std::string & error_str();
+        const std::string & warning_str();
+        const std::string & bold_ttycode();
+        const std::string & reset_font_ttycode();
+
+        std::string make_bold( const std::string & str );
+
+        struct bold {};
+        std::ostream & operator<<(std::ostream & os, bold);
+
+        struct reset_font {};
+        std::ostream & operator<<(std::ostream & os, reset_font);
 }