Changes in src/Common/PassVisitor.impl.h [447c356:d8893ca]

File:

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

src/Common/PassVisitor.impl.h

@@ -400 +400 @@
         {
                 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 );
@@ -418 +425 @@
         {
                 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 );
@@ -969 +983 @@
 Statement * PassVisitor< pass_type >::mutate( WaitForStmt * node ) {
         MUTATE_BODY( Statement, node );
+}
+
+
+
+//--------------------------------------------------------------------------
+// NullStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( WithStmt * node ) {
+        VISIT_START( node );
+        maybeAccept_impl( node->exprs, *this );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node );
+                maybeAccept_impl( node->stmt, *this );
+        }
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( WithStmt * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->exprs, *this );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node );
+                maybeMutate_impl( node->stmt, *this );
+        }
+        MUTATE_END( Statement, node );
 }