Changeset d029162 for src/main.cc

Timestamp:

May 6, 2016, 2:07:41 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

9a92216

Parents:

4e24610 (diff), 4acc87f (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.

Message:

Merge branch 'master' into global-init

Conflicts:

src/main.cc

File:

• src/main.cc (modified) (6 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 16:54:52 2016
-// Update Count     : 199
+// Last Modified On : Fri May 06 14:04:49 2016
+// Update Count     : 203
 //
 
@@ -98 +98 @@
         std::ostream *output = &std::cout;
         int long_index;
-        std::list< Declaration* > translationUnit;
+        std::list< Declaration * > translationUnit;
+        const char *filename = NULL;
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -163 +164 @@
                         break;
                   case 'D':                                                                             // ignore -Dxxx
+                        break;
+                  case 'F':                                                                             // source file-name without suffix
+                        filename = optarg;
                         break;
                   case '?':
@@ -173 +177 @@
 
         try {
-                std::string fileName;
-
                 // choose to read the program from a file or stdin
                 if ( optind < argc ) {
@@ -182 +184 @@
                                 exit( 1 );
                         } // if
+                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
+                        if ( filename == NULL ) filename = argv[ optind ];
                         optind += 1;
-
-                        // assert( optind < argc );
-                        fileName = argv[ optind-1 ]; // placeholder
-                        // optind += 1;
                 } else {
                         input = stdin;
@@ -259 +259 @@
                 CodeGen::fixNames( translationUnit );
                 OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, fileName );
+                InitTweak::fixGlobalInit( translationUnit, filename );
                 OPTPRINT( "tweak" )
                 InitTweak::tweak( translationUnit );