Changeset b58affe7 for src/AST

Timestamp:

Jun 24, 2019, 11:24:31 AM (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:

0e464f6, 3253c32

Parents:

4d978d5 (diff), c1ea11b (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) (2 diffs)

src/AST/Node.hpp

@@ -100 +100 @@
 
 /// Mutate a node field (only clones if not equal to existing value)
-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 ) {
+template<typename node_t, typename parent_t, typename field_t, typename assn_t>
+const node_t * mutate_field( const node_t * node, field_t parent_t::* field, assn_t && val ) {
         // skip mutate if equivalent
         if ( node->*field == val ) return node;
@@ -112 +112 @@
 
 /// 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>
+template<typename node_t, typename parent_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
+        const node_t * node, coll_t parent_t::* field, ind_t i, field_t && val
 ) {
         // skip mutate if equivalent