Changeset de8a0a4b for src/AST/Pass.impl.hpp

Timestamp:

Jan 26, 2025, 6:37:05 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

a950021

Parents:

0f070a4 (diff), 11f92fac (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Pass.impl.hpp (modified) (2 diffs)

src/AST/Pass.impl.hpp

@@ -1350 +1350 @@
 
 //--------------------------------------------------------------------------
-// CountExpr
-template< typename core_t >
-const ast::Expr * ast::Pass< core_t >::visit( const ast::CountExpr * node ) {
-        VISIT_START( node );
-        if ( __visit_children() ) {
-                {
-                        guard_symtab guard { *this };
-                        maybe_accept( node, &CountExpr::result );
-                }
-                if ( node->type ) {
-                        maybe_accept( node, &CountExpr::type );
-                } else {
-                        maybe_accept( node, &CountExpr::expr );
-                }
-        }
-        VISIT_END( Expr, node );
-}
-
-//--------------------------------------------------------------------------
 // AlignofExpr
 template< typename core_t >
@@ -1380 +1361 @@
                 }
                 maybe_accept( node, &AlignofExpr::type );
+        }
+
+        VISIT_END( Expr, node );
+}
+
+//--------------------------------------------------------------------------
+// CountofExpr
+template< typename core_t >
+const ast::Expr * ast::Pass< core_t >::visit( const ast::CountofExpr * node ) {
+        VISIT_START( node );
+
+        if ( __visit_children() ) {
+                {
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &CountofExpr::result );
+                }
+                maybe_accept( node, &CountofExpr::type );
         }