Changeset 2c2242c

Timestamp:

Jan 24, 2015, 5:34:52 PM (9 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:

26a07a22

Parents:

fe3b61b

Message:

deal with newer built

Files:

• libcfa/prototypes.awk (added)
• libcfa/prototypes.c (added)
• translator/Parser/lex.l (modified) (3 diffs)
• translator/ResolvExpr/Resolver.cc (modified) (1 diff)

translator/Parser/lex.l

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Jan 17 09:15:03 2015
- * Update Count     : 318
+ * Last Modified On : Wed Jan 21 08:43:59 2015
+ * Update Count     : 320
  */
 
@@ -216 +216 @@
 finally                 { KEYWORD_RETURN(FINALLY); }    // CFA
 float                   { KEYWORD_RETURN(FLOAT); }
+__float128              { KEYWORD_RETURN(FLOAT); }      // GCC
 for                     { KEYWORD_RETURN(FOR); }
 forall                  { KEYWORD_RETURN(FORALL); }     // CFA
@@ -230 +231 @@
 __inline__              { KEYWORD_RETURN(INLINE); }     // GCC
 int                     { KEYWORD_RETURN(INT); }
+__int128                { KEYWORD_RETURN(INT); }        // GCC
 __label__               { KEYWORD_RETURN(LABEL); }      // GCC
 long                    { KEYWORD_RETURN(LONG); }

translator/ResolvExpr/Resolver.cc

@@ -257 +257 @@
             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 );
-            }
+            for ( ; iter1 != baseStruct->get_members().end() && iter2 != listInit->end_initializers(); ++iter2 ) {
+                if ( (*iter2)->get_designators().empty() ) {
+                    DeclarationWithType *dt = dynamic_cast<DeclarationWithType *>( *iter1 );
+                    initContext = dt->get_type();
+                    (*iter2)->accept( *this );
+                    ++iter1;
+                } else {
+                    StructDecl *st = baseStruct;
+                    iter1 = st->get_members().begin();
+                    std::list<Expression *>::iterator iter3( (*iter2)->get_designators().begin() );
+                    for ( ; iter3 != (*iter2)->get_designators().end(); ++iter3 ) {
+                        NameExpr *key = dynamic_cast<NameExpr *>( *iter3 );
+                        assert( key );
+                        for ( ; iter1 != st->get_members().end(); ++iter1 ) {
+                            if ( key->get_name() == (*iter1)->get_name() ) {
+                                (*iter1)->print( cout );
+                                cout << key->get_name() << endl;
+                                ObjectDecl *fred = dynamic_cast<ObjectDecl *>( *iter1 );
+                                assert( fred );
+                                StructInstType *mary = dynamic_cast<StructInstType*>( fred->get_type() );
+                                assert( mary );
+                                st = mary->get_baseStruct();
+                                iter1 = st->get_members().begin();
+                                break;
+                            } // if
+                        }  // for
+                    } // for
+                    ObjectDecl *fred = dynamic_cast<ObjectDecl *>( *iter1 );
+                    assert( fred );
+                    initContext = fred->get_type();
+                    (*listInit->begin_initializers())->accept( *this );
+                } // if
+            } // for
         } else if ( UnionInstType *st = dynamic_cast<UnionInstType*>(initContext) ) {
             DeclarationWithType *dt = dynamic_cast<DeclarationWithType *>( *st->get_baseUnion()->get_members().begin() );