Changeset fac05b3 for src/ResolvExpr

Timestamp:

Apr 6, 2023, 4:09:24 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

485393c

Parents:

c468150

Message:

Removed members from TupleType. They were only used in one place, CurrentObject. That now has a patch to create its own imaginary members.

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -10 +10 @@
 // Created On       : Tue Jun 13 15:28:32 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  1 09:16:01 2022
-// Update Count     : 15
+// Last Modified On : Thu Apr  6 16:03:00 2023
+// Update Count     : 16
 //
 
@@ -899 +899 @@
 
         class TupleIterator final : public AggregateIterator {
+                MemberList * memberList;
+
+                TupleIterator( const CodeLocation & loc,
+                        const ast::TupleType * inst, MemberList * memberList )
+                : AggregateIterator(
+                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, *memberList
+                ), memberList( memberList ) {}
+
+                // The two layer constructor, this helper and the destructor
+                // are all to pretend that Tuples have members (they do not).
+                static MemberList * newImaginaryMembers( const ast::TupleType * inst ) {
+                        auto ret = new MemberList();
+                        ret->reserve( inst->types.size() );
+                        for ( const ast::Type * type : inst->types ) {
+                                ret->emplace_back( new ast::ObjectDecl(
+                                        CodeLocation(), "", type,
+                                        new ast::ListInit( CodeLocation(), {}, {}, ast::NoConstruct )
+                                ) );
+                        }
+                        return ret;
+                }
+
         public:
                 TupleIterator( const CodeLocation & loc, const TupleType * inst )
-                : AggregateIterator(
-                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, inst->members
-                ) {}
+                : TupleIterator( loc, inst, newImaginaryMembers( inst ) ) {}
+
+                virtual ~TupleIterator() {
+                        delete memberList;
+                }
 
                 operator bool() const override {