Changeset 87701b6 for src/AST/Stmt.hpp

Timestamp:

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

Children:

e61207e7

Parents:

1fb7bfd

Message:

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

File:

• src/AST/Stmt.hpp (modified) (20 diffs)

src/AST/Stmt.hpp

@@ -65 +65 @@
         /// 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);
 };
 
@@ -80 +80 @@
         /// 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);
 };
 
@@ -96 +96 @@
         /// 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);
 };
 
@@ -121 +121 @@
         /// 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);
 };
 
@@ -138 +138 @@
         /// 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);
 };
 
@@ -160 +160 @@
         /// 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);
 };
 
@@ -178 +178 @@
         /// 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);
 };
 
@@ -198 +198 @@
         /// 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);
 };
 
@@ -219 +219 @@
         /// 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);
 };
 
@@ -240 +240 @@
         /// 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);
 };
 
@@ -268 +268 @@
         /// 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);
 
         static const char * kindNames[kindEnd];
@@ -286 +286 @@
         /// 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);
 };
 
@@ -307 +307 @@
         /// 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);
 };
 
@@ -327 +327 @@
         /// 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);
 };
 
@@ -349 +349 @@
         /// 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);
 };
 
@@ -366 +366 @@
         /// 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);
 };
 
@@ -406 +406 @@
         /// 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);
 };
 
@@ -424 +424 @@
         /// 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);
 };
 
@@ -440 +440 @@
         /// 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);
 };
 
@@ -457 +457 @@
         /// Must be copied in ALL derived classes
         template<typename node_t>
-        friend auto 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 Stmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class Stmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class CompoundStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class CompoundStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ExprStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ExprStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class AsmStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class AsmStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class DirectiveStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class DirectiveStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class IfStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class IfStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class WhileStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class WhileStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ForStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ForStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class SwitchStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class SwitchStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class CaseStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class CaseStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class BranchStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class BranchStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ReturnStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ReturnStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ThrowStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ThrowStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class TryStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class TryStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class CatchStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class CatchStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class FinallyStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class FinallyStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class WaitForStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class WaitForStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class WithStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class WithStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class DeclStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class DeclStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class NullStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class NullStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
-inline void increment( const class ImplicitCtorDtorStmt * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class ImplicitCtorDtorStmt * node, Node::ref_type ref ) { node->decrement( ref ); }
+        friend node_t * mutate(const node_t * node);
+};
 
 }