Changeset d55d7a6 for src/Common

Timestamp:

Feb 15, 2018, 3:58:56 PM (8 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:

75e3cb2

Parents:

d27e340

Message:

Massive change to errors to enable warnings

Location:

src/Common

Files:

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

src/Common/PassVisitor.impl.h

@@ -77 +77 @@
                         maybeAccept_impl( *i, visitor );
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -104 +103 @@
                         maybeMutate_impl( *i, mutator );
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -134 +132 @@
                         }
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -163 +160 @@
                         } // if
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try
@@ -200 +196 @@
 
                 } catch ( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }

src/Common/SemanticError.cc

@@ -23 +23 @@
 #include "SemanticError.h"
 
-SemanticError::SemanticError() {
-}
-
-SemanticError::SemanticError( std::string error ) {
-        append( error );
+SemanticError::SemanticError( CodeLocation location, std::string error ) {
+        append( location, error );
 }
 
@@ -34 +31 @@
 }
 
-void SemanticError::append( const std::string & msg ) {
-        errors.emplace_back( error_str() + msg );
+void SemanticError::append( CodeLocation location, const std::string & msg ) {
+        errors.emplace_back( location, msg );
 }
 
@@ -42 +39 @@
 }
 
-void SemanticError::print( std::ostream &os ) {
+void SemanticError::print() {
         using std::to_string;
         for( auto err : errors ) {
-                os << err.location << err.description << std::endl;
+                std::cerr << bold() << err.location << error_str() << reset_font() << err.description << std::endl;
         }
 }
 
-void SemanticError::set_location( const CodeLocation& location ) {
-        errors.begin()->maybeSet( location );
+SemanticWarning::SemanticWarning( CodeLocation location, std::string msg ) {
+        std::cerr << bold() << location << warning_str() << reset_font() << msg << std::endl;
 }
 

src/Common/SemanticError.h

@@ -24 +24 @@
 #include "CodeLocation.h"                                                               // for CodeLocation, toString
 
+//-----------------------------------------------------------------------------
+// Errors
 struct error {
+        CodeLocation location;
         std::string description;
-        CodeLocation location;
 
         error() = default;
-        error( const std::string & str ) : description( str ) {}
-
-        void maybeSet( const CodeLocation & location ) {
-                if( this->location.isUnset() ) {
-                        this->location = location;
-                }
-        }
+        error( CodeLocation loc, const std::string & str ) : location( loc ), description( str ) {}
 };
 
 class SemanticError : public std::exception {
   public:
-        SemanticError();
-        SemanticError( std::string error );
-        template< typename T > SemanticError( const std::string & error, const T * obj );
+        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() {
@@ -51 +50 @@
 
         void append( SemanticError & other );
-        void append( const std::string & );
+        void append( CodeLocation location, 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)
+        void print();
   private:
         std::list< error > errors;
@@ -63 +58 @@
 
 template< typename T >
-SemanticError::SemanticError( const std::string & error, const T * obj ) {
-        append( toString( error, obj ) );
+SemanticError::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 ) )
+{}
+
+//-----------------------------------------------------------------------------
+// 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);
+
+        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 ) )
+{}
+
+template< typename T >
+SemanticWarning::SemanticWarning( CodeLocation location, const T * obj, const std::string & error )
+        : SemanticWarning( location, toString( error, obj ) )
+{}
+
+//-----------------------------------------------------------------------------
+// Helpers
+static inline const std::string & bold_ttycode() {
+        static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : "";
+        return str;
+}
+
+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;
 }