Changes in src/AST/Decl.hpp [87701b6:10a1225]

File:

• src/AST/Decl.hpp (modified) (16 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 node_t * mutate(const node_t * node);
+
 namespace ast {
 
@@ -55 +58 @@
 private:
         Decl * clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -87 +91 @@
 private:
         DeclWithType * clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -96 +101 @@
         ptr<Expr> bitfieldWidth;
 
-        ObjectDecl( const CodeLocation& loc, const std::string& name, Type* type, Init* init = nullptr,
-                Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C, Expr* bitWd = nullptr,
-                std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {})
+        ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type, Init * init = nullptr,
+                Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C, Expr * bitWd = nullptr,
+                std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {})
         : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ),
           init( init ), bitfieldWidth( bitWd ) {}
@@ -108 +113 @@
 private:
         ObjectDecl * clone() const override { return new ObjectDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -135 +137 @@
 private:
         FunctionDecl * clone() const override { return new FunctionDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -157 +156 @@
 private:
         NamedTypeDecl* clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -198 +198 @@
 private:
         TypeDecl * clone() const override { return new TypeDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -216 +213 @@
 private:
         TypedefDecl * clone() const override { return new TypedefDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -238 +232 @@
         AggregateDecl* set_body( bool b ) { body = b; return this; }
 
+private:
+        AggregateDecl * clone() const override = 0;
+        MUTATE_FRIEND
+
 protected:
         /// Produces a name for the kind of aggregate
@@ -260 +258 @@
 private:
         StructDecl * clone() const override { return new StructDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "struct"; }
@@ -278 +273 @@
 private:
         UnionDecl * clone() const override { return new UnionDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "union"; }
@@ -299 +291 @@
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "enum"; }
@@ -320 +309 @@
 private:
         TraitDecl * clone() const override { return new TraitDecl{ *this }; }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 
         std::string typeString() const override { return "trait"; }
@@ -338 +324 @@
 private:
         AsmDecl *clone() const override { return new AsmDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
@@ -355 +338 @@
 private:
         StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
-
-        /// Must be copied in ALL derived classes
-        template<typename node_t>
-        friend node_t * mutate(const node_t * node);
+        MUTATE_FRIEND
 };
 
 }
+
+#undef MUTATE_FRIEND
 
 // Local Variables: //