Changes in src/SymTab/Indexer.h [a40d503:5fe35d6]

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