Changes in src/ResolvExpr/CurrentObject.h [2b59f55:60aaa51d]

File:

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

src/ResolvExpr/CurrentObject.h

@@ -16 +16 @@
 #pragma once
 
+#include <deque>
 #include <list>   // for list
 #include <memory> // for unique_ptr
@@ -21 +22 @@
 #include <vector>
 
+#include "AST/Node.hpp"  // for ptr
 #include "Common/CodeLocation.h"
 
@@ -59 +61 @@
         // AST class types
         class Designation;
-        class InitAlternative;
+        struct InitAlternative;
         class Type;
 
-        // forward declaration of internal detail
-        class MemberIterator;
+        /// 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;
+        };
 
         /// Builds initializer lists in resolution
@@ -73 +111 @@
                 CurrentObject( const CodeLocation & loc, const Type * type );
 
+                /// sets current position using the resolved designation
+                void setNext( const ast::Designation * designation );
+                /// steps to next sub-object of current object
+                void increment();
+                /// sets new current object for the duration of this brace-enclosed intializer-list
+                void enterListInit( const CodeLocation & loc );
+                /// restores previous current object
+                void exitListInit();
                 /// produces a list of alternatives (Type *, Designation *) for the current sub-object's 
                 /// initializer.
-                std::vector< InitAlternative > getOptions();
+                std::deque< InitAlternative > getOptions();
+                /// produces the type of the current object but no subobjects
+                const Type * getCurrentType();
         };
 } // namespace ast