Changeset e0115286 for src/AST/Init.hpp

Timestamp:

May 10, 2019, 3:00:41 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2a5e8a6

Parents:

1f93c2c

Message:

Fix a cyclic dependency with ptr and nodes

File:

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

src/AST/Init.hpp

@@ -28 +28 @@
 class Stmt;
 
-/// List of designator (NameExpr, VariableExpr, and ConstantExpr) expressions that specify an 
+/// List of designator (NameExpr, VariableExpr, and ConstantExpr) expressions that specify an
 /// object being initialized
 class Designation final : public ParseNode {
@@ -34 +34 @@
         std::vector<ptr<Expr>> designators;
 
-        Designation( const CodeLocation& loc, std::vector<ptr<Expr>>&& ds = {} ) 
+        Designation( const CodeLocation& loc, std::vector<ptr<Expr>>&& ds = {} )
         : ParseNode( loc ), designators( std::move(ds) ) {}
 
@@ -60 +60 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation& loc, Expr* val, bool mc = false ) 
+        SingleInit( const CodeLocation& loc, Expr* val, bool mc = false )
         : Init( loc, mc ), value( val ) {}
 
@@ -77 +77 @@
         std::vector<ptr<Designation>> designations;
 
-        ListInit( const CodeLocation& loc, std::vector<ptr<Init>>&& is, 
+        ListInit( const CodeLocation& loc, std::vector<ptr<Init>>&& is,
                 std::vector<ptr<Designation>>&& ds = {}, bool mc = false );
-        
+
         using iterator = std::vector<ptr<Init>>::iterator;
         using const_iterator = std::vector<ptr<Init>>::const_iterator;
@@ -93 +93 @@
 
 /// Either a constructor expression or a C-style initializer.
-/// Should not be necessary to create manually; instead set `maybeConstructed` true on `SingleInit` 
+/// Should not be necessary to create manually; instead set `maybeConstructed` true on `SingleInit`
 /// or `ListInit` if the object should be constructed.
 class ConstructorInit final : public Init {
@@ -99 +99 @@
         ptr<Stmt> ctor;
         ptr<Stmt> dtor;
-        /// C-style initializer made up of SingleInit/ListInit nodes to use as a fallback if an 
+        /// C-style initializer made up of SingleInit/ListInit nodes to use as a fallback if an
         /// appropriate constructor definition is not found by the resolver.
         ptr<Init> init;
@@ -111 +111 @@
 };
 
+
+//=================================================================================================
+/// This disgusting and giant piece of boiler-plate is here to solve a cyclic dependency
+/// remove only if there is a better solution
+/// The problem is that ast::ptr< ... > uses increment/decrement which won't work well with
+/// forward declarations
+inline void increment( const class Init * node, Node::ref_type ref ) { node->increment( ref ); }
+inline void decrement( const class Init * node, Node::ref_type ref ) { node->decrement( ref ); }
+inline void increment( const class SingleInit * node, Node::ref_type ref ) { node->increment( ref ); }
+inline void decrement( const class SingleInit * node, Node::ref_type ref ) { node->decrement( ref ); }
+inline void increment( const class ListInit * node, Node::ref_type ref ) { node->increment( ref ); }
+inline void decrement( const class ListInit * node, Node::ref_type ref ) { node->decrement( ref ); }
+inline void increment( const class ConstructorInit * node, Node::ref_type ref ) { node->increment( ref ); }
+inline void decrement( const class ConstructorInit * node, Node::ref_type ref ) { node->decrement( ref ); }
 }