Changeset 76ed81f for src/AST/Node.cpp

Timestamp:

May 22, 2019, 5:22:30 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

893e106

Parents:

6380f78

Message:

Broken stuff pre-Pass fix

File:

• src/AST/Node.cpp (modified) (2 diffs)

src/AST/Node.cpp

@@ -35 +35 @@
 void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) { node->decrement(ref_t); }
 
-/// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere.
-/// Returns a mutable version of the pointer in this node.
-template< typename node_t, enum ast::Node::ref_type ref_t >
-node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) {
-        // ensure ownership of `n` by this node to avoid spurious single-owner mutates
-        assign( n );
+template< typename node_t, enum ast::Node::ref_type ref_t >
+node_t * ast::ptr_base<node_t, ref_t>::get_and_mutate() {
         // get mutable version of `n`
         auto r = mutate( node );
@@ -46 +42 @@
         assign( r );
         return r;
+}
+
+template< typename node_t, enum ast::Node::ref_type ref_t >
+node_t * ast::ptr_base<node_t, ref_t>::set_and_mutate( const node_t * n ) {
+        // ensure ownership of `n` by this node to avoid spurious single-owner mutates
+        assign( n );
+        // return mutable version
+        return get_and_mutate();
 }