Changes in src/AST/Node.hpp [2d11663:60aaa51d]

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, typename assn_t>
-const node_t * mutate_field( const node_t * node, field_t node_t::* field, assn_t && val ) {
-        // skip mutate if equivalent
+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;
         
-        // mutate and return
         node_t * ret = mutate( node );
-        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 );
+        ret->*field = std::forward< field_t >( val );
         return ret;
 }