Changeset 81644e0

Timestamp:

Dec 1, 2017, 2:51:50 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:

55d6e8de

Parents:

373d0b5

Message:

Add Indexer::addWith to insert with expression members into current scope

Location:

src/SymTab

Files:

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

src/SymTab/Indexer.cc

@@ -567 +567 @@
         }
 
+        void Indexer::addWith( WithStmt * stmt ) {
+                for ( Expression * expr : stmt->exprs ) {
+                        if ( expr->result ) {
+                                AggregateDecl * aggr = expr->result->getAggr();
+                                assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
+
+                                // xxx - this is wrong, needs to somehow hook up chain of objects
+                                for ( Declaration * decl : aggr->members ) {
+                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                                addId( dwt );
+                                        }
+                                }
+                        }
+                }
+        }
+
         void Indexer::addIds( const std::list< DeclarationWithType * > & decls ) {
                 for ( auto d : decls ) {

src/SymTab/Indexer.h

@@ -76 +76 @@
                 void addTrait( TraitDecl *decl );
 
+                /// adds all of the IDs from WithStmt exprs
+                void addWith( WithStmt * );
+
                 /// convenience function for adding a list of Ids to the indexer
                 void addIds( const std::list< DeclarationWithType * > & decls );