Changeset ae357ec for src/SymTab/Indexer.h

Timestamp:

Mar 8, 2016, 10:25:06 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

5447e09

Parents:

b63e376 (diff), bed4c63e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/SymTab/Indexer.h (modified) (3 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;
+                /// Gets all declarations with the given ID
+                void lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const;
+                /// Gets the top-most type declaration with the given ID
                 NamedTypeDecl *lookupType( const std::string &id ) const;
+                /// Gets the top-most struct declaration with the given ID
                 StructDecl *lookupStruct( const std::string &id ) const;
+                /// Gets the top-most enum declaration with the given ID
                 EnumDecl *lookupEnum( const std::string &id ) const;
+                /// Gets the top-most union declaration with the given ID
                 UnionDecl *lookupUnion( const std::string &id ) const;
+                /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
   
                 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
+                /// looks up a specific mangled ID at the given scope
+                DeclarationWithType *lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
+                /// returns true if there exists a declaration with C linkage and the given name
+                bool hasCDeclWithName( const std::string &id ) 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;
+                
+                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
+                unsigned long scope;  ///< Scope index of this pointer
+                bool doDebug;         ///< Display debugging trace?
+
+                /// 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, uniquely owned by this Indexer, and at the current scope)
+                void makeWritable();
         };
 } // namespace SymTab