Changeset 7527e63 for src/main.cc

Timestamp:

Aug 16, 2016, 3:20:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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) (11 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 : Mon Aug 15 17:58:57 2016
+// Update Count     : 220
 //
 
 #include <iostream>
 #include <fstream>
-#include <cstdlib>
-#include <cstdio>
 #include <getopt.h>
 #include "Parser/Parser.h"
-#include "Parser/ParseNode.h"
-#include "Parser/LinkageSpec.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Visitor.h"
@@ -28 +24 @@
 #include "GenPoly/Box.h"
 #include "GenPoly/CopyParams.h"
+#include "GenPoly/InstantiateGeneric.h"
 #include "CodeGen/Generate.h"
 #include "CodeGen/FixNames.h"
@@ -42 +39 @@
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
-#include "InitTweak/FixGlobalInit.h"
-//#include "Explain/GenProlog.h"
-//#include "Try/Visit.h"
 
 #include "Common/SemanticError.h"
@@ -193 +187 @@
                         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
@@ -219 +213 @@
                         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
@@ -227 +221 @@
                         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
@@ -236 +230 @@
                                 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
@@ -282 +276 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
@@ -304 +296 @@
                 }
 
+                // fix ObjectDecl - replaces ConstructorInit nodes
                 OPTPRINT( "fixInit" )
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                InitTweak::fix( translationUnit );
+                InitTweak::fix( translationUnit, filename, libcfap || treep );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -312 +304 @@
                 }
 
+                OPTPRINT("instantiateGenerics")
+                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );
@@ -384 +378 @@
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(),
-                                std::back_inserter( decls ), notPrelude );
+                filter( translationUnit.begin(), translationUnit.end(), std::back_inserter( decls ), notPrelude );
         } else {
                 decls = translationUnit;