Changeset 1a69a90

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

Files:

• Common/SemanticError.cc (modified) (1 diff)
• Common/SemanticError.h (modified) (1 diff)
• main.cc (modified) (5 diffs)

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();

src/main.cc

@@ -407 +407 @@
 
 
-static const char optstring[] = ":hlLmNnpP:S:tgwW:D:";
+static const char optstring[] = ":c:ghlLmNnpP:S:twW:D:";
 
 enum { PreludeDir = 128 };
 static struct option long_opts[] = {
+        { "colors", required_argument, nullptr, 'c' },
+        { "gdb", no_argument, nullptr, 'g' },
         { "help", no_argument, nullptr, 'h' },
         { "libcfa", no_argument, nullptr, 'l' },
@@ -422 +424 @@
         { "statistics", required_argument, nullptr, 'S' },
         { "tree", no_argument, nullptr, 't' },
-        { "gdb", no_argument, nullptr, 'g' },
         { "", no_argument, nullptr, 0 },                                        // -w
         { "", no_argument, nullptr, 0 },                                        // -W
@@ -430 +431 @@
 
 static const char * description[] = {
+        "Use color in diagnostics. WHEN is ‘never’, ‘always’, or ‘auto’.",// -c
+        "wait for gdb to attach",                                                                       // -g
         "print help message",                                                           // -h
         "generate libcfa.c",                                                            // -l
@@ -441 +444 @@
         "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
         "building cfa standard lib",                                                                    // -t
-        "wait for gdb to attach",                                                                       // -g
         "",                                                                                                     // -w
         "",                                                                                                     // -W
@@ -512 +514 @@
         while ( (c = getopt_long( argc, argv, optstring, long_opts, nullptr )) != -1 ) {
                 switch ( c ) {
+                  case 'c':                                                                             // diagnostic colors
+                        if ( strcmp( optarg, "always" ) == 0 ) {
+                                ErrorHelpers::colors = ErrorHelpers::Colors::Always;
+                        } else if ( strcmp( optarg, "never" ) == 0 ) {
+                                ErrorHelpers::colors = ErrorHelpers::Colors::Never;
+                        } else if ( strcmp( optarg, "auto" ) == 0 ) {
+                                ErrorHelpers::colors = ErrorHelpers::Colors::Auto;
+                        } // if
+                        break;
                   case 'h':                                                                             // help message
                         usage( argv );                                                          // no return