Changeset 49d3128

Timestamp:

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

Files:

• driver/cc1.cc (modified) (3 diffs)
• src/main.cc (modified) (1 diff)

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
 

src/main.cc

@@ -431 +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
-        "generate line marks",                                                          // -L
-        "do not replace main",                                                          // -m
-        "do not generate line marks",                                           // -N
-        "do not read prelude",                                                          // -n
+        "diagnostic color: never, always, or auto.",          // -c
+        "wait for gdb to attach",                             // -g
+        "print help message",                                 // -h
+        "generate libcfa.c",                                  // -l
+        "generate line marks",                                // -L
+        "do not replace main",                                // -m
+        "do not generate line marks",                         // -N
+        "do not read prelude",                                // -n
         "generate prototypes for prelude functions",            // -p
-        "print",                                                                                        // -P
+        "print",                                              // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
         "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
-        "building cfa standard lib",                                                                    // -t
-        "",                                                                                                     // -w
-        "",                                                                                                     // -W
-        "",                                                                                                     // -D
+        "building cfa standard lib",                          // -t
+        "",                                                   // -w
+        "",                                                   // -W
+        "",                                                   // -D
 }; // description