Changes in src/ResolvExpr/CurrentObject.cc [ba4a1d8:2b59f55]

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -20 +20 @@
 #include <string>                      // for string, operator<<, allocator
 
+#include "AST/Expr.hpp"                // for InitAlternative
+#include "AST/Init.hpp"                // for Designation
+#include "AST/Node.hpp"                // for readonly
 #include "Common/Indenter.h"           // for Indenter, operator<<
 #include "Common/SemanticError.h"      // for SemanticError
@@ -579 +582 @@
 } // namespace ResolvExpr
 
+namespace ast {
+
+        /// Iterates members of a type by initializer
+        class MemberIterator {
+        public:
+                virtual ~MemberIterator() {}
+
+                /// retrieve the list of possible (Type,Designation) pairs for the current position in the 
+                /// current object
+                virtual std::vector< InitAlternative > operator* () const = 0;
+        
+        protected:
+                /// helper for operator*; aggregates must add designator to each init alternative, but 
+                /// adding designators in operator* creates duplicates
+                virtual std::vector< InitAlternative > first() const = 0;
+        };
+
+        /// Iterates "other" types (e.g. basic, pointer) which do not change at list initializer entry
+        class SimpleIterator final : public MemberIterator {
+                CodeLocation location;
+                readonly< Type > type = nullptr;
+        public:
+                SimpleIterator( const CodeLocation & loc, const Type * t ) : location( loc ), type( t ) {}
+
+                std::vector< InitAlternative > operator* () const override { return first(); }
+
+        protected:
+                std::vector< InitAlternative > first() const override {
+                        if ( type ) return { InitAlternative{ type, new Designation{ location } } };
+                        return {};
+                }
+        };
+
+        CurrentObject::CurrentObject( const CodeLocation & loc, const Type * type ) : objStack() {
+                objStack.emplace_back( new SimpleIterator{ loc, type } );
+        }
+
+        std::vector< InitAlternative > CurrentObject::getOptions() {
+                PRINT( std::cerr << "____getting current options" << std::endl; )
+                assertf( ! objStack.empty(), "objstack empty in getOptions" );
+                return **objStack.back();
+        }
+}
+
 // Local Variables: //
 // tab-width: 4 //