Changes in src/AST/Convert.cpp [4073b16:dd6d7c6]

File:

• src/AST/Convert.cpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -1287 +1287 @@
 
         const ast::Designation * visit( const ast::Designation * node ) override final {
-                (void)node;
+                auto designation = new Designation( get<Expression>().acceptL( node->designators ) );
+                designation->location = node->location;
+                this->node = designation;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::SingleInit * node ) override final {
-                (void)node;
+                auto init = new SingleInit(
+                        get<Expression>().accept1( node->value ),
+                        ast::MaybeConstruct == node->maybeConstructed
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::ListInit * node ) override final {
-                (void)node;
+                auto init = new ListInit(
+                        get<Initializer>().acceptL( node->initializers ),
+                        get<Designation>().acceptL( node->designations ),
+                        ast::MaybeConstruct == node->maybeConstructed
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::ConstructorInit * node ) override final {
-                (void)node;
+                auto init = new ConstructorInit(
+                        get<Statement>().accept1( node->ctor ),
+                        get<Statement>().accept1( node->dtor ),
+                        get<Initializer>().accept1( node->init )
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
 
         const ast::Attribute * visit( const ast::Attribute * node ) override final {
-                (void)node;
+                auto attr = new Attribute(
+                        node->name,
+                        get<Expression>().acceptL(node->parameters)
+                );
+                this->node = attr;
                 return nullptr;
         }
 
         const ast::TypeSubstitution * visit( const ast::TypeSubstitution * node ) override final {
-                (void)node;
+                // Handled by convertTypeSubstitution helper instead.
+                // TypeSubstitution is not a node in the old model, so the conversion result wouldn't fit in this->node.
+                assert( 0 );
                 return nullptr;
         }
@@ -2617 +2642 @@
         }
 
-        virtual void visit( Designation * ) override final {
-
-        }
-
-        virtual void visit( SingleInit * ) override final {
-
-        }
-
-        virtual void visit( ListInit * ) override final {
-
-        }
-
-        virtual void visit( ConstructorInit * ) override final {
-
+        virtual void visit( Designation * old ) override final {
+                this->node = new ast::Designation(
+                        old->location,
+                        GET_ACCEPT_V(designators, Expr)
+                );
+        }
+
+        virtual void visit( SingleInit * old ) override final {
+                this->node = new ast::SingleInit(
+                        old->location,
+                        GET_ACCEPT_1(value, Expr),
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                );
+        }
+
+        virtual void visit( ListInit * old ) override final {
+                this->node = new ast::ListInit(
+                        old->location,
+                        GET_ACCEPT_V(initializers, Init),
+                        GET_ACCEPT_V(designations, Designation),
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                );
+        }
+
+        virtual void visit( ConstructorInit * old ) override final {
+                this->node = new ast::ConstructorInit(
+                        old->location,
+                        GET_ACCEPT_1(ctor, Stmt),
+                        GET_ACCEPT_1(dtor, Stmt),
+                        GET_ACCEPT_1(init, Init)
+                );
         }
 
         virtual void visit( Constant * ) override final {
-
-        }
-
-        virtual void visit( Attribute * ) override final {
-
+                // Handled in visit( ConstantEpxr * ).
+                // In the new tree, Constant fields are inlined into containing ConstantExpression.
+                assert( 0 );
+        }
+
+        virtual void visit( Attribute * old ) override final {
+                this->node = new ast::Attribute(
+                        old->name,
+                        GET_ACCEPT_V( parameters, Expr )
+                );
         }
 
         virtual void visit( AttrExpr * ) override final {
-
-                assert( 0 );
+                assertf( false, "AttrExpr deprecated in new AST." );
         }
 };