Changes in src/AST/Init.hpp [16ba4a6f:234b1cb]

File:

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

src/AST/Init.hpp

@@ -25 +25 @@
 
 // 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); \
-        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
+#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
 namespace ast {
@@ -50 +48 @@
 
 /// Flag for whether to construct from initialzier
-enum ConstructFlag { NoConstruct, MaybeConstruct };
+enum ConstructFlag { DoConstruct, MaybeConstruct };
 
 /// Object initializer base class
@@ -71 +69 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = NoConstruct )
+        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = DoConstruct )
         : Init( loc, mc ), value( val ) {}
 
@@ -90 +88 @@
 
         ListInit( const CodeLocation & loc, std::vector<ptr<Init>> && is,
-                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = NoConstruct );
+                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = DoConstruct );
 
         using iterator = std::vector<ptr<Init>>::iterator;
@@ -118 +116 @@
         ConstructorInit( 
                 const CodeLocation & loc, const Stmt * ctor, const Stmt * dtor, const Init * init )
-        : Init( loc, MaybeConstruct ), 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 ); }