Changes in src/SymTab/Indexer.h [114bde6:e67991f]

File:

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

src/SymTab/Indexer.h

@@ -34 +34 @@
                 virtual ~Indexer();
 
-                // 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();
@@ -40 +40 @@
 
                 struct IdData {
-                        DeclarationWithType * id = nullptr;
-                        Expression * baseExpr = nullptr; // WithExpr
+                        const DeclarationWithType * id = nullptr;
+                        const Expression * baseExpr = nullptr; // WithExpr
 
                         /// non-null if this declaration is deleted
-                        BaseSyntaxNode * deleteStmt = nullptr;
+                        const Declaration * deleteStmt = nullptr;
                         /// scope of identifier
                         unsigned long scope = 0;
@@ -50 +50 @@
                         // NOTE: shouldn't need either of these constructors, but gcc-4 does not properly support initializer lists with default members.
                         IdData() = default;
-                        IdData( 
-                                DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt,
-                                unsigned long scope ) 
+                        IdData(
+                                const DeclarationWithType * id, const Expression * baseExpr, const Declaration * deleteStmt,
+                                unsigned long scope )
                                 : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ), scope( scope ) {}
-                        IdData( const IdData& o, BaseSyntaxNode * deleteStmt )
+                        IdData( const IdData& o, const Declaration * deleteStmt )
                                 : id( o.id ), baseExpr( o.baseExpr ), deleteStmt( deleteStmt ), scope( o.scope ) {}
 
@@ -61 +61 @@
 
                 /// 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< IdData > &out ) const;
                 /// Gets the top-most type declaration with the given ID
-                NamedTypeDecl *lookupType( const std::string &id ) const;
+                const NamedTypeDecl * lookupType( const std::string & id ) const;
                 /// Gets the top-most struct declaration with the given ID
-                StructDecl *lookupStruct( const std::string &id ) const;
+                const StructDecl * lookupStruct( const std::string & id ) const;
                 /// Gets the top-most enum declaration with the given ID
-                EnumDecl *lookupEnum( const std::string &id ) const;
+                const EnumDecl * lookupEnum( const std::string & id ) const;
                 /// Gets the top-most union declaration with the given ID
-                UnionDecl *lookupUnion( const std::string &id ) const;
+                const UnionDecl * lookupUnion( const std::string & id ) const;
                 /// Gets the top-most trait declaration with the given ID
-                TraitDecl *lookupTrait( const std::string &id ) const;
+                const TraitDecl * lookupTrait( const std::string & id ) const;
 
                 /// Gets the type declaration with the given ID at global scope
-                NamedTypeDecl *globalLookupType( const std::string &id ) const;
+                const NamedTypeDecl * globalLookupType( const std::string & id ) const;
                 /// Gets the struct declaration with the given ID at global scope
-                StructDecl *globalLookupStruct( const std::string &id ) const;
+                const StructDecl * globalLookupStruct( const std::string & id ) const;
                 /// Gets the union declaration with the given ID at global scope
-                UnionDecl *globalLookupUnion( const std::string &id ) const;
+                const UnionDecl * globalLookupUnion( const std::string & id ) const;
                 /// Gets the enum declaration with the given ID at global scope
-                EnumDecl *globalLookupEnum( const std::string &id ) const;
+                const EnumDecl * globalLookupEnum( const std::string & id ) const;
 
-                void addId( DeclarationWithType * decl, Expression * baseExpr = nullptr );
-                void addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt );
+                void addId( const DeclarationWithType * decl, const Expression * baseExpr = nullptr );
+                void addDeletedId( const DeclarationWithType * decl, const Declaration * deleteStmt );
 
-                void addType( NamedTypeDecl *decl );
-                void addStruct( const std::string &id );
-                void addStruct( StructDecl *decl );
-                void addEnum( EnumDecl *decl );
-                void addUnion( const std::string &id );
-                void addUnion( UnionDecl *decl );
-                void addTrait( TraitDecl *decl );
+                void addType( const NamedTypeDecl * decl );
+                void addStruct( const std::string & id );
+                void addStruct( const StructDecl * decl );
+                void addEnum( const EnumDecl * decl );
+                void addUnion( const std::string & id );
+                void addUnion( const UnionDecl * decl );
+                void addTrait( const TraitDecl * decl );
 
                 /// adds all of the IDs from WithStmt exprs
-                void addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt );
+                void addWith( const std::list< Expression * > & withExprs, const Declaration * withStmt );
 
                 /// convenience function for adding a list of Ids to the indexer
@@ -103 +103 @@
 
                 /// convenience function for adding all of the declarations in a function type to the indexer
-                void addFunctionType( FunctionType * ftype );
+                void addFunctionType( const FunctionType * ftype );
 
           private:
-                /// Wraps a Decl* with a scope
+                /// Wraps a Decl * with a scope
                 template<typename Decl>
                 struct Scoped {
-                        Decl* decl;           ///< declaration
+                        const Decl * decl;           ///< declaration
                         unsigned long scope;  ///< scope of this declaration
 
-                        Scoped(Decl* d, unsigned long s) : decl(d), scope(s) {}
+                        Scoped(const Decl * d, unsigned long s) : decl(d), scope(s) {}
                 };
 
@@ -140 +140 @@
 
                 /// Gets the indexer at the given scope
-                const Indexer* atScope( unsigned long scope ) const;
+                const Indexer * atScope( unsigned long scope ) 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 );
+                bool removeSpecialOverrides( IdData & decl, MangleTable::Ptr & mangleTable );
 
                 /// Options for handling identifier conflicts
@@ -152 +152 @@
                                 Delete  ///< Delete the earlier version with the delete statement
                         } mode;
-                        BaseSyntaxNode * deleteStmt;  ///< Statement that deletes this expression
+                        const Declaration * deleteStmt;  ///< Statement that deletes this expression
 
                 private:
                         OnConflict() : mode(Error), deleteStmt(nullptr) {}
-                        OnConflict( 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( BaseSyntaxNode * d ) { return { d }; }
+                        static OnConflict deleteWith( const Declaration * d ) { return { d }; }
                 };
 
                 /// true if the existing identifier conflicts with the added identifier
                 bool addedIdConflicts(
-                        const IdData& existing, DeclarationWithType * added, OnConflict handleConflicts, 
-                        BaseSyntaxNode * deleteStmt );
+                        const IdData & existing, const DeclarationWithType * added, OnConflict handleConflicts,
+                        const Declaration * deleteStmt );
 
                 /// common code for addId, addDeletedId, etc.
-                void addId( 
-                        DeclarationWithType * decl, OnConflict handleConflicts, 
-                        Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
+                void addId(const DeclarationWithType * decl, OnConflict handleConflicts,
+                        const Expression * baseExpr = nullptr, const Declaration * deleteStmt = nullptr );
 
                 /// adds all of the members of the Aggregate (addWith helper)
-                void addMembers( AggregateDecl * aggr, Expression * expr, OnConflict handleConflicts );
+                void addMembers( const AggregateDecl * aggr, const Expression * expr, OnConflict handleConflicts );
 
                 /// returns true if there exists a declaration with C linkage and the given name with the same mangled name
-                bool hasCompatibleCDecl( const std::string &id, const std::string &mangleName ) const;
+                bool hasCompatibleCDecl( const std::string & id, const std::string & mangleName ) 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 ) const;
+                bool hasIncompatibleCDecl( const std::string & id, const std::string & mangleName ) const;
         };
 } // namespace SymTab