Changeset 0b8bf27

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

Files:

• AST/GenericSubstitution.cpp (modified) (2 diffs)
• AST/Pass.proto.hpp (modified) (2 diffs)
• AST/module.mk (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

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 \

src/Makefile.in

@@ -167 +167 @@
 am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \
         AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \
-        AST/Expr.$(OBJEXT) AST/Init.$(OBJEXT) \
-        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
-        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
-        AST/Type.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
+        AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \
+        AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
+        AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
+        AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
+        AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
         CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
@@ -574 +575 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
+        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \
@@ -739 +741 @@
         AST/$(DEPDIR)/$(am__dirstamp)
 AST/Expr.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/GenericSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
 AST/Init.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/LinkageSpec.$(OBJEXT): AST/$(am__dirstamp) \
@@ -1173 +1177 @@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/DeclReplacer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Expr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/GenericSubstitution.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@