Changes in driver/cfa.cc [bec4d24:dfb7c96]

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  3 16:47:59 2018
-// Update Count     : 275
+// Last Modified On : Thu Aug 23 15:41:55 2018
+// Update Count     : 270
 //
 
@@ -43 +43 @@
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
 
-bool suffix( string arg, const char * args[], int & nargs ) {
+void suffix( string arg, const char * args[], int & nargs ) {
         //std::cerr << arg << std::endl;
         size_t dot = arg.find_last_of( "." );
         //std::cerr << dot << " " << (dot != string::npos ? arg.substr( dot + 1 ) : "fred" ) << std::endl;
-        if ( dot == string::npos ) return false;
+        if ( dot == string::npos ) return;
         string sx = arg.substr( dot + 1 );
         for ( int i = 0; i < NumSuffixes; i += 1 ) {
@@ -55 +55 @@
                         args[nargs] = "c";
                         nargs += 1;
-                        return true;
+                        return;
                 } // if
         } // for
-        return false;
 } // suffix
 
@@ -129 +128 @@
         #ifdef __DEBUG_H__
         cerr << "CFA:" << endl;
+        #endif // __DEBUG_H__
+
+        // process command-line arguments
+
         for ( int i = 1; i < argc; i += 1 ) {
-            cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-        } // for
-        #endif // __DEBUG_H__
-
-        // process command-line arguments
-
-        for ( int i = 1; i < argc; i += 1 ) {
+                #ifdef __DEBUG_H__
+                cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
+                #endif // __DEBUG_H__
                 arg = argv[i];                                                                  // convert to string value
+                #ifdef __DEBUG_H__
+                cerr << "arg:\"" << arg << "\"" << endl;
+                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // pass through arguments
@@ -200 +202 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
+                        } else if ( arg == "-x" ) {
+                                xflag = true;
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                i += 1;                                                                 // advance to argument
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=") + argv[i] ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
+                        } else if ( prefix( arg, "-x" ) ) {
+                                xflag = true;
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=") + arg.substr(2) ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
                         } else if ( arg == "-w" ) {
                                 args[nargs] = argv[i];                                  // pass the argument along
@@ -281 +298 @@
                         } // if
                 } else {
-                        bool cfa = suffix( arg, args, nargs );          // check suffix
-                        args[nargs] = argv[i];                                          // concatenate file
+                        bool opt = false;
+                        if ( ! xflag ) {
+                                suffix( arg, args, nargs );                             // check suffix
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=c") ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
+                                opt = true;
+                        } // if
+                        // concatenate other arguments
+                        args[nargs] = argv[i];
                         nargs += 1;
-                        if ( cfa ) {
+                        if ( opt ) {
                                 args[nargs] = "-x";
                                 nargs += 1;
                                 args[nargs] = "none";
                                 nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=none") ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
                         } // if
                         nonoptarg = true;
@@ -294 +320 @@
                 } // if
         } // for
-
-    args[nargs] = "-x";                                 // turn off language
-    nargs += 1;
-    args[nargs] = "none";
-    nargs += 1;
 
         #ifdef __x86_64__