Changeset dcbb03b for src/Common/SemanticError.h

Timestamp:

Mar 1, 2018, 9:29:03 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

1f37ed02

Parents:

b002261 (diff), 446ffa3 (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) (1 diff)

src/Common/SemanticError.h

@@ -16 +16 @@
 #pragma once
 
-#include <exception>                                                                    // for exception
-#include <iostream>                                                                             // for ostream
-#include <list>                                                                                 // for list
-#include <string>                                                                               // for string
-#include <unistd.h>                                                                             // for isatty
-
-#include "CodeLocation.h"                                                               // for CodeLocation, toString
+#include "ErrorObjects.h"
 
 //-----------------------------------------------------------------------------
 // Errors
-struct error {
-        CodeLocation location;
-        std::string description;
 
-        error() = default;
-        error( CodeLocation loc, const std::string & str ) : location( loc ), description( str ) {}
-};
-
-class SemanticError : public std::exception {
-  public:
-        SemanticError() = default;
-        SemanticError( CodeLocation location, std::string error );
-        ~SemanticError() throw() {}
-
-        // constructs an exception using the given message and the printed representation of the obj (T must have a print method)
-        template< typename T > SemanticError(const T * obj, const std::string & error);
-        template< typename T > SemanticError( CodeLocation location, const T * obj, const std::string & error);
-
-        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( CodeLocation location, const std::string & );
-        bool isEmpty() const;
-        void print();
-  private:
-        std::list< error > errors;
-};
+__attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
 
 template< typename T >
-SemanticError::SemanticError( const T * obj, const std::string & error )
-        : SemanticError( obj->location, toString( error, obj ) )
-{}
+__attribute__((noreturn)) static inline void SemanticError( const T * obj, const std::string & error ) {
+        SemanticError( obj->location, toString( error, obj ) );
+}
 
 template< typename T >
-SemanticError::SemanticError( CodeLocation location, const T * obj, const std::string & error )
-        : SemanticError( location, toString( error, obj ) )
-{}
+__attribute__((noreturn)) static inline void SemanticError( CodeLocation location, const T * obj, const std::string & error ) {
+        SemanticError( location, toString( error, obj ) );
+}
 
 //-----------------------------------------------------------------------------
 // Warnings
-class SemanticWarning {
-  public:
-        SemanticWarning( CodeLocation location, std::string error );
-        ~SemanticWarning() throw() {}
 
-        // constructs an exception using the given message and the printed representation of the obj (T must have a print method)
-        template< typename T > SemanticWarning(const T * obj, const std::string & error);
-        template< typename T > SemanticWarning( CodeLocation location, const T * obj, const std::string & error);
+constexpr const char * const WarningFormats[] = {
 
-        static inline const std::string & warning_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[95mwarning:\e[39m " : "warning: ";
-                return str;
-        }
-
-  private:
 };
 
-template< typename T >
-SemanticWarning::SemanticWarning( const T * obj, const std::string & error )
-        : SemanticWarning( obj->location, toString( error, obj ) )
-{}
+enum class Warning {
+        NUMBER_OF_WARNINGS, //This MUST be the last warning
+};
 
-template< typename T >
-SemanticWarning::SemanticWarning( CodeLocation location, const T * obj, const std::string & error )
-        : SemanticWarning( location, toString( error, obj ) )
-{}
+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[id], __VA_ARGS__)
+
+void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));
+
 
 //-----------------------------------------------------------------------------
 // Helpers
-static inline const std::string & bold_ttycode() {
-        static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : "";
-        return str;
+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);
 }
 
-static inline const std::string & reset_font_ttycode() {
-        static std::string str = isatty( STDERR_FILENO ) ? "\e[0m" : "";
-        return str;
-}
 
-static inline std::string make_bold( const std::string & str ) {
-        return bold_ttycode() + str + reset_font_ttycode();
-}
 
-struct bold {};
-static inline std::ostream & operator<<(std::ostream & os, bold) {
-        os << bold_ttycode();
-        return os;
-}
-
-struct reset_font {};
-static inline std::ostream & operator<<(std::ostream & os, reset_font) {
-        os << reset_font_ttycode();
-        return os;
-}
 
 // Local Variables: //