Changeset 7aaec67

Timestamp:

Jan 31, 2018, 4:56:26 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:

60914351

Parents:

c453ac4

Message:

Add with clause support to PassVisitor?

File:

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

src/Common/PassVisitor.impl.h

@@ -392 +392 @@
         indexerAddId( node );
 
+        maybeAccept_impl( node->withExprs, *this );
         {
                 // with clause introduces a level of scope (for the with expression members).
@@ -397 +398 @@
                 // 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
-                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 );
+                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 );
+                }
         }
 
@@ -423 +428 @@
                 // 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
-                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 );
+                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 );
+                }
         }