Changeset b78c54f for src/AST/Pass.proto.hpp

Timestamp:

Apr 12, 2024, 7:49:21 AM (2 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

3e1cd17, 90320ac

Parents:

feb999f (diff), ab780e6 (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.proto.hpp (modified) (3 diffs)

src/AST/Pass.proto.hpp

@@ -226 +226 @@
                 // Now the original containers should still have the unchanged values
                 // but also contain the new values.
-        }
-};
-
-/// Used by previsit implementation
-/// We need to reassign the result to 'node', unless the function
-/// returns void, then we just leave 'node' unchanged
-template<bool is_void>
-struct __assign;
-
-template<>
-struct __assign<true> {
-        template<typename core_t, typename node_t>
-        static inline void result( core_t & core, const node_t * & node ) {
-                core.previsit( node );
-        }
-};
-
-template<>
-struct __assign<false> {
-        template<typename core_t, typename node_t>
-        static inline void result( core_t & core, const node_t * & node ) {
-                node = core.previsit( node );
-                assertf(node, "Previsit must not return NULL");
-        }
-};
-
-/// Used by postvisit implementation
-/// We need to return the result unless the function
-/// returns void, then we just return the original node
-template<bool is_void>
-struct __return;
-
-template<>
-struct __return<true> {
-        template<typename core_t, typename node_t>
-        static inline const node_t * result( core_t & core, const node_t * & node ) {
-                core.postvisit( node );
-                return node;
-        }
-};
-
-template<>
-struct __return<false> {
-        template<typename core_t, typename node_t>
-        static inline auto result( core_t & core, const node_t * & node ) {
-                return core.postvisit( node );
         }
 };
@@ -297 +251 @@
         );
 
-        __assign<
-                std::is_void<
-                        decltype( core.previsit( node ) )
-                >::value
-        >::result( core, node );
+        // We need to reassign the result to 'node', unless the function
+        // returns void, then we just leave 'node' unchanged
+        if constexpr ( std::is_void_v<decltype( core.previsit( node ) )> ) {
+                core.previsit( node );
+        } else {
+                node = core.previsit( node );
+                assertf(node, "Previsit must not return NULL");
+        }
 }
 
@@ -312 +269 @@
         decltype( core.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
 {
-        return __return<
-                std::is_void<
-                        decltype( core.postvisit( node ) )
-                >::value
-        >::result( core, node );
+        // We need to return the result unless the function
+        // returns void, then we just return the original node
+        if constexpr ( std::is_void_v<decltype( core.postvisit( node ) )> ) {
+                core.postvisit( node );
+                return node;
+        } else {
+                return core.postvisit( node );
+        }
 }