Changeset 6c3744e for translator/ResolvExpr

Timestamp:

Jan 19, 2015, 6:29:10 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f7f6785

Parents:

0b8cd722

Message:

add list initializer, formatting changes

File:

• translator/ResolvExpr/Resolver.cc (modified) (1 diff)

translator/ResolvExpr/Resolver.cc

@@ -246 +246 @@
             singleInit->set_value( newExpr );
         } // if
-        singleInit->get_value()->accept( *this );
+//      singleInit->get_value()->accept( *this );
     }
 
     void Resolver::visit( ListInit *listInit ) {
-        // no cast necessary
+        if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {
+            initContext = at->get_base();
+            Visitor::visit( listInit );
+        } else if ( StructInstType *st = dynamic_cast<StructInstType*>(initContext) ) {
+            StructDecl *baseStruct = st->get_baseStruct();
+            std::list<Declaration *>::iterator iter1( baseStruct->get_members().begin() );
+            std::list<Initializer *>::iterator iter2( listInit->begin_initializers() );
+            for ( ; iter1 != baseStruct->get_members().end() && iter2 != listInit->end_initializers() ; ++iter1, ++iter2 ) {
+                DeclarationWithType *dt = dynamic_cast<DeclarationWithType *>( *iter1 );
+                initContext = dt->get_type();
+                (*iter2)->accept( *this );
+            }
+        } 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 );
+        } // if
     }
 } // namespace ResolvExpr