Changeset 933f32f for src/SymTab/Indexer.h

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

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

src/SymTab/Indexer.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:38:55 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 17 16:09:12 2017
-// Update Count     : 8
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Mar  8 13:55:00 2019
+// Update Count     : 9
 //
 
 #pragma once
 
-#include <iosfwd>             // for ostream
-#include <list>               // for list
-#include <string>             // for string
-#include <functional>         // for function
+#include <functional>              // for function
+#include <list>                    // for list
+#include <memory>                  // for shared_ptr, enable_shared_from_this
+#include <string>                  // for string
 
-#include "SynTree/Visitor.h"  // for Visitor
-#include "SynTree/SynTree.h"  // for AST nodes
+#include "Common/PersistentMap.h"  // for PersistentMap
+#include "SynTree/SynTree.h"       // for AST nodes
 
 namespace ResolvExpr {
-class Cost;
+        class Cost;
 }
 
 namespace SymTab {
-        class Indexer {
-          public:
+        class Indexer : public std::enable_shared_from_this<SymTab::Indexer> {
+        public:
                 explicit Indexer();
+                virtual ~Indexer();
 
-                Indexer( const Indexer &that );
-                Indexer( Indexer &&that );
-                virtual ~Indexer();
-                Indexer& operator= ( const Indexer &that );
-                Indexer& operator= ( Indexer &&that );
-
-                // 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();
@@ -50 +45 @@
                         /// non-null if this declaration is deleted
                         BaseSyntaxNode * deleteStmt = nullptr;
+                        /// scope of identifier
+                        unsigned long scope = 0;
 
                         // NOTE: shouldn't need either of these constructors, but gcc-4 does not properly support initializer lists with default members.
                         IdData() = default;
-                        IdData( DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ) {}
+                        IdData( 
+                                DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt,
+                                unsigned long scope ) 
+                                : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ), scope( scope ) {}
+                        IdData( const IdData& o, BaseSyntaxNode * deleteStmt )
+                                : id( o.id ), baseExpr( o.baseExpr ), deleteStmt( deleteStmt ), scope( o.scope ) {}
 
                         Expression * combine( ResolvExpr::Cost & cost ) const;
@@ -80 +82 @@
                 EnumDecl *globalLookupEnum( const std::string &id ) const;
 
-                void print( std::ostream &os, int indent = 0 ) const;
-
-                /// looks up a specific mangled ID at the given scope
-                IdData * lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope );
-                const IdData * 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;
-
-                typedef std::function<bool(IdData &, const std::string &)> ConflictFunction;
-
                 void addId( DeclarationWithType * decl, Expression * baseExpr = nullptr );
                 void addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt );
@@ -112 +96 @@
                 void addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt );
 
-                /// adds all of the members of the Aggregate (addWith helper)
-                void addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction );
-
                 /// convenience function for adding a list of Ids to the indexer
                 void addIds( const std::list< DeclarationWithType * > & decls );
@@ -124 +105 @@
                 void addFunctionType( FunctionType * ftype );
 
-                bool doDebug = false; ///< Display debugging trace?
           private:
-                struct Impl;
+                /// Wraps a Decl* with a scope
+                template<typename Decl>
+                struct Scoped {
+                        Decl* decl;           ///< declaration
+                        unsigned long scope;  ///< scope of this declaration
 
-                Impl *tables;         ///< Copy-on-write instance of table data structure
-                unsigned long scope;  ///< Scope index of this pointer
+                        Scoped(Decl* d, unsigned long s) : decl(d), scope(s) {}
+                };
 
-                /// 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 );
+                using Ptr = std::shared_ptr<const Indexer>;
 
-                // Removes matching autogenerated constructors and destructors
-                // so that they will not be selected
-                // void removeSpecialOverrides( FunctionDecl *decl );
-                void removeSpecialOverrides( const std::string &id, std::list< IdData > & out ) const;
+                using MangleTable = PersistentMap< std::string, IdData >;
+                using IdTable = PersistentMap< std::string, MangleTable::Ptr >;
+                using TypeTable = PersistentMap< std::string, Scoped<NamedTypeDecl> >;
+                using StructTable = PersistentMap< std::string, Scoped<StructDecl> >;
+                using EnumTable = PersistentMap< std::string, Scoped<EnumDecl> >;
+                using UnionTable = PersistentMap< std::string, Scoped<UnionDecl> >;
+                using TraitTable = PersistentMap< std::string, Scoped<TraitDecl> >;
 
-                /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
-                void makeWritable();
+                IdTable::Ptr idTable;          ///< identifier namespace
+                TypeTable::Ptr typeTable;      ///< type namespace
+                StructTable::Ptr structTable;  ///< struct namespace
+                EnumTable::Ptr enumTable;      ///< enum namespace
+                UnionTable::Ptr unionTable;    ///< union namespace
+                TraitTable::Ptr traitTable;    ///< trait namespace
+
+                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
+                const Indexer* atScope( unsigned long scope ) const;
+
+                /// Removes matching autogenerated constructors and destructors so that they will not be 
+                /// selected. If returns false, passed decl should not be added.
+                bool removeSpecialOverrides( IdData& decl, MangleTable::Ptr& mangleTable );
+
+                /// Options for handling identifier conflicts
+                struct OnConflict {
+                        enum {
+                                Error,  ///< Throw a semantic error
+                                Delete  ///< Delete the earlier version with the delete statement
+                        } mode;
+                        BaseSyntaxNode * deleteStmt;  ///< Statement that deletes this expression
+
+                private:
+                        OnConflict() : mode(Error), deleteStmt(nullptr) {}
+                        OnConflict( BaseSyntaxNode * d ) : mode(Delete), deleteStmt(d) {}
+                public:
+                        OnConflict( const OnConflict& ) = default;
+
+                        static OnConflict error() { return {}; }
+                        static OnConflict deleteWith( BaseSyntaxNode * d ) { return { d }; }
+                };
+
+                /// true if the existing identifier conflicts with the added identifier
+                bool addedIdConflicts(
+                        const IdData& existing, DeclarationWithType * added, OnConflict handleConflicts, 
+                        BaseSyntaxNode * deleteStmt );
 
                 /// common code for addId, addDeletedId, etc.
-                void addId( DeclarationWithType * decl, ConflictFunction, Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
+                void addId( 
+                        DeclarationWithType * decl, OnConflict handleConflicts, 
+                        Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
+
+                /// adds all of the members of the Aggregate (addWith helper)
+                void addMembers( AggregateDecl * aggr, Expression * expr, OnConflict handleConflicts );
+
+                /// 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 ) 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 ) const;
         };
 } // namespace SymTab