Changeset c13e8dc8 for src/Common/PassVisitor.impl.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

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

src/Common/PassVisitor.impl.h

@@ -55 +55 @@
                 it,
                 [](Declaration * decl) -> auto {
-                        return new DeclStmt( noLabels, decl );
+                        return new DeclStmt( decl );
                 }
         );
@@ -251 +251 @@
             || ( empty( beforeDecls ) && empty( afterDecls )) );
 
-        CompoundStmt *compound = new CompoundStmt( noLabels );
+        CompoundStmt *compound = new CompoundStmt();
         if( !empty(beforeDecls) ) { splice( std::back_inserter( compound->get_kids() ), beforeDecls ); }
         if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
@@ -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 );
 }