Changes in src/main.cc [37fe352:05e6eb5]

File:

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

src/main.cc

@@ -28 +28 @@
 #include <string>                           // for char_traits, operator<<
 
+#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
@@ -72 +73 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
-extern int yydebug;                                                                             // set for -g flag (Grammar)
-bool
-        astp = false,
-        bresolvep = false,
-        bboxp = false,
-        bcodegenp = false,
-        ctorinitp = false,
-        declstatsp = false,
-        exprp = false,
-        expraltp = false,
-        genericsp = false,
-        libcfap = false,
-        nopreludep = false,
-        noprotop = false,
-        nomainp = false,
-        parsep = false,
-        resolvep = false,                                                                       // used in AlternativeFinder
-        symtabp = false,
-        treep = false,
-        tuplep = false,
-        validp = false,
-        errorp = false,
-        codegenp = false,
-        prettycodegenp = false,
-        linemarks = false;
-
-std::string PreludeDirector = "";
-
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
@@ -209 +182 @@
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
 
-                        assertf( !PreludeDirector.empty(), "Can't find prelude without option --prelude-dir must be used." );
-
                         // Read to gcc builtins, if not generating the cfa library
-                        FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cf").c_str(), "r" );
+                        FILE * gcc_builtins = fopen( buildingLibrary() ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
                         assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
                         parse( gcc_builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( (PreludeDirector + "/extras.cf").c_str(), "r" );
+                        FILE * extras = fopen( buildingLibrary() ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::BuiltinC );
@@ -223 +194 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
+                                FILE * prelude = fopen( buildingLibrary() ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
 
                                 // Read to cfa builtins, if not generating the cfa library
-                                FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
+                                FILE * builtins = fopen( buildingLibrary() ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
@@ -303 +274 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -352 +323 @@
                 PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
 
-                CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
                 if ( output != &cout ) {
                         delete output;
@@ -401 +372 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
 
         static struct option long_opts[] = {
@@ -417 +388 @@
                 { "no-preamble", no_argument, 0, Nopreamble },
                 { "parse", no_argument, 0, Parse },
-                { "prelude-dir", required_argument, 0, PreludeDir },
                 { "no-prototypes", no_argument, 0, Prototypes },
                 { "resolver", no_argument, 0, Resolver },
@@ -490 +460 @@
                   case 'p':                                                                             // generate prototypes for preamble functions
                         noprotop = true;
-                        break;
-                  case PreludeDir:
-                        PreludeDirector = optarg;
                         break;
                   case 'm':                                                                             // don't replace the main