Changeset 246c245 for src/AST/Init.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/Init.hpp (modified) (3 diffs)

src/AST/Init.hpp

@@ -24 +24 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND template<typename node_t> friend auto mutate(const node_t * node);
+#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
 namespace ast {
@@ -58 +58 @@
         const Init * accept( Visitor& v ) const override = 0;
 private:
-        const Init * clone() const override = 0;
+        Init * clone() const override = 0;
         MUTATE_FRIEND
 };
@@ -122 +122 @@
 };
 
-
-//=================================================================================================
-/// This disgusting and giant piece of boiler-plate is here to solve a cyclic dependency
-/// remove only if there is a better solution
-/// The problem is that ast::ptr< ... > uses increment/decrement which won't work well with
-/// forward declarations
-inline void increment( const class Init * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class Init * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class SingleInit * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class SingleInit * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ListInit * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ListInit * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ConstructorInit * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ConstructorInit * node, Node::ref_type ref ) { node->decrement( ref ); }
 }