Changeset 21300d7 for src/AST/Node.hpp

Timestamp:

Jun 12, 2019, 4:06:37 PM (5 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:

462a7c7, d60780c

Parents:

aaeacf4 (diff), 6625727 (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/Node.hpp (modified) (1 diff)

src/AST/Node.hpp

@@ -99 +99 @@
 
 /// 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 
-) {
+template<typename node_t, typename field_t, typename assn_t>
+const node_t * mutate_field( const node_t * node, field_t node_t::* field, assn_t && val ) {
+        // skip mutate if equivalent
         if ( node->*field == val ) return node;
         
+        // mutate and return
         node_t * ret = mutate( node );
-        ret->*field = std::forward< field_t >( val );
+        ret->*field = std::forward< assn_t >( val );
+        return ret;
+}
+
+/// Mutate a single index of a node field (only clones if not equal to existing value)
+template<typename node_t, typename coll_t, typename ind_t, typename field_t>
+const node_t * mutate_field_index(
+        const node_t * node, coll_t node_t::* field, ind_t i, field_t && val
+) {
+        // skip mutate if equivalent
+        if  ( (node->*field)[i] == val ) return node;
+
+        // mutate and return
+        node_t * ret = mutate( node );
+        (ret->*field)[i] = std::forward< field_t >( val );
         return ret;
 }