- Timestamp:
- Aug 12, 2019, 11:05:36 AM (6 years ago)
- 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:
- dee1f89
- Parents:
- cc4218f (diff), 4f5a8a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- driver
- Files:
-
- 2 edited
-
Makefile.in (modified) (2 diffs)
-
cfa.cc (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
driver/Makefile.in
rcc4218f rb3976bf 218 218 CYGPATH_W = @CYGPATH_W@ 219 219 DEFS = @DEFS@ 220 DEMANGLER = @DEMANGLER@ 220 221 DEPDIR = @DEPDIR@ 221 222 DLLTOOL = @DLLTOOL@ … … 243 244 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@ 244 245 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@ 246 LIBDEMANGLE = @LIBDEMANGLE@ 245 247 LIBOBJS = @LIBOBJS@ 246 248 LIBS = @LIBS@ -
driver/cfa.cc
rcc4218f rb3976bf 10 10 // Created On : Tue Aug 20 13:44:49 2002 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : S un Feb 10 08:28:09201913 // Update Count : 28112 // Last Modified On : Sat Aug 10 08:44:15 2019 13 // Update Count : 311 14 14 // 15 15 … … 20 20 #include <string> // STL version 21 21 #include <string.h> // strcmp 22 #include <algorithm> // find 22 23 23 24 #include <sys/types.h> … … 26 27 #include "Common/SemanticError.h" 27 28 #include "config.h" // configure info 29 28 30 29 31 using std::cerr; … … 40 42 } // prefix 41 43 42 enum { NumSuffixes = 2 }; 43 const string suffixes[NumSuffixes] = { "cfa", "hfa", }; 44 45 bool suffix( string arg, const char * args[], int & nargs ) { 44 bool suffix( string arg ) { 45 enum { NumSuffixes = 3 }; 46 static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" }; 46 47 //std::cerr << arg << std::endl; 47 48 size_t dot = arg.find_last_of( "." ); 48 49 //std::cerr << dot << " " << (dot != string::npos ? arg.substr( dot + 1 ) : "fred" ) << std::endl; 49 50 if ( dot == string::npos ) return false; 50 string sx = arg.substr( dot + 1 ); 51 for ( int i = 0; i < NumSuffixes; i += 1 ) { 52 if ( sx == suffixes[i] ) { 53 args[nargs] = "-x"; 54 nargs += 1; 55 args[nargs] = "c"; 56 nargs += 1; 57 return true; 58 } // if 59 } // for 60 return false; 51 const string * end = suffixes + NumSuffixes; 52 return std::find( suffixes, end, arg.substr( dot + 1 ) ) != end; 61 53 } // suffix 62 54 63 55 64 void shuffle( const char * args[], int S, int E, int N ) {56 void shuffle( const char * args[], int S, int E, int N ) { 65 57 // S & E index 1 passed the end so adjust with -1 66 58 #ifdef __DEBUG_H__ … … 75 67 } // shuffle 76 68 77 static inline bool dirExists( const string & path) {69 static inline bool dirExists( const string & path ) { 78 70 struct stat info; 79 71 if(stat( path.c_str(), &info ) != 0) … … 88 80 #define str(s) #s 89 81 90 int main( int argc, char * argv[] ) {82 int main( int argc, char * argv[] ) { 91 83 string Version( CFA_VERSION_LONG ); // current version number from CONFIG 92 84 string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) ); … … 104 96 string compiler_name; // name of C compiler 105 97 98 bool x_flag = false; // -x flag 106 99 bool nonoptarg = false; // indicates non-option argument specified 107 100 bool link = true; // linking as well as compiling 108 101 bool verbose = false; // -v flag 109 bool quiet = false; // -quiet flag110 bool debug = true; // -debug flag111 bool nolib = false; // -nolib flag112 bool help = false; // -help flag102 bool quiet = false; // -quiet flag 103 bool debug = true; // -debug flag 104 bool nolib = false; // -nolib flag 105 bool help = false; // -help flag 113 106 bool CFA_flag = false; // -CFA flag 114 107 bool cpp_flag = false; // -E or -M flag, preprocessor only … … 116 109 bool noincstd_flag = false; // -no-include-stdhdr= flag 117 110 bool debugging __attribute(( unused )) = false; // -g flag 118 bool m32 = false; 119 bool m64 = false; 111 bool m32 = false; // -m32 flag 112 bool m64 = false; // -m64 flag 120 113 bool intree = false; 121 114 … … 198 191 args[nargs] = argv[i]; // pass the argument along 199 192 nargs += 1; 193 } else if ( prefix( arg, "-x" ) ) { // file suffix ? 194 string lang; 195 args[nargs] = argv[i]; // pass the argument along 196 nargs += 1; 197 if ( arg.length() == 2 ) { // separate argument ? 198 i += 1; 199 if ( i == argc ) continue; // next argument available ? 200 lang = argv[i]; 201 args[nargs] = argv[i]; // pass the argument along 202 nargs += 1; 203 } else { 204 lang = arg.substr( 2 ); 205 } // if 206 x_flag = lang != "none"; 200 207 } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) { 201 208 std_flag = true; // -std=XX provided … … 283 290 } // if 284 291 } else { 285 bool cfa = suffix( arg, args, nargs ); // check suffix 292 bool cfa = suffix( arg ); // check suffix 293 if ( ! x_flag && cfa ) { // no explicit suffix and cfa suffix ? 294 args[nargs] = "-x"; 295 nargs += 1; 296 args[nargs] = "c"; 297 nargs += 1; 298 } // if 286 299 args[nargs] = argv[i]; // concatenate file 287 300 nargs += 1; 288 if ( cfa ) {301 if ( ! x_flag && cfa ) { // no explicit suffix and cfa suffix ? 289 302 args[nargs] = "-x"; 290 303 nargs += 1; … … 295 308 } // if 296 309 } // for 297 298 args[nargs] = "-x"; // turn off language299 nargs += 1;300 args[nargs] = "none";301 nargs += 1;302 310 303 311 #ifdef __x86_64__
Note:
See TracChangeset
for help on using the changeset viewer.
