Changeset 334801b

Timestamp:

Jun 8, 2023, 3:42:52 PM (18 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ast-experimental, master

Children:

148f836e

Parents:

918e4165

Message:

Simplify one of the Pass::visit methods for CompoundStmt?. It repeats two lines to move the conditional code into different if clauses.

File:

• src/AST/Pass.impl.hpp (modified) (1 diff)

src/AST/Pass.impl.hpp

@@ -761 +761 @@
 
         if ( __visit_children() ) {
-                // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
-                auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
-                        if ( enterScope ) {
-                                __pass::symtab::enter(core, 0);
-                        }
-                }, [this, leaveScope = !this->atFunctionTop]() {
-                        if ( leaveScope ) {
-                                __pass::symtab::leave(core, 0);
-                        }
-                });
-                ValueGuard< bool > guard2( atFunctionTop );
-                atFunctionTop = false;
-                guard_scope guard3 { *this };
-                maybe_accept( node, &CompoundStmt::kids );
+                // Do not enter (or leave) a new symbol table scope if atFunctionTop.
+                // But always enter (and leave) a new general scope.
+                if ( atFunctionTop ) {
+                        ValueGuard< bool > guard1( atFunctionTop );
+                        atFunctionTop = false;
+                        guard_scope guard2( *this );
+                        maybe_accept( node, &CompoundStmt::kids );
+                } else {
+                        guard_symtab guard1( *this );
+                        guard_scope guard2( *this );
+                        maybe_accept( node, &CompoundStmt::kids );
+                }
         }