Changeset d63eeb0 for src/main.cc

Timestamp:

Feb 9, 2016, 3:25:05 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:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 16:28:13 2016
-// Update Count     : 194
+// Last Modified On : Tue Feb 09 13:28:11 2016
+// Update Count     : 200
 //
 
@@ -24 +24 @@
 #include "SynTree/Declaration.h"
 #include "SynTree/Visitor.h"
-#include "GenPoly/InstantiateGeneric.h"
 #include "GenPoly/Lvalue.h"
 #include "GenPoly/Specialize.h"
@@ -46 +45 @@
 //#include "Try/Visit.h"
 
-#include "SemanticError.h"
-#include "UnimplementedError.h"
+#include "Common/SemanticError.h"
+#include "Common/UnimplementedError.h"
 
 #include "../config.h"
@@ -72 +71 @@
         resolvep = false,                                                                       // used in AlternativeFinder
         symtabp = false,
+        treep = false,
         validp = false,
         errorp = false,
         codegenp = false;
 
-enum { Ast, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Validate, };
+enum { Ast, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
 
 static struct option long_opts[] = {
@@ -91 +91 @@
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
+        { "tree", no_argument, 0, Tree },
         { "validate", no_argument, 0, Validate },
         { 0, 0, 0, 0 }
@@ -104 +105 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abcefFglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abcefFglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -153 +154 @@
                   case 's':                                                                             // print symbol table events
                         symtabp = true;
+                        break;
+                  case Tree:
+                  case 't':                                                                             // build in tree
+                        treep = true;
                         break;
                   case 'v':                                                                             // dump AST after decl validation pass
@@ -195 +200 @@
                 if ( ! nopreludep ) {                                                   // include gcc builtins
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins" << std::endl;
+                                std::cerr << "Error: can't open builtins.cf" << std::endl;
                                 exit( 1 );
                         } // if
@@ -205 +210 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude" << std::endl;
+                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
                                         exit( 1 );
                                 } // if
@@ -281 +286 @@
                 }
 
-                OPTPRINT( "instantiateGeneric" )
-                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );