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

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