Changeset 0b8bf27 for src/AST

Timestamp:

May 23, 2019, 10:39:17 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:

a2e758e

Parents:

f23de79d

Message:

Fixed pass visitor so previsit can return void to signify it will never mutate

Location:

src/AST

Files:

• GenericSubstitution.cpp (modified) (2 diffs)
• Pass.proto.hpp (modified) (2 diffs)
• module.mk (modified) (1 diff)

src/AST/GenericSubstitution.cpp

@@ -23 +23 @@
 #include "Pass.hpp"
 #include "Type.hpp"
-#include "TypeSubstitution.cpp"
+#include "TypeSubstitution.hpp"
 
 namespace ast {
@@ -32 +32 @@
 
                 void previsit( const Type * ty ) {
-                        assertf( false, "Attempted generic substitution for non-aggregate type: %s", 
+                        assertf( false, "Attempted generic substitution for non-aggregate type: %s",
                                 toString( ty ).c_str() );
                 }

src/AST/Pass.proto.hpp

@@ -115 +115 @@
                 static constexpr bool value = std::is_void< ret_t >::value ||
                         std::is_base_of<const node_t, typename std::remove_pointer<ret_t>::type >::value;
+        };
+
+        template<bool is_void>
+        struct __assign;
+
+        template<>
+        struct __assign<true> {
+                template<typename pass_t, typename node_t>
+                static inline void result( pass_t & pass, const node_t * & node ) {
+                        pass.previsit( node );
+                }
+        };
+
+        template<>
+        struct __assign<false> {
+                template<typename pass_t, typename node_t>
+                static inline void result( pass_t & pass, const node_t * & node ) {
+                        node = pass.previsit( node );
+                        assertf(node, "Previsit must not return NULL");
+                }
         };
 
@@ -138 +158 @@
                         "Previsit may not change the type of the node. It must return its paremeter or void."
                 );
-                if(std::is_void< decltype( pass.previsit(node) ) >::value) {
-                        pass.previsit( node );
-                } else {
-                        node = pass.previsit( node );
-                        assert(node);
-                }
+
+                __assign<
+                        std::is_void<
+                                decltype( pass.previsit( node ) )
+                        >::value
+                >::result( pass, node );
         }
 

src/AST/module.mk

@@ -21 +21 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
+        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \