Changeset 87701b6 for src/AST/Decl.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/Decl.hpp (modified) (10 diffs)

src/AST/Decl.hpp

@@ -111 +111 @@
         /// 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);
 };
 
@@ -201 +201 @@
         /// 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);
 };
 
@@ -263 +263 @@
         /// 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);
 
         std::string typeString() const override { return "struct"; }
@@ -281 +281 @@
         /// 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);
 
         std::string typeString() const override { return "union"; }
@@ -302 +302 @@
         /// 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);
 
         std::string typeString() const override { return "enum"; }
@@ -323 +323 @@
         /// 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);
 
         std::string typeString() const override { return "trait"; }
@@ -341 +341 @@
         /// 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);
 };
 
@@ -358 +358 @@
         /// 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 Decl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class Decl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class DeclWithType * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class DeclWithType * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class ObjectDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class ObjectDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class FunctionDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class FunctionDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class AggregateDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class AggregateDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class StructDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class StructDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class UnionDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class UnionDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class EnumDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class EnumDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class TraitDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class TraitDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class NamedTypeDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class NamedTypeDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class TypeDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class TypeDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class TypedefDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class TypedefDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class AsmDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class AsmDecl * node, Node::ref_type ref ) { node->decrement(ref); }
-inline void increment( const class StaticAssertDecl * node, Node::ref_type ref ) { node->increment(ref); }
-inline void decrement( const class StaticAssertDecl * node, Node::ref_type ref ) { node->decrement(ref); }
+        friend node_t * mutate(const node_t * node);
+};
 
 }