Changeset 52c2a72 for src/SymTab/Indexer.h

Timestamp:

Mar 8, 2016, 4:28:40 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

bed4c63e

Parents:

e8032b0

Message:

Fold StackTable? variants into indexer

File:

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

src/SymTab/Indexer.h

@@ -90 +90 @@
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
+                // 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;
+                
                 void addId( DeclarationWithType *decl );
                 void addType( NamedTypeDecl *decl );
@@ -100 +107 @@
                 
                 struct Impl;
-                Impl *tables;  ///< Copy-on-write instance of table data structure
-                bool doDebug;  ///< Display debugging trace?
-
-                Indexer( Impl *_tables, bool _doDebug ) : tables( _tables ), doDebug( _doDebug ) {}
+                Impl *tables;         ///< Copy-on-write instance of table data structure
+                unsigned long scope;  ///< Scope index of this pointer
+                bool doDebug;         ///< Display debugging trace?
 
                 /// Takes a new ref to a table (returns null if null)
@@ -110 +116 @@
                 static void deleteRef( Impl *toFree );
 
-                /// Ensures that tables variable is writable (i.e. allocated and uniquely owned by this Indexer)
+                /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
                 void makeWritable();
         };