Changes in src/SymTab/Indexer.h [8884112:d0d9610]

File:

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

src/SymTab/Indexer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.h --
+// Indexer.h -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:38:55 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:34:14 2016
-// Update Count     : 6
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Sep 17 16:05:38 2015
+// Update Count     : 5
 //
 
@@ -21 +21 @@
 
 #include "SynTree/Visitor.h"
+#include "IdTable.h"
+#include "AggregateTable.h"
+#include "TypeTable.h"
 
 namespace SymTab {
@@ -26 +29 @@
           public:
                 Indexer( bool useDebug = false );
+                virtual ~Indexer();
 
-                Indexer( const Indexer &that );
-                Indexer( Indexer &&that );
-                virtual ~Indexer();
-                Indexer& operator= ( const Indexer &that );
-                Indexer& operator= ( Indexer &&that );
-
-                using Visitor::visit;
+                //using Visitor::visit;
                 virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( FunctionDecl *functionDecl );
@@ -41 +39 @@
                 virtual void visit( UnionDecl *aggregateDecl );
                 virtual void visit( EnumDecl *aggregateDecl );
-                virtual void visit( TraitDecl *aggregateDecl );
+                virtual void visit( ContextDecl *aggregateDecl );
 
                 virtual void visit( CompoundStmt *compoundStmt );
@@ -54 +52 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr );
+                virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
-                virtual void visit( AlignofExpr *alignofExpr );
-                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
-                virtual void visit( OffsetofExpr *offsetofExpr );
-                virtual void visit( OffsetPackExpr *offsetPackExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
@@ -70 +64 @@
                 virtual void visit( UntypedValofExpr *valofExpr );
 
-                virtual void visit( TraitInstType *contextInst );
+                virtual void visit( ContextInstType *contextInst );
                 virtual void visit( StructInstType *contextInst );
                 virtual void visit( UnionInstType *contextInst );
@@ -81 +75 @@
                 void leaveScope();
 
-                /// 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
+                void lookupId( const std::string &id, std::list< DeclarationWithType* >& ) const;
+                DeclarationWithType* lookupId( const std::string &id) const;
                 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;
-
+                ContextDecl *lookupContext( const std::string &id ) const;
+  
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
-                /// 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 with a different mangled name
-                bool hasIncompatibleCDecl( 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 with the same mangled name
-                bool hasCompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) 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();
+                IdTable idTable;
+                TypeTable typeTable;
+                StructTable structTable;
+                EnumTable enumTable;
+                UnionTable unionTable;
+                ContextTable contextTable;
+  
+                bool doDebug;                                   // display debugging trace
         };
 } // namespace SymTab