Changeset 396ee0a for src/Common

Timestamp:

Feb 22, 2017, 2:42:11 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

131dbb3, 692de479

Parents:

0788b739 (diff), fc39193 (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

Location:

src/Common

Files:

• SemanticError.cc (modified) (2 diffs)
• SemanticError.h (modified) (2 diffs)
• utility.h (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -22 +22 @@
 #include "SemanticError.h"
 
+#include <unistd.h>
+
+inline const std::string& error_str() {
+        static std::string str = isatty( fileno(stderr) ) ? "\e[31merror:\e[39m " : "error: ";
+        return str;
+}
+
 SemanticError::SemanticError() {
 }
 
 SemanticError::SemanticError( std::string error ) {
-  append( error );
+        append( error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-  errors.splice( errors.end(), other.errors );
+        errors.splice( errors.end(), other.errors );
 }
 
 void SemanticError::append( const std::string & msg ) {
-  errors.push_back( std::string( "Error: ") + msg );
+        errors.emplace_back( error_str() + msg );
 }
 
@@ -42 +49 @@
 
 void SemanticError::print( std::ostream &os ) {
-        std::copy( errors.begin(), errors.end(), std::ostream_iterator< std::string >( os, "\n" ) );
+        using std::to_string;
+        for(auto err : errors) {
+                os << to_string( err.location ) << err.description << '\n';
+        }
+}
+
+void SemanticError::set_location( const CodeLocation& location ) {
+        errors.begin()->maybeSet( location );
 }
 

src/Common/SemanticError.h

@@ -23 +23 @@
 #include <iostream>
 
+#include "utility.h"
+
+struct error {
+        std::string description;
+        CodeLocation location;
+
+        error() = default;
+        error( const std::string& str ) : description( str ) {}
+
+        void maybeSet( const CodeLocation& location ) {
+                if( this->location.linenumber < 0 ) {
+                        this->location = location;
+                }
+        }
+};
+
 class SemanticError : public std::exception {
   public:
@@ -35 +51 @@
         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< std::string > errors;
+        std::list< error > errors;
 };
 

src/Common/utility.h

@@ -25 +25 @@
 #include <sstream>
 #include <string>
+
 #include <cassert>
-
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -303 +303 @@
         return group_iterate_t<Args...>(args...);
 }
+
+struct CodeLocation {
+        int linenumber;
+        std::string filename;
+
+        CodeLocation() 
+                : linenumber( -1 )
+                , filename("")
+        {}
+
+        CodeLocation( const char* filename, int lineno )
+                : linenumber( lineno )
+                , filename(filename ? filename : "")
+        {}
+};
+
+inline std::string to_string( const CodeLocation& location ) {
+        return location.linenumber >= 0 ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
+}
 #endif // _UTILITY_H