Changes in src/SymTab/Indexer.h [6f096d2:e67991f]

File:

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

src/SymTab/Indexer.h

@@ -44 +44 @@
 
                         /// non-null if this declaration is deleted
-                        const BaseSyntaxNode * deleteStmt = nullptr;
+                        const Declaration * deleteStmt = nullptr;
                         /// scope of identifier
                         unsigned long scope = 0;
@@ -51 +51 @@
                         IdData() = default;
                         IdData(
-                                const DeclarationWithType * id, const Expression * baseExpr, const BaseSyntaxNode * deleteStmt,
+                                const DeclarationWithType * id, const Expression * baseExpr, const Declaration * deleteStmt,
                                 unsigned long scope )
                                 : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ), scope( scope ) {}
-                        IdData( const IdData& o, const BaseSyntaxNode * deleteStmt )
+                        IdData( const IdData& o, const Declaration * deleteStmt )
                                 : id( o.id ), baseExpr( o.baseExpr ), deleteStmt( deleteStmt ), scope( o.scope ) {}
 
@@ -83 +83 @@
 
                 void addId( const DeclarationWithType * decl, const Expression * baseExpr = nullptr );
-                void addDeletedId( const DeclarationWithType * decl, const BaseSyntaxNode * deleteStmt );
+                void addDeletedId( const DeclarationWithType * decl, const Declaration * deleteStmt );
 
                 void addType( const NamedTypeDecl * decl );
@@ -94 +94 @@
 
                 /// adds all of the IDs from WithStmt exprs
-                void addWith( const std::list< Expression * > & withExprs, const BaseSyntaxNode * withStmt );
+                void addWith( const std::list< Expression * > & withExprs, const Declaration * withStmt );
 
                 /// convenience function for adding a list of Ids to the indexer
@@ -152 +152 @@
                                 Delete  ///< Delete the earlier version with the delete statement
                         } mode;
-                        const BaseSyntaxNode * deleteStmt;  ///< Statement that deletes this expression
+                        const Declaration * deleteStmt;  ///< Statement that deletes this expression
 
                 private:
                         OnConflict() : mode(Error), deleteStmt(nullptr) {}
-                        OnConflict( const BaseSyntaxNode * d ) : mode(Delete), deleteStmt(d) {}
+                        OnConflict( const Declaration * d ) : mode(Delete), deleteStmt(d) {}
                 public:
                         OnConflict( const OnConflict& ) = default;
 
                         static OnConflict error() { return {}; }
-                        static OnConflict deleteWith( const BaseSyntaxNode * d ) { return { d }; }
+                        static OnConflict deleteWith( const Declaration * d ) { return { d }; }
                 };
 
@@ -167 +167 @@
                 bool addedIdConflicts(
                         const IdData & existing, const DeclarationWithType * added, OnConflict handleConflicts,
-                        const BaseSyntaxNode * deleteStmt );
+                        const Declaration * deleteStmt );
 
                 /// common code for addId, addDeletedId, etc.
                 void addId(const DeclarationWithType * decl, OnConflict handleConflicts,
-                        const Expression * baseExpr = nullptr, const BaseSyntaxNode * deleteStmt = nullptr );
+                        const Expression * baseExpr = nullptr, const Declaration * deleteStmt = nullptr );
 
                 /// adds all of the members of the Aggregate (addWith helper)