Changeset 2cb70aa

Timestamp:

Jan 31, 2018, 4:42:38 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

84276ba

Parents:

5e2c348

Message:

Move Indexer unnamed object check into addId

Location:

src

Files:

• Common/PassVisitor.impl.h (modified) (4 diffs)
• SymTab/Indexer.cc (modified) (1 diff)

src/Common/PassVisitor.impl.h

@@ -365 +365 @@
         maybeAccept_impl   ( node->attributes   , *this );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
+        indexerAddId( node );
 
         VISIT_END( node );
@@ -381 +379 @@
         maybeMutate_impl   ( node->attributes   , *this );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
+        indexerAddId( node );
 
         MUTATE_END( DeclarationWithType, node );
@@ -394 +390 @@
         VISIT_START( node );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
-
-        {
+        indexerAddId( node );
+
+        {
+                // with clause introduces a level of scope (for the with expression members).
+                // with clause exprs are added to the indexer before parameters so that parameters
+                // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 // implicit add __func__ identifier as specified in the C manual 6.4.2.2
@@ -419 +416 @@
         MUTATE_START( node );
 
-        if ( node->name != "" ) {
-                indexerAddId( node );
-        }
-
-        {
+        indexerAddId( node );
+
+        {
+                // with clause introduces a level of scope (for the with expression members).
+                // with clause exprs are added to the indexer before parameters so that parameters
+                // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 // implicit add __func__ identifier as specified in the C manual 6.4.2.2

src/SymTab/Indexer.cc

@@ -409 +409 @@
 
         void Indexer::addId( DeclarationWithType *decl, Expression * baseExpr ) {
+                if ( decl->name == "" ) return;
                 debugPrint( "Adding Id " << decl->name << std::endl );
                 makeWritable();