Changeset e8032b0 for src/SymTab/Indexer.h

Timestamp:

Mar 8, 2016, 1:51:25 PM (10 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:

52c2a72

Parents:

4e284ea6

Message:

Switch Indexer over to copy-on-write semantics for dramatic speedup

File:

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

src/SymTab/Indexer.h

@@ -21 +21 @@
 
 #include "SynTree/Visitor.h"
-#include "IdTable.h"
-#include "AggregateTable.h"
-#include "TypeTable.h"
 
 namespace SymTab {
@@ -29 +26 @@
           public:
                 Indexer( bool useDebug = false );
+
+                Indexer( const Indexer &that );
+                Indexer( Indexer &&that );
                 virtual ~Indexer();
+                Indexer& operator= ( const Indexer &that );
+                Indexer& operator= ( Indexer &&that );
 
                 //using Visitor::visit;
@@ -78 +80 @@
                 void leaveScope();
 
-                void lookupId( const std::string &id, std::list< DeclarationWithType* >& ) const;
-                DeclarationWithType* lookupId( const std::string &id) const;
+                void lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const;
+                DeclarationWithType* lookupId( const std::string &id ) const;
                 NamedTypeDecl *lookupType( const std::string &id ) const;
                 StructDecl *lookupStruct( const std::string &id ) const;
@@ -88 +90 @@
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
-                IdTable idTable;
-                TypeTable typeTable;
-                StructTable structTable;
-                EnumTable enumTable;
-                UnionTable unionTable;
-                TraitTable contextTable;
-  
-                bool doDebug;                                   // display debugging trace
+                void addId( DeclarationWithType *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 );
+                
+                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 ) {}
+
+                /// Takes a new ref to a table (returns null if null)
+                static Impl *newRef( Impl *toClone );
+                /// Clears a ref to a table (does nothing if null)
+                static void deleteRef( Impl *toFree );
+
+                /// Ensures that tables variable is writable (i.e. allocated and uniquely owned by this Indexer)
+                void makeWritable();
         };
 } // namespace SymTab