Changeset 9a7a3b6

Timestamp:

Jun 19, 2018, 2:13:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c194661

Parents:

47498bd

git-author:

Rob Schluntz <rschlunt@…> (06/19/18 14:13:29)

git-committer:

Rob Schluntz <rschlunt@…> (06/19/18 14:13:34)

Message:

Fix lookup{SUE}AtScope? functions to look in only a specific scope and provide lookupAtGlobalScope functions

Location:

src/SymTab

Files:

• Indexer.cc (modified) (6 diffs)
• Indexer.h (modified) (1 diff)

src/SymTab/Indexer.cc

@@ -272 +272 @@
         }
 
+        StructDecl *Indexer::globalLookupStruct( const std::string &id ) const {
+                return lookupStructAtScope( id, 0 );
+        }
+
+        UnionDecl *Indexer::globalLookupUnion( const std::string &id ) const {
+                return lookupUnionAtScope( id, 0 );
+        }
+
+        EnumDecl *Indexer::globalLookupEnum( const std::string &id ) const {
+                return lookupEnumAtScope( id, 0 );
+        }
+
         EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
                 if ( ! tables ) return 0;
@@ -347 +359 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTypeAtScope( id, scope );
 
                 TypeTable::const_iterator ret = tables->typeTable.find( id );
@@ -355 +368 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupStructAtScope( id, scope );
 
                 StructTable::const_iterator ret = tables->structTable.find( id );
@@ -363 +377 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupEnumAtScope( id, scope );
 
                 EnumTable::const_iterator ret = tables->enumTable.find( id );
@@ -371 +386 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupUnionAtScope( id, scope );
 
                 UnionTable::const_iterator ret = tables->unionTable.find( id );
@@ -379 +395 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTraitAtScope( id, scope );
 
                 TraitTable::const_iterator ret = tables->traitTable.find( id );

src/SymTab/Indexer.h

@@ -70 +70 @@
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( 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;