Changeset 7416d46a for src/ResolvExpr/CurrentObject.cc

Timestamp:

Jan 30, 2018, 3:54:32 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

633a642

Parents:

f792cb8 (diff), 42be3c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -62 +62 @@
                 virtual ~MemberIterator() {}
 
+                /// walks the current object using the given designators as a guide
                 virtual void setPosition( std::list< Expression * > & designators ) = 0;
+
+                /// retrieve the list of possible Type/Designaton pairs for the current position in the currect object
                 virtual std::list<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 Type * getType() = 0;
+
+                /// the type of the current subobject
                 virtual Type * getNext() = 0;
 
+                /// printing for debug
                 virtual void print( std::ostream & out, Indenter indent ) const = 0;
 
+                /// helper for operator*; aggregates must add designator to each init alternative, but
+                /// adding designators in operator* creates duplicates.
                 virtual std::list<InitAlternative> first() const = 0; // should be protected
         };
@@ -354 +370 @@
                                 }
                         }
-                        // if ( curMember == std::next( decl->get_members().begin(), 1 ) ) { // xxx - this never triggers because curMember is incremented immediately on construction
-                        if ( atbegin ) { // xxx - this never triggers because curMember is incremented immediately on construction
+                        if ( atbegin ) {
                                 // xxx - what about case of empty struct??
                                 // only add self if at the very beginning of the structure
@@ -389 +404 @@
                         return *this;
                 }
-                virtual std::list<InitAlternative> first() const { return std::list<InitAlternative>{}; }
         };
 
@@ -443 +457 @@
                                 return new UnionIterator( uit );
                         } else {
-                                assertf( dynamic_cast< TypeInstType * >( type ), "some other reftotype" );
+                                assertf( dynamic_cast< EnumInstType * >( type ) || dynamic_cast< TypeInstType * >( type ), "Encountered unhandled ReferenceToType in createMemberIterator: %s", toString( type ).c_str() );
                                 return new SimpleIterator( type );
                         }