Changeset 2909b515 for src/Common/SemanticError.cc

Timestamp:

Nov 21, 2019, 9:38:54 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0a25c34, f1397d14

Parents:

1c40091 (diff), 49d3128 (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) (1 diff)

src/Common/SemanticError.cc

@@ -149 +149 @@
 // Helpers
 namespace ErrorHelpers {
+        Colors colors = Colors::Auto;
+
+        static inline bool with_colors() {
+                return colors == Colors::Auto ? isatty( STDERR_FILENO ) : bool(colors);
+        }
+
         const std::string & error_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
+                static std::string str = with_colors() ? "\e[31merror:\e[39m " : "error: ";
                 return str;
         }
 
         const std::string & warning_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[95mwarning:\e[39m " : "warning: ";
+                static std::string str = with_colors() ? "\e[95mwarning:\e[39m " : "warning: ";
                 return str;
         }
 
         const std::string & bold_ttycode() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : "";
+                static std::string str = with_colors() ? "\e[1m" : "";
                 return str;
         }
 
         const std::string & reset_font_ttycode() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[0m" : "";
+                static std::string str = with_colors() ? "\e[0m" : "";
                 return str;
         }