Changeset 4f5a8a2

Timestamp:

Aug 10, 2019, 9:39:08 AM (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:

7d01cf44, b3976bf, ef46abb

Parents:

98399b2

Message:

clean up code for -x from cfa

File:

• driver/cfa.cc (modified) (6 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  9 18:51:44 2019
-// Update Count     : 309
+// Last Modified On : Sat Aug 10 08:44:15 2019
+// Update Count     : 311
 //
 
@@ -96 +96 @@
         string compiler_name;                                                           // name of C compiler
 
-        bool suffixp = false;                                                           // -x flag
+        bool x_flag = false;                                                            // -x flag
         bool nonoptarg = false;                                                         // indicates non-option argument specified
         bool link = true;                                                                       // linking as well as compiling
@@ -191 +191 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
-                        } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
-                                std_flag = true;                                                // -std=XX provided
-                                args[nargs] = argv[i];                                  // pass the argument along
-                                nargs += 1;
-                        } else if ( arg == "-w" ) {
-                                args[nargs] = argv[i];                                  // pass the argument along
-                                nargs += 1;
-                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
-                                nargs += 1;
                         } else if ( prefix( arg, "-x" ) ) {                     // file suffix ?
                                 string lang;
@@ -213 +204 @@
                                         lang = arg.substr( 2 );
                                 } // if
-                                suffixp = lang != "none";
+                                x_flag = lang != "none";
+                        } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
+                                std_flag = true;                                                // -std=XX provided
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                        } else if ( arg == "-w" ) {
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+                                nargs += 1;
                         } else if ( prefix( arg, "-W" ) ) {                     // check before next tests
                                 if ( arg == "-Werror" || arg == "-Wall" ) {
@@ -291 +291 @@
                 } else {
                         bool cfa = suffix( arg );                                       // check suffix
-                        if ( ! suffixp && cfa ) {                                       // no explicit suffix and cfa suffix ?
+                        if ( ! x_flag && cfa ) {                                        // no explicit suffix and cfa suffix ?
                                 args[nargs] = "-x";
                                 nargs += 1;
@@ -299 +299 @@
                         args[nargs] = argv[i];                                          // concatenate file
                         nargs += 1;
-                        if ( ! suffixp && cfa ) {                                       // no explicit suffix and cfa suffix ?
+                        if ( ! x_flag && cfa ) {                                        // no explicit suffix and cfa suffix ?
                                 args[nargs] = "-x";
                                 nargs += 1;