Changeset 87701b6 for src/AST/Init.hpp

Timestamp:

May 16, 2019, 4:13:19 PM (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:

e61207e7

Parents:

1fb7bfd

Message:

Tentative fix for increment/decrement and implented a few more visits

File:

• src/AST/Init.hpp (modified) (4 diffs)

src/AST/Init.hpp

@@ -54 +54 @@
         const Init * accept( Visitor& v ) const override = 0;
 private:
-        const Init * clone() const override = 0;
+        Init * clone() const override = 0;
 };
 
@@ -72 +72 @@
         /// Must be copied in ALL derived classes
         template<typename node_t>
-        friend auto mutate(const node_t * node);
+        friend node_t * mutate(const node_t * node);
 };
 
@@ -100 +100 @@
         /// Must be copied in ALL derived classes
         template<typename node_t>
-        friend auto mutate(const node_t * node);
+        friend node_t * mutate(const node_t * node);
 };
 
@@ -123 +123 @@
         /// Must be copied in ALL derived classes
         template<typename node_t>
-        friend auto mutate(const node_t * node);
+        friend node_t * mutate(const node_t * node);
 };
 
-
-//=================================================================================================
-/// 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 ); }
 }