Changeset 04273e9 for src/main.cc

Timestamp:

Aug 8, 2016, 5:29:03 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

03da511

Parents:

0853178 (diff), 7bf7fb9 (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/SymTab/Autogen.cc

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 15:23:11 2016
-// Update Count     : 209
+// Last Modified On : Sat Aug  6 16:17:41 2016
+// Update Count     : 210
 //
 
@@ -28 +28 @@
 #include "GenPoly/Box.h"
 #include "GenPoly/CopyParams.h"
+#include "GenPoly/InstantiateGeneric.h"
 #include "CodeGen/Generate.h"
 #include "CodeGen/FixNames.h"
@@ -192 +193 @@
                         input = fopen( argv[ optind ], "r" );
                         if ( ! input ) {
-                                std::cout << "Error: can't open " << argv[ optind ] << std::endl;
+                                std::cout << "Error: cannot open " << argv[ optind ] << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -218 +219 @@
                         FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins.cf" << std::endl;
+                                std::cerr << "Error: cannot open builtins.cf" << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -226 +227 @@
                         FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         if ( extras == NULL ) {
-                                std::cerr << "Error: can't open extras.cf" << std::endl;
+                                std::cerr << "Error: cannot open extras.cf" << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -235 +236 @@
                                 FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
+                                        std::cerr << "Error: cannot open prelude.cf" << std::endl;
                                         exit( EXIT_FAILURE );
                                 } // if
@@ -309 +310 @@
                 }
 
+                OPTPRINT("instantiateGenerics")
+                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );