Changeset b419abb for src/SymTab/Indexer.h

Timestamp:

Mar 15, 2019, 2:22:25 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

fdae913

Parents:

b8665e3

Message:

Lazy scope initialization for indexer

File:

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

src/SymTab/Indexer.h

@@ -17 +17 @@
 
 #include <functional>              // for function
-#include <iosfwd>                  // for ostream
 #include <list>                    // for list
 #include <memory>                  // for shared_ptr, enable_shared_from_this
@@ -35 +34 @@
                 virtual ~Indexer();
 
-                // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer
-                // explicitly when scopes begin and end
+                // 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();
                 void leaveScope();
@@ -74 +73 @@
                 TraitDecl *lookupTrait( const std::string &id ) const;
 
-                // void print( std::ostream &os, int indent = 0 ) const;
-
-                /// looks up a specific mangled ID in local scope only
-                // IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope );
-                // const IdData * localLookupId( const std::string &id, const std::string &mangleName ) const;
-                // equivalents to lookup functions that only look at tables at scope `scope` (which should be >= tables->scope)
-                // NamedTypeDecl *lookupTypeAtScope( const std::string &id, unsigned long scope ) const;
-                // StructDecl *lookupStructAtScope( const std::string &id, unsigned long scope ) const;
-                // EnumDecl *lookupEnumAtScope( const std::string &id, unsigned long scope ) const;
-                // UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
-                // TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
-
                 /// Gets the type declaration with the given ID at global scope
                 NamedTypeDecl *globalLookupType( const std::string &id ) const;
@@ -118 +105 @@
                 void addFunctionType( FunctionType * ftype );
 
-                // bool doDebug = false; ///< Display debugging trace?
           private:
                 /// Wraps a Decl* with a scope
@@ -148 +134 @@
                 Ptr prevScope;                 ///< reference to indexer for parent scope
                 unsigned long scope;           ///< Scope index of this indexer
+                unsigned long repScope;        ///< Scope index of currently represented scope
+
+                /// Ensures that a proper backtracking scope exists before a mutation
+                void lazyInitScope();
 
                 /// Gets the indexer at the given scope