Changes in src/AST/Init.hpp [f3cc5b6:23f99e1]

File:

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

src/AST/Init.hpp

@@ -23 +23 @@
 #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 auto mutate(const node_t * node);
-
 namespace ast {
 
@@ -43 +40 @@
 private:
         Designation* clone() const override { return new Designation{ *this }; }
-        MUTATE_FRIEND
 };
-
-/// Flag for whether to construct from initialzier
-enum ConstructFlag { DoConstruct, MaybeConstruct };
 
 /// Object initializer base class
 class Init : public ParseNode {
 public:
-        ConstructFlag maybeConstructed;
+        bool maybeConstructed;
 
-        Init( const CodeLocation& loc, ConstructFlag mc ) : ParseNode( loc ), maybeConstructed( mc ) {}
+        Init( const CodeLocation& loc, bool mc ) : ParseNode( loc ), maybeConstructed( mc ) {}
 
         const Init * accept( Visitor& v ) const override = 0;
 private:
         const Init * clone() const override = 0;
-        MUTATE_FRIEND
 };
 
@@ -68 +60 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation& loc, Expr* val, ConstructFlag mc = DoConstruct )
+        SingleInit( const CodeLocation& loc, Expr* val, bool mc = false )
         : Init( loc, mc ), value( val ) {}
 
@@ -74 +66 @@
 private:
         SingleInit * clone() const override { return new SingleInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend auto mutate(const node_t * node);
 };
 
@@ -87 +82 @@
 
         ListInit( const CodeLocation& loc, std::vector<ptr<Init>>&& is,
-                std::vector<ptr<Designation>>&& ds = {}, ConstructFlag mc = DoConstruct );
+                std::vector<ptr<Designation>>&& ds = {}, bool mc = false );
 
         using iterator = std::vector<ptr<Init>>::iterator;
@@ -99 +94 @@
 private:
         ListInit * clone() const override { return new ListInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend auto mutate(const node_t * node);
 };
 
@@ -114 +112 @@
 
         ConstructorInit( const CodeLocation& loc, Stmt* ctor, Stmt* dtor, Init* init )
-        : Init( loc, DoConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
+        : Init( loc, true ), ctor( ctor ), dtor( dtor ), init( init ) {}
 
         const Init * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
         ConstructorInit * clone() const override { return new ConstructorInit{ *this }; }
-        MUTATE_FRIEND
+
+        /// Must be copied in ALL derived classes
+        template<typename node_t>
+        friend auto mutate(const node_t * node);
 };
 
@@ -138 +139 @@
 }
 
-#undef MUTATE_FRIEND
-
 // Local Variables: //
 // tab-width: 4 //