Changeset c13e8dc8 for src/SymTab/Indexer.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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' into cleanup-dtors

File:

• src/SymTab/Indexer.h (modified) (4 diffs)

src/SymTab/Indexer.h

@@ -39 +39 @@
                 void leaveScope();
 
+                struct IdData {
+                        DeclarationWithType * id;
+                        Expression * baseExpr; // WithExpr
+
+                        Expression * combine() const;
+                };
+
                 /// Gets all declarations with the given ID
-                void lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const;
+                void lookupId( const std::string &id, std::list< IdData > &out ) const;
                 /// Gets the top-most type declaration with the given ID
                 NamedTypeDecl *lookupType( const std::string &id ) const;
@@ -67 +74 @@
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
 
-                void addId( DeclarationWithType *decl );
+                void addId( DeclarationWithType *decl, Expression * baseExpr = nullptr );
                 void addType( NamedTypeDecl *decl );
                 void addStruct( const std::string &id );
@@ -75 +82 @@
                 void addUnion( UnionDecl *decl );
                 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
@@ -100 +110 @@
                 // so that they will not be selected
                 // void removeSpecialOverrides( FunctionDecl *decl );
-                void removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const;
+                void removeSpecialOverrides( const std::string &id, std::list< IdData > & out ) const;
 
                 /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)