Changeset 37024fd for src/main.cc

Timestamp:

May 6, 2016, 3:01:28 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:

03e5d14

Parents:

9a92216

Message:

cleanup global init code, don't need to disambiguate with libcfa prefix

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 14:20:26 2016
+// Last Modified On : Fri May 06 14:56:40 2016
 // Update Count     : 203
 //
@@ -186 +186 @@
                         // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
                         if ( filename == NULL ) filename = argv[ optind ];
-                        // prepend libcfa prefix to disambiguate library code from user programs
-                        if ( libcfap ) {
-                                filename = "libcfa/prelude.cf";
-                        } else if ( treep ) {
-                                filename = (*new string(string("libcfa/") + filename)).c_str();
-                        }
+                        // prelude filename comes in differently
+                        if ( libcfap ) filename = "prelude.cf";
                         optind += 1;
                 } else {