Changeset 1485c1a

Timestamp:

Dec 7, 2017, 5:06:28 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

87959f6

Parents:

5e1adb5

Message:

Add anonymous members to Indexer in WithStmt? [fixes #69]

Location:

src/SymTab

Files:

• Indexer.cc (modified) (2 diffs)
• Indexer.h (modified) (1 diff)

src/SymTab/Indexer.cc

@@ -572 +572 @@
         }
 
+        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr ) {
+                for ( Declaration * decl : aggr->members ) {
+                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                addId( dwt, expr );
+                                if ( dwt->name == "" ) {
+                                        Type * t = dwt->get_type()->stripReferences();
+                                        if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
+                                                Expression * base = expr->clone();
+                                                ResolvExpr::referenceToRvalueConversion( base );
+                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ) );
+                                        }
+                                }
+                        }
+                }
+        }
+
         void Indexer::addWith( WithStmt * stmt ) {
                 for ( Expression * expr : stmt->exprs ) {
@@ -578 +594 @@
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
 
-                                for ( Declaration * decl : aggr->members ) {
-                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                                addId( dwt, expr );
-                                        }
-                                }
+                                addMembers( aggr, expr );
                         }
                 }

src/SymTab/Indexer.h

@@ -86 +86 @@
                 void addWith( WithStmt * );
 
+                /// adds all of the members of the Aggregate (addWith helper)
+                void addMembers( AggregateDecl * aggr, Expression * expr );
+
                 /// convenience function for adding a list of Ids to the indexer
                 void addIds( const std::list< DeclarationWithType * > & decls );