Changeset 90152a4 for src/SymTab/Indexer.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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) (6 diffs)

src/SymTab/Indexer.h

@@ -19 +19 @@
 #include <list>               // for list
 #include <string>             // for string
+#include <functional>         // for function
 
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for AST nodes
+
+namespace ResolvExpr {
+class Cost;
+}
 
 namespace SymTab {
@@ -40 +45 @@
 
                 struct IdData {
-                        DeclarationWithType * id;
-                        Expression * baseExpr; // WithExpr
+                        DeclarationWithType * id = nullptr;
+                        Expression * baseExpr = nullptr; // WithExpr
 
-                        Expression * combine() const;
+                        /// non-null if this declaration is deleted
+                        BaseSyntaxNode * deleteStmt = nullptr;
+
+                        // 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 ) {}
+
+                        Expression * combine( ResolvExpr::Cost & cost ) const;
                 };
 
@@ -59 +71 @@
                 TraitDecl *lookupTrait( const std::string &id ) const;
 
+                /// Gets the type declaration with the given ID at global scope
+                NamedTypeDecl *globalLookupType( const std::string &id ) const;
+                /// Gets the struct declaration with the given ID at global scope
+                StructDecl *globalLookupStruct( const std::string &id ) const;
+                /// Gets the union declaration with the given ID at global scope
+                UnionDecl *globalLookupUnion( const std::string &id ) const;
+                /// Gets the enum declaration with the given ID at global scope
+                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
-                DeclarationWithType *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 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;
@@ -74 +96 @@
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
 
-                void addId( DeclarationWithType *decl, Expression * baseExpr = nullptr );
+                typedef std::function<bool(IdData &, const std::string &)> ConflictFunction;
+
+                void addId( DeclarationWithType * decl, Expression * baseExpr = nullptr );
+                void addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt );
+
                 void addType( NamedTypeDecl *decl );
                 void addStruct( const std::string &id );
@@ -84 +110 @@
 
                 /// adds all of the IDs from WithStmt exprs
-                void addWith( WithStmt * );
+                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
@@ -114 +143 @@
                 /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
                 void makeWritable();
+
+                /// common code for addId, addDeletedId, etc.
+                void addId( DeclarationWithType * decl, ConflictFunction, Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
         };
 } // namespace SymTab