Changes in src/Common/PassVisitor.impl.h [bc6f918:73367a8]

File:

• src/Common/PassVisitor.impl.h (modified) (7 diffs)

src/Common/PassVisitor.impl.h

@@ -365 +365 @@
         maybeAccept_impl   ( node->attributes   , *this );
 
-        indexerAddId( node );
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
 
         VISIT_END( node );
@@ -379 +381 @@
         maybeMutate_impl   ( node->attributes   , *this );
 
-        indexerAddId( node );
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
 
         MUTATE_END( DeclarationWithType, node );
@@ -390 +394 @@
         VISIT_START( node );
 
-        indexerAddId( node );
-
-        maybeAccept_impl( node->withExprs, *this );
-        {
-                // 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(); } );
-                indexerAddWith( node->withExprs );
-                {
-                        auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                        // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                        static ObjectDecl func(
-                                "__func__", noStorageClasses, LinkageSpec::C, nullptr,
-                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
-                                nullptr
-                        );
-                        indexerAddId( &func );
-                        maybeAccept_impl( node->type, *this );
-                        maybeAccept_impl( node->statements, *this );
-                        maybeAccept_impl( node->attributes, *this );
-                }
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
+
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                static ObjectDecl func(
+                        "__func__", noStorageClasses, LinkageSpec::C, nullptr,
+                        new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
+                        nullptr
+                );
+                indexerAddId( &func );
+                maybeAccept_impl( node->type, *this );
+                maybeAccept_impl( node->statements, *this );
+                maybeAccept_impl( node->attributes, *this );
         }
 
@@ -421 +419 @@
         MUTATE_START( 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(); } );
-                indexerAddWith( node->withExprs );
-                {
-                        auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                        // implicit add __func__ identifier as specified in the C manual 6.4.2.2
-                        static ObjectDecl func(
-                                "__func__", noStorageClasses, LinkageSpec::C, nullptr,
-                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
-                                nullptr
-                        );
-                        indexerAddId( &func );
-                        maybeMutate_impl( node->type, *this );
-                        maybeMutate_impl( node->statements, *this );
-                        maybeMutate_impl( node->attributes, *this );
-                }
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
+
+        {
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                static ObjectDecl func(
+                        "__func__", noStorageClasses, LinkageSpec::C, nullptr,
+                        new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ), nullptr, true, false ),
+                        nullptr
+                );
+                indexerAddId( &func );
+                maybeMutate_impl( node->type, *this );
+                maybeMutate_impl( node->statements, *this );
+                maybeMutate_impl( node->attributes, *this );
         }
 
@@ -737 +730 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmStmt * node ) {
-        VISIT_START( node )
-
-        maybeAccept_impl( node->instruction, *this );
-        maybeAccept_impl( node->output, *this );
-        maybeAccept_impl( node->input, *this );
-        maybeAccept_impl( node->clobber, *this );
-
-        VISIT_END( node );
+        VISIT_BODY( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( AsmStmt * node ) {
-        MUTATE_START( node );
-
-        maybeMutate_impl( node->instruction, *this );
-        maybeMutate_impl( node->output, *this );
-        maybeMutate_impl( node->input, *this );
-        maybeMutate_impl( node->clobber, *this );
-
-        MUTATE_END( Statement, node );
+        MUTATE_BODY( Statement, node );
 }
 
@@ -1017 +996 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node );
                 maybeAccept_impl( node->stmt, *this );
         }
@@ -1030 +1009 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node );
                 maybeMutate_impl( node->stmt, *this );
         }