Changes in src/AST/Decl.hpp [8a5530c:f3cc5b6]

File:

• src/AST/Decl.hpp (modified) (18 diffs)

src/AST/Decl.hpp

@@ -30 +30 @@
 #include "Parser/ParseNode.h"  // for DeclarationNode::Aggregate
 
+// 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);
+
 namespace ast {
-
-class Attribute;
-class Expr;
-class Init;
-class TypeDecl;
 
 /// Base declaration class
@@ -60 +58 @@
 private:
         Decl * clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -92 +91 @@
 private:
         DeclWithType * clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -113 +113 @@
 private:
         ObjectDecl * clone() const override { return new ObjectDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -140 +137 @@
 private:
         FunctionDecl * clone() const override { return new FunctionDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -150 +144 @@
 public:
         ptr<Type> base;
-        std::vector<ptr<TypeDecl>> parameters;
+        std::vector<ptr<TypeDecl>> params;
         std::vector<ptr<DeclWithType>> assertions;
 
         NamedTypeDecl( const CodeLocation& loc, const std::string& name, Storage::Classes storage,
                 Type* b, Linkage::Spec spec = Linkage::Cforall )
-        : Decl( loc, name, storage, spec ), base( b ), parameters(), assertions() {}
+        : Decl( loc, name, storage, spec ), base( b ), params(), assertions() {}
 
         /// Produces a name for the kind of alias
@@ -162 +156 @@
 private:
         NamedTypeDecl* clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -203 +198 @@
 private:
         TypeDecl * clone() const override { return new TypeDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -221 +213 @@
 private:
         TypedefDecl * clone() const override { return new TypedefDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -231 +220 @@
 public:
         std::vector<ptr<Decl>> members;
-        std::vector<ptr<TypeDecl>> parameters;
+        std::vector<ptr<TypeDecl>> params;
         std::vector<ptr<Attribute>> attributes;
         bool body = false;
@@ -238 +227 @@
         AggregateDecl( const CodeLocation& loc, const std::string& name,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall )
-        : Decl( loc, name, Storage::Classes{}, linkage ), members(), parameters(),
+        : Decl( loc, name, Storage::Classes{}, linkage ), members(), params(),
           attributes( std::move(attrs) ) {}
 
         AggregateDecl* set_body( bool b ) { body = b; return this; }
+
+private:
+        AggregateDecl * clone() const override = 0;
+        MUTATE_FRIEND
 
 protected:
@@ -265 +258 @@
 private:
         StructDecl * clone() const override { return new StructDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "struct"; }
@@ -283 +273 @@
 private:
         UnionDecl * clone() const override { return new UnionDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "union"; }
@@ -304 +291 @@
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "enum"; }
@@ -325 +309 @@
 private:
         TraitDecl * clone() const override { return new TraitDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "trait"; }
@@ -343 +324 @@
 private:
         AsmDecl *clone() const override { return new AsmDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -360 +338 @@
 private:
         StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend auto mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -402 +377 @@
 }
 
+#undef MUTATE_FRIEND
+
 // Local Variables: //
 // tab-width: 4 //