Changes in / [87959f6:6ba16fa]

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 ) {
@@ -594 +578 @@
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
 
-                                addMembers( aggr, expr );
+                                for ( Declaration * decl : aggr->members ) {
+                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                                addId( dwt, 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 );