Changeset 94b4364 for src/ResolvExpr

Timestamp:

Jun 16, 2015, 3:49:36 PM (10 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, string, with_gc

Children:

94e0864d

Parents:

b5b0907

Message:

implemented resolver methods for aggregate initialization

File:

• src/ResolvExpr/Resolver.cc (modified) (6 diffs)

src/ResolvExpr/Resolver.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 10 16:11:19 2015
-// Update Count     : 77
+// Last Modified On : Tue Jun 16 14:50:11 2015
+// Update Count     : 154
 //
 
@@ -37 +37 @@
                 virtual void visit( ObjectDecl *functionDecl );
                 virtual void visit( TypeDecl *typeDecl );
+
                 virtual void visit( ArrayType * at );
 
@@ -51 +52 @@
                 virtual void visit( ListInit *listInit );
           private:
+        typedef std::list< Initializer * >::iterator InitIterator;
+
+          void resolveAggrInit( AggregateDecl *, InitIterator &, InitIterator & );
+          void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
+
                 std::list< Type * > functionReturn;
                 Type *initContext;
@@ -167 +173 @@
                         delete at->get_dimension();
                         at->set_dimension( newExpr );
-
                 }
                 Visitor::visit( at );
         }
-  
+
         void Resolver::visit( TypeDecl *typeDecl ) {
                 if ( typeDecl->get_base() ) {
@@ -179 +184 @@
                 SymTab::Indexer::visit( typeDecl );
         }
-  
+
         void Resolver::visit( FunctionDecl *functionDecl ) {
 #if 0
@@ -329 +334 @@
         }
 
-        void Resolver::visit( ListInit *listInit ) {
+        void Resolver::resolveSingleAggrInit( Declaration * dcl, InitIterator & init, InitIterator & initEnd ) {
+                DeclarationWithType * dt = dynamic_cast< DeclarationWithType * >( dcl );
+                assert( dt );
+                initContext = dt->get_type();
+                try {
+                        if ( init == initEnd ) return; // stop when there are no more initializers
+                        (*init)->accept( *this );
+                        ++init; // made it past an initializer
+                } catch( SemanticError & ) {
+                        // need to delve deeper, if you can
+                        if ( StructInstType * sit = dynamic_cast< StructInstType * >( dt->get_type() ) ) {
+                                resolveAggrInit( sit->get_baseStruct(), init, initEnd );
+                        } else if ( UnionInstType * uit = dynamic_cast< UnionInstType * >( dt->get_type() ) ) {
+                                resolveAggrInit( uit->get_baseUnion(), init, initEnd );
+                        } else {
+                                // might need to rethink what is being thrown
+                                throw;
+                        } // if
+                }
+        }
+
+        void Resolver::resolveAggrInit( AggregateDecl * aggr, InitIterator & init, InitIterator & initEnd ) {
+                if ( StructDecl * st = dynamic_cast< StructDecl * >( aggr ) ) {
+                        // want to resolve each initializer to the members of the struct,
+                        // but if there are more initializers than members we should stop
+                        list< Declaration * >::iterator it = st->get_members().begin();
+                        for ( ; it != st->get_members().end(); ++it) {
+                                resolveSingleAggrInit( *it, init, initEnd );
+                        }
+                } else if ( UnionDecl * un = dynamic_cast< UnionDecl * >( aggr ) ) {
+                        // only resolve to the first member of a union
+                        resolveSingleAggrInit( *un->get_members().begin(), init, initEnd );
+                } // if
+        }
+
+        void Resolver::visit( ListInit * listInit ) {
+                InitIterator iter = listInit->begin_initializers();
+                InitIterator end = listInit->end_initializers();
+
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
-                        std::list< Initializer * >::iterator iter( listInit->begin_initializers() );
-                        for ( ; iter != listInit->end_initializers(); ++iter ) {
+                        // resolve each member to the base type of the array
+                        for ( ; iter != end; ++iter ) {
                                 initContext = at->get_base();
                                 (*iter)->accept( *this );
                         } // for
+                } else if ( StructInstType * st = dynamic_cast< StructInstType * >( initContext ) ) {
+                        resolveAggrInit( st->get_baseStruct(), iter, end );
                 } else if ( UnionInstType *st = dynamic_cast< UnionInstType * >( initContext ) ) {
-                        DeclarationWithType *dt = dynamic_cast< DeclarationWithType * >( *st->get_baseUnion()->get_members().begin() );
-                        initContext = dt->get_type();
-                        (*listInit->begin_initializers())->accept( *this );
+                        resolveAggrInit( st->get_baseUnion(), iter, end );
                 } else {
                         // basic types are handled here