Changeset 7f2bfb7 for src/ResolvExpr/CurrentObject.cc

Timestamp:

Nov 29, 2023, 1:41:52 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

4dc3b8c

Parents:

4f1b2d69 (diff), ab9c1b3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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;
-                        if ( auto nexpr = dynamic_cast< const NameExpr *>( expr ) ) {
+                        // Name Designation:
+                        if ( nexpr ) {
                                 PRINT( std::cerr << "____actual: " << t << std::endl; )
                                 if ( auto refType = dynamic_cast< const BaseInstType * >( t ) ) {
@@ -515 +517 @@
                                                 }
                                         }
-                                } 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 ) ) {