Changeset 246c245 for src/AST/Node.hpp

Timestamp:

May 16, 2019, 6:51:18 PM (5 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:

8ff178d, d66e7b7

Parents:

9b4f329 (diff), 6f8e87d (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) (7 diffs)

src/AST/Node.hpp

@@ -44 +44 @@
         };
 
-        inline void increment(ref_type ref) const {
+private:
+        /// Make a copy of this node; should be overridden in subclass with more precise return type
+        virtual Node * clone() const = 0;
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend node_t * mutate(const node_t * node);
+
+        mutable size_t strong_count = 0;
+        mutable size_t weak_count = 0;
+
+        void increment(ref_type ref) const {
                 switch (ref) {
                         case ref_type::strong: strong_count++; break;
@@ -51 +62 @@
         }
 
-        inline void decrement(ref_type ref) const {
+        void decrement(ast::Node::ref_type ref) const {
                 switch (ref) {
                         case ref_type::strong: strong_count--; break;
@@ -61 +72 @@
                 }
         }
-private:
-        /// Make a copy of this node; should be overridden in subclass with more precise return type
-        virtual const Node * clone() const = 0;
 
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
-
-        mutable size_t strong_count = 0;
-        mutable size_t weak_count = 0;
+        template< typename node_t, enum Node::ref_type ref_t >
+        friend class ptr_base;
 };
 
@@ -76 +80 @@
 // problems and be able to use auto return
 template<typename node_t>
-auto mutate( const node_t * node ) {
-        assertf(
-                node->strong_count >= 1,
-                "Error: attempting to mutate a node that appears to have been linked"
-        );
-        if (node->strong_count == 1) {
+node_t * mutate( const node_t * node ) {
+        if (node->strong_count <= 1) {
                 return const_cast<node_t *>(node);
         }
@@ -100 +100 @@
 public:
         ptr_base() : node(nullptr) {}
-        ptr_base( const node_t * n ) : node(n) { if( node ) increment(node, ref_t); }
-        ~ptr_base() { if( node ) decrement(node, ref_t); }
+        ptr_base( const node_t * n ) : node(n) { if( node ) _inc(node); }
+        ~ptr_base() { if( node ) _dec(node); }
 
         template< enum Node::ref_type o_ref_t >
         ptr_base( const ptr_base<node_t, o_ref_t> & o ) : node(o.node) {
-                if( node ) increment(node, ref_t);
+                if( node ) _inc(node);
         }
 
         template< enum Node::ref_type o_ref_t >
         ptr_base( ptr_base<node_t, o_ref_t> && o ) : node(o.node) {
-                if( node ) increment(node, ref_t);
+                if( node ) _inc(node);
         }
 
@@ -147 +147 @@
                 assign( n );
                 // get mutable version of `n`
-                auto r = mutate( node ); 
+                auto r = mutate( node );
                 // re-assign mutable version in case `mutate()` produced a new pointer
                 assign( r );
@@ -157 +157 @@
 private:
         void assign( const node_t * other ) {
-                if( other ) increment(other, ref_t);
-                if( node  ) decrement(node , ref_t);
+                if( other ) _inc(other);
+                if( node  ) _dec(node );
                 node = other;
         }
+
+        void _inc( const node_t * other );
+        void _dec( const node_t * other );
 
 protected: