Changeset e67991f for src/AST/SymbolTable.hpp

Timestamp:

Jul 16, 2019, 10:38:32 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6f15121

Parents:

7dc2e57b

Message:

WithStmt? is now a Declaration

File:

• src/AST/SymbolTable.hpp (modified) (7 diffs)

src/AST/SymbolTable.hpp

@@ -37 +37 @@
                 readonly<DeclWithType> id = nullptr;  ///< Identifier of declaration
                 readonly<Expr> baseExpr = nullptr;    ///< Implied containing aggregate (from WithExpr)
-                readonly<Node> deleter = nullptr;     ///< Node deleting this declaration (if non-null)
+                readonly<Decl> deleter = nullptr;     ///< Node deleting this declaration (if non-null)
                 unsigned long scope = 0;              ///< Scope of identifier
 
                 IdData() = default;
-                IdData( const DeclWithType * i, const Expr * base, const Node * del, unsigned long s ) 
+                IdData( const DeclWithType * i, const Expr * base, const Decl * del, unsigned long s )
                 : id( i ), baseExpr( base ), deleter( del ), scope( s ) {}
-                
+
                 /// Modify an existing node with a new deleter
-                IdData( const IdData & o, const Node * del )
+                IdData( const IdData & o, const Decl * del )
                 : id( o.id ), baseExpr( o.baseExpr ), deleter( del ), scope( o.scope ) {}
 
@@ -58 +58 @@
         struct scoped {
                 readonly<D> decl;     ///< wrapped declaration
-                unsigned long scope;  ///< scope of this declaration 
+                unsigned long scope;  ///< scope of this declaration
 
                 scoped(const D * d, unsigned long s) : decl(d), scope(s) {}
@@ -88 +88 @@
         ~SymbolTable();
 
-        // when using an indexer manually (e.g., within a mutator traversal), it is necessary to 
+        // when using an indexer manually (e.g., within a mutator traversal), it is necessary to
         // tell the indexer explicitly when scopes begin and end
         void enterScope();
@@ -118 +118 @@
         void addId( const DeclWithType * decl, const Expr * baseExpr = nullptr );
         /// Adds a deleted identifier declaration to the symbol table
-        void addDeletedId( const DeclWithType * decl, const Node * deleter );
+        void addDeletedId( const DeclWithType * decl, const Decl * deleter );
 
         /// Adds a type to the symbol table
@@ -136 +136 @@
 
         /// adds all of the IDs from WithStmt exprs
-        void addWith( const std::vector< ptr<Expr> > & withExprs, const Node * withStmt );
+        void addWith( const std::vector< ptr<Expr> > & withExprs, const Decl * withStmt );
 
         /// convenience function for adding a list of Ids to the indexer
@@ -154 +154 @@
         const SymbolTable * atScope( unsigned long i ) const;
 
-        /// Removes matching autogenerated constructors and destructors so that they will not be 
+        /// Removes matching autogenerated constructors and destructors so that they will not be
         /// selected. If returns false, passed decl should not be added.
         bool removeSpecialOverrides( IdData & decl, MangleTable::Ptr & mangleTable );
@@ -164 +164 @@
                         Delete  ///< Delete the earlier version with the delete statement
                 } mode;
-                const Node * deleter;  ///< Statement that deletes this expression
+                const Decl * deleter;  ///< Statement that deletes this expression
 
         private:
                 OnConflict() : mode(Error), deleter(nullptr) {}
-                OnConflict( const Node * d ) : mode(Delete), deleter(d) {}
+                OnConflict( const Decl * d ) : mode(Delete), deleter(d) {}
         public:
                 OnConflict( const OnConflict& ) = default;
 
                 static OnConflict error() { return {}; }
-                static OnConflict deleteWith( const Node * d ) { return { d }; }
+                static OnConflict deleteWith( const Decl * d ) { return { d }; }
         };
 
         /// true if the existing identifier conflicts with the added identifier
         bool addedIdConflicts(
-                const IdData & existing, const DeclWithType * added, OnConflict handleConflicts, 
-                const Node * deleter );
+                const IdData & existing, const DeclWithType * added, OnConflict handleConflicts,
+                const Decl * deleter );
 
         /// common code for addId, addDeletedId, etc.
-        void addId( 
-                const DeclWithType * decl, OnConflict handleConflicts, const Expr * baseExpr = nullptr, 
-                const Node * deleter = nullptr );
+        void addId(
+                const DeclWithType * decl, OnConflict handleConflicts, const Expr * baseExpr = nullptr,
+                const Decl * deleter = nullptr );
 
         /// adds all of the members of the Aggregate (addWith helper)