Changeset ef5b828 for src/SymTab/Indexer.h

Timestamp:

Jul 12, 2019, 1:35:58 PM (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:

fce4e31

Parents:

7870799

Message:

Indexer now has const lookup by default

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();
@@ -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( 
+                        IdData(
                                 DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt,
-                                unsigned long scope ) 
+                                unsigned long scope )
                                 : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ), scope( scope ) {}
                         IdData( const IdData& o, BaseSyntaxNode * deleteStmt )
@@ -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;
+                NamedTypeDecl * lookupMutableType( 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;
+                StructDecl * lookupMutableStruct( 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;
+                EnumDecl * lookupMutableEnum( 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;
+                UnionDecl * lookupMutableUnion( 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;
+                TraitDecl * lookupMutableTrait( 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 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( 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 );
 
                 /// adds all of the IDs from WithStmt exprs
@@ -106 +111 @@
 
           private:
-                /// Wraps a Decl* with a scope
+                /// Wraps a Decl * with a scope
                 template<typename Decl>
                 struct Scoped {
-                        Decl* decl;           ///< declaration
+                        Decl * decl;           ///< declaration
                         unsigned long scope;  ///< scope of this declaration
 
-                        Scoped(Decl* d, unsigned long s) : decl(d), scope(s) {}
+                        Scoped(Decl * d, unsigned long s) : decl(d), scope(s) {}
                 };
 
@@ -140 +145 @@
 
                 /// 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 );
@@ -166 +171 @@
                 /// true if the existing identifier conflicts with the added identifier
                 bool addedIdConflicts(
-                        const IdData& existing, DeclarationWithType * added, OnConflict handleConflicts, 
+                        const IdData& existing, DeclarationWithType * added, OnConflict handleConflicts,
                         BaseSyntaxNode * deleteStmt );
 
                 /// common code for addId, addDeletedId, etc.
-                void addId( 
-                        DeclarationWithType * decl, OnConflict handleConflicts, 
+                void addId(
+                        DeclarationWithType * decl, OnConflict handleConflicts,
                         Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
 
@@ -178 +183 @@
 
                 /// 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