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

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