Changeset 71f4e4f for src/main.cc

Timestamp:

Jan 13, 2016, 5:19:47 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, 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:

f1e012b

Parents:

02c7d04

Message:

added ConstructorInit?, simple constructors and destructors work correctly

File:

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

src/main.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// main.cc -- 
+// main.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 17 12:59:06 2015
-// Update Count     : 179
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jan 13 16:47:25 2016
+// Update Count     : 181
 //
 
@@ -42 +42 @@
 #include "InitTweak/Mutate.h"
 #include "InitTweak/RemoveInit.h"
+#include "InitTweak/FixInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -99 +100 @@
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
-        
+
         int c;
         while ( (c = getopt_long( argc, argv, "abefglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
@@ -182 +183 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-        
+
                 Parser::get_parser().set_debug( grammarp );
 
@@ -203 +204 @@
                                         exit( 1 );
                                 } // if
-                    
+
                                 parse( prelude, LinkageSpec::Intrinsic );
                         } // if
                 } // if
 
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );      
-  
+                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );
+
                 if ( parsep ) {
                         Parser::get_parser().get_parseTree()->printList( std::cout );
@@ -244 +245 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" ) 
+                OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
                 OPTPRINT( "tweak" )
@@ -264 +265 @@
                         dump( translationUnit );
                 }
+
+                // fix ObjectDecl - replaces ConstructorInit nodes
+                InitTweak::fix( translationUnit );
 
                 OPTPRINT( "instantiateGeneric" )
@@ -331 +335 @@
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), 
+                filter( translationUnit.begin(), translationUnit.end(),
                                 std::back_inserter( decls ), notPrelude );
         } else {