Changeset b740f0b for driver/cfa.cc

Timestamp:

Aug 22, 2018, 9:39:45 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d6f4488

Parents:

92f413c

Message:

remove double trialing slash for file names, fix -E flag, clean up suffix handling

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 10 18:17:58 2018
-// Update Count     : 259
+// Last Modified On : Wed Aug 22 17:26:19 2018
+// Update Count     : 265
 //
 
@@ -43 +43 @@
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
 
-bool suffix( string arg ) {
+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 ) {
-                if ( sx == suffixes[i] ) return true;
+                if ( sx == suffixes[i] ) {
+                        args[nargs] = "-x";
+                        nargs += 1;
+                        args[nargs] = "c";
+                        nargs += 1;
+                        return;
+                } // if
         } // for
-        return false;
 } // suffix
 
@@ -294 +299 @@
                 } else {
                         bool opt = false;
-                        if ( ! xflag && suffix( arg ) ) {
-                                args[nargs] = "-x";
-                                nargs += 1;
-                                args[nargs] = "c";
-                                nargs += 1;
+                        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;
@@ -342 +344 @@
                 nargs += 1;
                 if ( ! noincstd_flag ) {                                                        // do not use during build
-                        args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+                        args[nargs] = "-I" CFA_INCDIR "stdhdr";
                         nargs += 1;
                 } // if
-                args[nargs] = "-I" CFA_INCDIR "/concurrency";
-                nargs += 1;
-                args[nargs] = "-I" CFA_INCDIR "/containers";
+                args[nargs] = "-I" CFA_INCDIR "concurrency";
+                nargs += 1;
+                args[nargs] = "-I" CFA_INCDIR "containers";
                 nargs += 1;
         } else {
@@ -470 +472 @@
 
         if ( Bprefix.length() == 0 ) {
-                Bprefix = !intree ? installlibdir : srcdriverdir;
+                Bprefix = ! intree ? installlibdir : srcdriverdir;
+                if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
                 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
                 nargs += 1;
@@ -504 +507 @@
                 args[nargs] = "-D__int8_t_defined";                             // prevent gcc type-size attributes
                 nargs += 1;
-                args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
+                args[nargs] = ( *new string( string("-B") + Bprefix ) ).c_str();
                 nargs += 1;
                 args[nargs] = "-lm";