Changes in src/AST/Node.cpp [87701b6:10a1225]

File:

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

src/AST/Node.cpp

@@ -16 +16 @@
 #include "Node.hpp"
 #include "Fwd.hpp"
+
+#include "Attribute.hpp"
 #include "Decl.hpp"
 #include "Expr.hpp"
+#include "Init.hpp"
 #include "Stmt.hpp"
 #include "Type.hpp"
+#include "TypeSubstitution.hpp"
 
 template< typename node_t, enum ast::Node::ref_type ref_t >
@@ -26 +30 @@
 template< typename node_t, enum ast::Node::ref_type ref_t >
 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 );
+        // get mutable version of `n`
+        auto r = mutate( node );
+        // re-assign mutable version in case `mutate()` produced a new pointer
+        assign( r );
+        return r;
+}
 
 template class ast::ptr_base< ast::Node, ast::Node::ref_type::weak >;
@@ -153 +170 @@
 template class ast::ptr_base< ast::CompoundLiteralExpr, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::CompoundLiteralExpr, ast::Node::ref_type::strong >;
-template class ast::ptr_base< ast::UntypedValofExpr, ast::Node::ref_type::weak >;
-template class ast::ptr_base< ast::UntypedValofExpr, ast::Node::ref_type::strong >;
 template class ast::ptr_base< ast::RangeExpr, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::RangeExpr, ast::Node::ref_type::strong >;
@@ -229 +244 @@
 template class ast::ptr_base< ast::ConstructorInit, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::ConstructorInit, ast::Node::ref_type::strong >;
-template class ast::ptr_base< ast::Constant, ast::Node::ref_type::weak >;
-template class ast::ptr_base< ast::Constant, ast::Node::ref_type::strong >;
 template class ast::ptr_base< ast::Attribute, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::Attribute, ast::Node::ref_type::strong >;