Changeset d031f7f for src

Timestamp:

Oct 25, 2024, 3:43:45 PM (8 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

06d75931, 720eec9

Parents:

90be0cf

Message:

Renamed CurrentObject?'s MemberIterator::operator* to getOptions because that is a more descriptive name.

File:

• src/ResolvExpr/CurrentObject.cpp (modified) (6 diffs)

src/ResolvExpr/CurrentObject.cpp

@@ -60 +60 @@
         /// Retrieve the list of possible (Type,Designation) pairs for the
         /// current position in the current object.
-        virtual std::deque< InitAlternative > operator* () const = 0;
+        virtual std::deque< InitAlternative > getOptions() const = 0;
 
         /// True if the iterator is not currently at the end.
@@ -77 +77 @@
         virtual const Type * getNext() = 0;
 
-        /// Helper for operator*; aggregates must add designator to each init
-        /// alternative, but adding designators in operator* creates duplicates.
+        /// Helper for getOptions; aggregates must add designator to each init
+        /// alternative, but adding designators in getOptions creates duplicates.
         virtual std::deque< InitAlternative > first() const = 0;
 };
@@ -103 +103 @@
         }
 
-        std::deque< InitAlternative > operator* () const override { return first(); }
+        std::deque< InitAlternative > getOptions() const override { return first(); }
 
         operator bool() const override { return type; }
@@ -169 +169 @@
         }
 
-        std::deque< InitAlternative > operator* () const override { return first(); }
+        std::deque< InitAlternative > getOptions() const override { return first(); }
 
         operator bool() const override { return index < size; }
@@ -297 +297 @@
         }
 
-        std::deque< InitAlternative > operator* () const final {
+        std::deque< InitAlternative > getOptions() const final {
                 if ( memberIter && *memberIter ) {
                         std::deque< InitAlternative > ret = memberIter->first();
@@ -594 +594 @@
         PRINT( std::cerr << "____getting current options" << std::endl; )
         assertf( ! objStack.empty(), "objstack empty in getOptions" );
-        return **objStack.back();
+        return objStack.back()->getOptions();
 }