Changes in src/ResolvExpr/CurrentObject.cc [ea2759b:8f06277]

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Jun 13 15:28:32 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr 10  9:40:00 2023
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  1 09:16:01 2022
+// Update Count     : 15
 //
 
@@ -593 +593 @@
 
 namespace ast {
-        /// Iterates members of a type by initializer.
-        class MemberIterator {
-        public:
-                virtual ~MemberIterator() {}
-
-                /// Internal set position based on iterator ranges.
-                virtual void setPosition(
-                        std::deque< ptr< Expr > >::const_iterator it,
-                        std::deque< ptr< Expr > >::const_iterator end ) = 0;
-
-                /// Walks the current object using the given designators as a guide.
-                void setPosition( const std::deque< ptr< Expr > > & designators ) {
-                        setPosition( designators.begin(), designators.end() );
-                }
-
-                /// Retrieve the list of possible (Type,Designation) pairs for the
-                /// current position in the current object.
-                virtual std::deque< InitAlternative > operator* () const = 0;
-
-                /// True if the iterator is not currently at the end.
-                virtual operator bool() const = 0;
-
-                /// Moves the iterator by one member in the current object.
-                virtual MemberIterator & bigStep() = 0;
-
-                /// Moves the iterator by one member in the current subobject.
-                virtual MemberIterator & smallStep() = 0;
-
-                /// The type of the current object.
-                virtual const Type * getType() = 0;
-
-                /// The type of the current subobject.
-                virtual const Type * getNext() = 0;
-
-                /// Helper for operator*; aggregates must add designator to each init
-                /// alternative, but adding designators in operator* creates duplicates.
-                virtual std::deque< InitAlternative > first() const = 0;
-        };
-
         /// create a new MemberIterator that traverses a type correctly
         MemberIterator * createMemberIterator( const CodeLocation & loc, const Type * type );
@@ -723 +684 @@
 
                 void setPosition(
-                        std::deque<ast::ptr<ast::Expr>>::const_iterator begin,
-                        std::deque<ast::ptr<ast::Expr>>::const_iterator end
+                        std::deque< ptr< Expr > >::const_iterator begin,
+                        std::deque< ptr< Expr > >::const_iterator end
                 ) override {
                         if ( begin == end ) return;
@@ -937 +898 @@
         };
 
-        /// Iterates across the positions in a tuple:
-        class TupleIterator final : public MemberIterator {
-                CodeLocation location;
-                ast::TupleType const * const tuple;
-                size_t index = 0;
-                size_t size = 0;
-                std::unique_ptr<MemberIterator> sub_iter;
-
-                const ast::Type * typeAtIndex() const {
-                        assert( index < size );
-                        return tuple->types[ index ].get();
-                }
-
-        public:
-                TupleIterator( const CodeLocation & loc, const TupleType * type )
-                : location( loc ), tuple( type ), size( type->size() ) {
-                        PRINT( std::cerr << "Creating tuple iterator: " << type << std::endl; )
-                        sub_iter.reset( createMemberIterator( loc, typeAtIndex() ) );
-                }
-
-                void setPosition( const ast::Expr * expr ) {
-                        auto arg = eval( expr );
-                        index = arg.first;
-                }
-
-                void setPosition(
-                                std::deque< ptr< Expr > >::const_iterator begin,
-                                std::deque< ptr< Expr > >::const_iterator end ) {
-                        if ( begin == end ) return;
-
-                        setPosition( *begin );
-                        sub_iter->setPosition( ++begin, end );
-                }
-
-                std::deque< InitAlternative > operator*() const override {
-                        return first();
-                }
+        class TupleIterator final : public AggregateIterator {
+        public:
+                TupleIterator( const CodeLocation & loc, const TupleType * inst )
+                : AggregateIterator(
+                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, inst->members
+                ) {}
 
                 operator bool() const override {
-                        return index < size;
+                        return curMember != members.end() || (memberIter && *memberIter);
                 }
 
                 TupleIterator & bigStep() override {
-                        ++index;
-                        sub_iter.reset( index < size ?
-                                createMemberIterator( location, typeAtIndex() ) : nullptr );
+                        PRINT( std::cerr << "bigStep in " << kind << std::endl; )
+                        atbegin = false;
+                        memberIter = nullptr;
+                        curType = nullptr;
+                        while ( curMember != members.end() ) {
+                                ++curMember;
+                                if ( init() ) return *this;
+                        }
                         return *this;
-                }
-
-                TupleIterator & smallStep() override {
-                        if ( sub_iter ) {
-                                PRINT( std::cerr << "has member iter: " << *sub_iter << std::endl; )
-                                sub_iter->smallStep();
-                                if ( !sub_iter ) {
-                                        PRINT( std::cerr << "has valid member iter" << std::endl; )
-                                        return *this;
-                                }
-                        }
-                        return bigStep();
-                }
-
-                const ast::Type * getType() override {
-                        return tuple;
-                }
-
-                const ast::Type * getNext() override {
-                        return ( sub_iter && *sub_iter ) ? sub_iter->getType() : nullptr;
-                }
-
-                std::deque< InitAlternative > first() const override {
-                        PRINT( std::cerr << "first in TupleIterator (" << index << "/" << size << ")" << std::endl; )
-                        if ( sub_iter && *sub_iter ) {
-                                std::deque< InitAlternative > ret = sub_iter->first();
-                                for ( InitAlternative & alt : ret ) {
-                                        alt.designation.get_and_mutate()->designators.emplace_front(
-                                                ConstantExpr::from_ulong( location, index ) );
-                                }
-                                return ret;
-                        }
-                        return {};
                 }
         };