Changes in src/SymTab/Indexer.h [4670c79:0ac366b]

File:

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

src/SymTab/Indexer.h

@@ -19 +19 @@
 #include <list>               // for list
 #include <string>             // for string
+#include <functional>         // for function
 
 #include "SynTree/Visitor.h"  // for Visitor
@@ -40 +41 @@
 
                 struct IdData {
-                        DeclarationWithType * id;
-                        Expression * baseExpr; // WithExpr
+                        DeclarationWithType * id = nullptr;
+                        Expression * baseExpr = nullptr; // WithExpr
+
+                        /// non-null if this declaration is deleted
+                        BaseSyntaxNode * deleteStmt = nullptr;
 
                         Expression * combine() const;
@@ -62 +66 @@
 
                 /// looks up a specific mangled ID at the given scope
-                DeclarationWithType *lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
+                IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope );
+                const IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
                 /// returns true if there exists a declaration with C linkage and the given name with a different mangled name
                 bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
@@ -74 +79 @@
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
 
-                void addId( DeclarationWithType *decl, Expression * baseExpr = nullptr );
+                typedef std::function<bool(IdData &, const std::string &)> ConflictFunction;
+
+                void addId( DeclarationWithType * decl, Expression * baseExpr = nullptr );
+                void addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt );
+
                 void addType( NamedTypeDecl *decl );
                 void addStruct( const std::string &id );
@@ -84 +93 @@
 
                 /// adds all of the IDs from WithStmt exprs
-                void addWith( std::list< Expression * > & withExprs );
+                void addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt );
 
                 /// adds all of the members of the Aggregate (addWith helper)
-                void addMembers( AggregateDecl * aggr, Expression * expr );
+                void addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction );
 
                 /// convenience function for adding a list of Ids to the indexer
@@ -117 +126 @@
                 /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
                 void makeWritable();
+
+                /// common code for addId, addDeletedId, etc.
+                void addId( DeclarationWithType * decl, ConflictFunction, Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
         };
 } // namespace SymTab