Changeset 49d3128 for driver

Timestamp:

Nov 21, 2019, 3:53:39 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:

2909b515, c701332a

Parents:

1a69a90

Message:

cfa command now properly supports -fdiagnostics-color and -fno-diagnostics-color

File:

• driver/cc1.cc (modified) (3 diffs)

driver/cc1.cc ¶

@@ -335 +335 @@
         #endif // __DEBUG_H__
 
+        enum {
+                Color_Auto   = 0,
+                Color_Always = 1,
+                Color_Never  = 2,
+        } color_arg = Color_Auto;
+
+        const char * color_names[3] = { "--colors=auto", "--colors=always", "--colors=never" };
+
         // process all the arguments
 
@@ -341 +349 @@
                 if ( prefix( arg, "-" ) ) {
                         // strip inappropriate flags
+
+                        if ( prefix( arg, "-fdiagnostics-color=" ) ) {
+                                string choice = arg.substr(20);
+                                     if(choice == "always") color_arg = Color_Always;
+                                else if(choice == "never" ) color_arg = Color_Never;
+                                else if(choice == "auto"  ) color_arg = Color_Auto;
+                        } else if ( arg == "-fno-diagnostics-color" ) {
+                                color_arg = Color_Auto;
+                        }
 
                         if ( arg == "-quiet" || arg == "-version" || arg == "-fpreprocessed" ||
@@ -440 +457 @@
                         cargs[ncargs++] = cfa_cpp_out.c_str();
                 } // if
+
+                cargs[ncargs++] = color_names[color_arg];
+
                 cargs[ncargs] = nullptr;                                                // terminate argument list