Changeset d908563 for src/AST/Node.hpp

Timestamp:

May 27, 2019, 11:08:54 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

f88a252

Parents:

933f32f (diff), 21a44ca (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' into cleanup-dtors

File:

• src/AST/Node.hpp (modified) (5 diffs)

src/AST/Node.hpp

@@ -10 +10 @@
 // Created On       : Wed May 8 10:27:04 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 15 16:02:00 2019
-// Update Count     : 3
+// Last Modified On : Thu May 23 16:00:00 2019
+// Update Count     : 4
 //
 
@@ -94 +94 @@
 std::ostream& operator<< ( std::ostream& out, const Node * node );
 
+/// Call a visitor on a possibly-null node
+template<typename node_t>
+auto maybe_accept( const node_t * n, Visitor & v ) -> decltype( n->accept(v) ) {
+        return n ? n->accept( v ) : nullptr;
+}
+
 /// Base class for the smart pointer types
 /// should never really be used.
@@ -103 +109 @@
         ~ptr_base() { if( node ) _dec(node); }
 
+        ptr_base( const ptr_base & o ) : node(o.node) {
+                if( node ) _inc(node);
+        }
+
+        ptr_base( ptr_base && o ) : node(o.node) {
+                if( node ) _inc(node);
+        }
+
         template< enum Node::ref_type o_ref_t >
         ptr_base( const ptr_base<node_t, o_ref_t> & o ) : node(o.node) {
@@ -115 +129 @@
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {
-                assign(strict_dynamic_cast<const node_t *>(node));
+                assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
+                return *this;
+        }
+
+        ptr_base & operator=( const ptr_base & o ) {
+                assign(o.node);
+                return *this;
+        }
+
+        ptr_base & operator=( ptr_base && o ) {
+                assign(o.node);
                 return *this;
         }
@@ -141 +165 @@
         const o_node_t * as() const { return dynamic_cast<const o_node_t *>(node); }
 
+        /// Returns a mutable version of the pointer in this node.
+        node_t * get_and_mutate();
+
         /// Sets this pointer to a mutated version of a pointer (possibly) owned elsehere.
         /// Returns a mutable version of the pointer in this node.