Changes in src/Common/SemanticError.cc [3906301:138e29e]

File:

• src/Common/SemanticError.cc (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 );
 }