Changes in src/InitTweak/GenInit.cc [a0fdbd5:7b3f66b]

File:

• src/InitTweak/GenInit.cc (modified) (6 diffs)

src/InitTweak/GenInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 12:26:47 2016
+// Last Modified On : Fri May 13 11:37:48 2016
 // Update Count     : 166
 //
@@ -17 +17 @@
 #include <list>
 #include "GenInit.h"
+#include "InitTweak.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Type.h"
@@ -130 +131 @@
 
         namespace {
-                bool tryConstruct( ObjectDecl * objDecl ) {
-                        // xxx - handle designations
-                        return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
-                                (objDecl->get_init() == NULL ||
-                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ));
-                }
-
                 Expression * makeCtorDtorExpr( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
                         UntypedExpr * expr = new UntypedExpr( new NameExpr( name ) );
@@ -142 +136 @@
                         expr->get_args().splice( expr->get_args().end(), args );
                         return expr;
-                }
-
-                class InitExpander : public Visitor {
-                  public:
-                  InitExpander() {}
-                  // ~InitExpander() {}
-                        virtual void visit( SingleInit * singleInit );
-                        virtual void visit( ListInit * listInit );
-                        std::list< Expression * > argList;
-                };
-
-                void InitExpander::visit( SingleInit * singleInit ) {
-                        argList.push_back( singleInit->get_value()->clone() );
-                }
-
-                void InitExpander::visit( ListInit * listInit ) {
-                        // xxx - for now, assume no nested list inits
-                        std::list<Initializer*>::iterator it = listInit->begin_initializers();
-                        for ( ; it != listInit->end_initializers(); ++it ) {
-                                (*it)->accept( *this );
-                        }
-                }
-
-                std::list< Expression * > makeInitList( Initializer * init ) {
-                        InitExpander expander;
-                        maybeAccept( init, expander );
-                        return expander.argList;
                 }
         }
@@ -179 +146 @@
                                         // call into makeArrayFunction from validate.cc to generate calls to ctor/dtor for each element of array
                                         // TODO: walk initializer and generate appropriate copy ctor if element has initializer
-                                        std::list< Statement * > ctor;
-                                        std::list< Statement * > dtor;
-
-                                        SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "?{}", back_inserter( ctor ) );
-                                        SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "^?{}", front_inserter( dtor ), false );
-
-                                        // Currently makeArrayFunction produces a single Statement - a CompoundStmt
-                                        // which  wraps everything that needs to happen. As such, it's technically
-                                        // possible to use a Statement ** in the above calls, but this is inherently
-                                        // unsafe, so instead we take the slightly less efficient route, but will be
-                                        // immediately informed if somehow the above assumption is broken. In this case,
-                                        // we could always wrap the list of statements at this point with a CompoundStmt,
-                                        // but it seems reasonable at the moment for this to be done by makeArrayFunction
-                                        // itself
-                                        assert( ctor.size() == 1 );
-                                        assert( dtor.size() == 1 );
-
-                                        objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
+                                        std::list< Expression * > args = makeInitList( objDecl->get_init() );
+                                        if ( args.empty() ) {
+                                                std::list< Statement * > ctor;
+                                                std::list< Statement * > dtor;
+
+                                                SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "?{}", back_inserter( ctor ) );
+                                                SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "^?{}", front_inserter( dtor ), false );
+
+                                                // Currently makeArrayFunction produces a single Statement - a CompoundStmt
+                                                // which  wraps everything that needs to happen. As such, it's technically
+                                                // possible to use a Statement ** in the above calls, but this is inherently
+                                                // unsafe, so instead we take the slightly less efficient route, but will be
+                                                // immediately informed if somehow the above assumption is broken. In this case,
+                                                // we could always wrap the list of statements at this point with a CompoundStmt,
+                                                // but it seems reasonable at the moment for this to be done by makeArrayFunction
+                                                // itself
+                                                assert( ctor.size() == 1 );
+                                                assert( dtor.size() == 1 );
+
+                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
+                                        } else {
+                                                // array came with an initializer list: initialize each element
+                                                // may have more initializers than elements in the array - need to check at each index that
+                                                // we haven't exceeded size. This requires precomputing the size because it might be a side-effecting
+                                                // computation.
+                                                // may have fewer initializers than eleemnts in the array - need to default construct
+                                                // remaining elements.
+                                                // might be able to merge this with the case above.
+                                        }
                                 } else {
                                         // it's sufficient to attempt to call the ctor/dtor for the given object and its initializer
@@ -209 +187 @@
                                         objDecl->set_init( new ConstructorInit( ctorStmt, dtorStmt, objDecl->get_init() ) );
                                 }
-                        } else {
-                                // xxx - find a way to construct/destruct globals
-                                // hack: implicit "static" initialization routine for each struct type? or something similar?
-                                // --ties into module system
-                                // this can be done by mangling main and replacing it with our own main which calls each
-                                // module initialization routine in some decided order (order given in link command?)
-                                // and finally calls mangled main
                         }
                 }