Changeset b3f252a for src/Common/SemanticError.cc

Timestamp:

Sep 7, 2017, 10:36:35 AM (7 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:

e0886db

Parents:

871cdb4 (diff), 416cc86 (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.cc (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:21:25 2015
-// Update Count     : 1
+// Last Modified On : Tue Aug 29 18:17:35 2017
+// Update Count     : 3
 //
 
-#include <cstdio>            // for fileno, stderr
-#include <unistd.h>          // for isatty
-#include <iostream>          // for basic_ostream, operator<<, ostream
-#include <list>              // for list, _List_iterator
-#include <string>            // for string, operator<<, operator+, to_string
+#include <cstdio>                                                                               // for fileno, stderr
+#include <unistd.h>                                                                             // for isatty
+#include <iostream>                                                                             // for basic_ostream, operator<<, ostream
+#include <list>                                                                                 // for list, _List_iterator
+#include <string>                                                                               // for string, operator<<, operator+, to_string
 
-#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
+#include "Common/utility.h"                                                             // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
-
-inline const std::string& error_str() {
-        static std::string str = isatty( fileno(stderr) ) ? "\e[31merror:\e[39m " : "error: ";
-        return str;
-}
 
 SemanticError::SemanticError() {
@@ -49 +44 @@
 void SemanticError::print( std::ostream &os ) {
         using std::to_string;
-        for(auto err : errors) {
-                os << to_string( err.location ) << err.description << '\n';
+        for( auto err : errors ) {
+                os << to_string( err.location ) << err.description << std::endl;
         }
 }