Changeset e4b6cf78 for src/AST

Timestamp:

May 23, 2019, 11:29:46 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

9d6e7fa9

Parents:

342146e1

Message:

New Pass visitor now supports void postvisits by returning the original node

File:

• src/AST/Pass.proto.hpp (modified) (4 diffs)

src/AST/Pass.proto.hpp

@@ -109 +109 @@
         };
 
+        /// "Short hand" to check if this is a valid previsit function
+        /// Mostly used to make the static_assert look (and print) prettier
         template<typename pass_t, typename node_t>
         struct is_valid_previsit {
@@ -117 +119 @@
         };
 
+        /// 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;
@@ -134 +139 @@
                         node = pass.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 pass_t, typename node_t>
+                static inline const node_t * result( pass_t & pass, const node_t * & node ) {
+                        pass.postvisit( node );
+                        return node;
+                }
+        };
+
+        template<>
+        struct __return<false> {
+                template<typename pass_t, typename node_t>
+                static inline auto result( pass_t & pass, const node_t * & node ) {
+                        return pass.postvisit( node );
                 }
         };
@@ -174 +202 @@
                 decltype( pass.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
         {
-                return pass.postvisit( node );
+                return __return<
+                        std::is_void<
+                                decltype( pass.postvisit( node ) )
+                        >::value
+                >::result( pass, node );
         }