Changeset 9aa9126 for src/main.cc

Timestamp:

Aug 9, 2018, 1:14:24 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

fc846ae

Parents:

7a7ab42 (diff), 3b2b37f (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/main.cc (modified) (3 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 = "";
 
@@ -303 +278 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );