Changes in src/ResolvExpr/CurrentObject.cc [da5ac2e:2908f08]

File:

• src/ResolvExpr/CurrentObject.cc (modified) (2 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -498 +498 @@
                 PRINT( std::cerr << "____untyped: " << expr << std::endl; )
                 auto dit = desigAlts.begin();
-                auto nexpr = dynamic_cast< const NameExpr * >( expr );
 
                 for ( const Type * t : curTypes ) {
                         assert( dit != desigAlts.end() );
                         DesignatorChain & d = *dit;
-                        // Name Designation:
-                        if ( nexpr ) {
+                        if ( auto nexpr = dynamic_cast< const NameExpr *>( expr ) ) {
                                 PRINT( std::cerr << "____actual: " << t << std::endl; )
                                 if ( auto refType = dynamic_cast< const BaseInstType * >( t ) ) {
@@ -517 +515 @@
                                                 }
                                         }
+                                } else if ( auto at = dynamic_cast< const ArrayType * >( t ) ) {
+                                        auto nexpr = dynamic_cast< const NameExpr *>( expr );
+                                        for ( const Decl * mem : refType->lookup( nexpr->name ) ) {
+                                                if ( auto field = dynamic_cast< const ObjectDecl * >( mem ) ) {
+                                                        DesignatorChain d2 = d;
+                                                        d2.emplace_back( new VariableExpr{ expr->location, field } );
+                                                        newDesigAlts.emplace_back( std::move( d2 ) );
+                                                        newTypes.emplace_back( at->base );
+                                                }
+                                        }
                                 }
 
                                 ++dit;
-                        // Index Designation:
                         } else {
                                 if ( auto at = dynamic_cast< const ArrayType * >( t ) ) {