Changes in src/AST/Init.hpp [60aaa51d:87701b6]

File:

• src/AST/Init.hpp (modified) (8 diffs)

src/AST/Init.hpp

@@ -16 +16 @@
 #pragma once
 
-#include <deque>
 #include <utility>        // for move
 #include <vector>
@@ -23 +22 @@
 #include "Node.hpp"       // for ptr
 #include "Visitor.hpp"
-
-// 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 {
@@ -36 +32 @@
 class Designation final : public ParseNode {
 public:
-        std::deque<ptr<Expr>> designators;
+        std::vector<ptr<Expr>> designators;
 
-        Designation( const CodeLocation& loc, std::deque<ptr<Expr>>&& ds = {} )
+        Designation( const CodeLocation& loc, std::vector<ptr<Expr>>&& ds = {} )
         : ParseNode( loc ), designators( std::move(ds) ) {}
 
@@ -44 +40 @@
 private:
         Designation* clone() const override { return new Designation{ *this }; }
-        MUTATE_FRIEND
 };
 
@@ -60 +55 @@
 private:
         Init * clone() const override = 0;
-        MUTATE_FRIEND
 };
 
@@ -75 +69 @@
 private:
         SingleInit * clone() const override { return new SingleInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend node_t * mutate(const node_t * node);
 };
 
@@ -100 +97 @@
 private:
         ListInit * clone() const override { return new ListInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend node_t * mutate(const node_t * node);
 };
 
@@ -120 +120 @@
 private:
         ConstructorInit * clone() const override { return new ConstructorInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend node_t * mutate(const node_t * node);
 };
 
 }
-
-#undef MUTATE_FRIEND
 
 // Local Variables: //