Changeset 1a69a90 for src/Common

Timestamp:

Nov 21, 2019, 1:03:17 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

49d3128

Parents:

665f432

Message:

Added --colors command line arguments to have more control on whether or not to print errors with colors

Location:

src/Common

Files:

• SemanticError.cc (modified) (1 diff)
• SemanticError.h (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;
         }

src/Common/SemanticError.h ¶

@@ -97 +97 @@
 // Helpers
 namespace ErrorHelpers {
+        enum class Colors {
+                Never = false,
+                Always = true,
+                Auto,
+        };
+
+        extern Colors colors;
+
         const std::string & error_str();
         const std::string & warning_str();