Changeset 9151fcb for src/AST

Timestamp:

Jun 7, 2019, 12:00:17 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e16e27e1, ef75948

Parents:

0b73f0c (diff), 5684736 (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

Location:

src/AST

Files:

• AssertAcyclic.cpp (added)
• AssertAcyclic.hpp (added)
• Node.hpp (modified) (3 diffs)
• Pass.hpp (modified) (1 diff)
• module.mk (modified) (1 diff)

src/AST/Node.hpp

@@ -18 +18 @@
 #include <cassert>
 #include <iosfwd>
+#include <type_traits> // for remove_reference
 
 #include "Common/ErrorObjects.h"  // for SemanticErrorException
@@ -82 +83 @@
 };
 
-// Mutate a node, non-member function to avoid static type
-// problems and be able to use auto return
+/// Mutate a node, non-member function to avoid static type
+/// problems and be able to use auto return
 template<typename node_t>
 node_t * mutate( const node_t * node ) {
@@ -95 +96 @@
         );
         return node->clone();
+}
+
+/// Mutate a node field (only clones if not equal to existing value)
+template<typename node_t, typename field_t>
+const node_t * mutate_field( 
+        const node_t * node, 
+        typename std::remove_const<typename std::remove_reference<field_t>::type>::type node_t::* field,
+        field_t&& val 
+) {
+        if ( node->*field == val ) return node;
+        
+        node_t * ret = mutate( node );
+        ret->*field = std::forward< field_t >( val );
+        return ret;
 }
 

src/AST/Pass.hpp

@@ -201 +201 @@
         container_t< ptr<node_t> > call_accept( const container_t< ptr<node_t> > & container );
 
+public:
         /// Logic to call the accept and mutate the parent if needed, delegates call to accept
         template<typename node_t, typename parent_t, typename child_t>

src/AST/module.mk

@@ -16 +16 @@
 
 SRC_AST = \
+        AST/AssertAcyclic.cpp \
         AST/Attribute.cpp \
         AST/Convert.cpp \