Changes in src/ResolvExpr/CurrentObject.cc [8e1467d:954c954]

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -594 +594 @@
         class SimpleIterator final : public MemberIterator {
                 CodeLocation location;
-                readonly< Type > type = nullptr;
+                const Type * type = nullptr;
         public:
                 SimpleIterator( const CodeLocation & loc, const Type * t ) : location( loc ), type( t ) {}
@@ -630 +630 @@
         class ArrayIterator final : public MemberIterator {
                 CodeLocation location;
-                readonly< ArrayType > array = nullptr;
-                readonly< Type > base = nullptr;
+                const ArrayType * array = nullptr;
+                const Type * base = nullptr;
                 size_t index = 0;
                 size_t size = 0;
@@ -923 +923 @@
 
         MemberIterator * createMemberIterator( const CodeLocation & loc, const Type * type ) {
-                if ( auto aggr = dynamic_cast< const ReferenceToType * >( type ) ) {
+                if ( auto aggr = dynamic_cast< const BaseInstType * >( type ) ) {
                         if ( auto sit = dynamic_cast< const StructInstType * >( aggr ) ) {
                                 return new StructIterator{ loc, sit };
@@ -932 +932 @@
                                         dynamic_cast< const EnumInstType * >( type )
                                                 || dynamic_cast< const TypeInstType * >( type ),
-                                        "Encountered unhandled ReferenceToType in createMemberIterator: %s",
+                                        "Encountered unhandled BaseInstType in createMemberIterator: %s",
                                                 toString( type ).c_str() );
                                 return new SimpleIterator{ loc, type };
@@ -965 +965 @@
                                         DesignatorChain & d = *dit;
                                         PRINT( std::cerr << "____actual: " << t << std::endl; )
-                                        if ( auto refType = dynamic_cast< const ReferenceToType * >( t ) ) {
+                                        if ( auto refType = dynamic_cast< const BaseInstType * >( t ) ) {
                                                 // concatenate identical field names
                                                 for ( const Decl * mem : refType->lookup( nexpr->name ) ) {