Changes in / [9d23c2d:3f840e3]

Location:

src

Files:

• AST/Convert.cpp (modified) (7 diffs)
• AST/Expr.cpp (modified) (1 diff)
• AST/Expr.hpp (modified) (3 diffs)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/TupleExpr.cc (modified) (1 diff)

src/AST/Convert.cpp

@@ -525 +525 @@
         }
 
-        Expression * visitBaseExpr_skipResultType(const ast::Expr * src, Expression * tgt) {
-
-                tgt->location  = src->location;
-                tgt->env       = convertTypeSubstitution(src->env);
+        Expression * visitBaseExpr(const ast::Expr * src, Expression * tgt) {
+
+                tgt->location = src->location;
+
+                tgt->result = get<Type>().accept1(src->result);
+                tgt->env    = convertTypeSubstitution(src->env);
+
                 tgt->extension = src->extension;
-
                 convertInferUnion(tgt->inferParams, tgt->resnSlots, src->inferred);
+
                 return tgt;
-        }
-
-        Expression * visitBaseExpr(const ast::Expr * src, Expression * tgt) {
-
-                tgt->result = get<Type>().accept1(src->result);
-                return visitBaseExpr_skipResultType(src, tgt);
         }
 
@@ -631 +628 @@
 
         const ast::Expr * visit( const ast::VirtualCastExpr * node ) override final {
-                auto expr = visitBaseExpr_skipResultType( node,
+                auto expr = visitBaseExpr( node,
                         new VirtualCastExpr(
                                 get<Expression>().accept1(node->arg),
-                                get<Type>().accept1(node->result)
+                                nullptr // cast's "to" type is expr's result type; converted in visitBaseExpr
                         )
                 );
@@ -852 +849 @@
 
         const ast::Expr * visit( const ast::TypeExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new TypeExpr(
-                                get<Type>().accept1(node->type)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::AsmExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new AsmExpr(
-                                get<Expression>().accept1(node->inout),
-                                get<Expression>().accept1(node->constraint),
-                                get<Expression>().accept1(node->operand)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::ImplicitCopyCtorExpr * node ) override final {
-                auto rslt = new ImplicitCopyCtorExpr(
-                        get<ApplicationExpr>().accept1(node->callExpr)
-                );
-
-                rslt->tempDecls = get<ObjectDecl>().acceptL(node->tempDecls);
-                rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
-                rslt->dtors = get<Expression>().acceptL(node->dtors);
-
-                auto expr = visitBaseExpr( node, rslt );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::ConstructorExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new ConstructorExpr(
-                                get<Expression>().accept1(node->callExpr)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::CompoundLiteralExpr * node ) override final {
-                auto expr = visitBaseExpr_skipResultType( node,
-                        new CompoundLiteralExpr(
-                                get<Type>().accept1(node->result),
-                                get<Initializer>().accept1(node->init)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::RangeExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new RangeExpr(
-                                get<Expression>().accept1(node->low),
-                                get<Expression>().accept1(node->high)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::UntypedTupleExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new UntypedTupleExpr(
-                                get<Expression>().acceptL(node->exprs)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::TupleExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new UntypedTupleExpr(
-                                get<Expression>().acceptL(node->exprs)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::TupleIndexExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new TupleIndexExpr(
-                                get<Expression>().accept1(node->tuple),
-                                node->index
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::TupleAssignExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new TupleAssignExpr(
-                                get<StmtExpr>().accept1(node->stmtExpr)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::StmtExpr * node ) override final {
-                auto rslt = new StmtExpr(
-                        get<CompoundStmt>().accept1(node->stmts)
-                );
-
-                rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
-                rslt->dtors       = get<Expression>().acceptL(node->dtors);
-
-                auto expr = visitBaseExpr( node, rslt );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::UniqueExpr * node ) override final {
-                auto rslt = new UniqueExpr(
-                        get<Expression>().accept1(node->expr)
-                );
-
-                rslt->object = get<ObjectDecl>  ().accept1(node->object);
-                rslt->var    = get<VariableExpr>().accept1(node->var);
-
-                auto expr = visitBaseExpr( node, rslt );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::UntypedInitExpr * node ) override final {
-                std::list<InitAlternative> initAlts;
-                for (auto ia : node->initAlts) {
-                        initAlts.push_back(InitAlternative(
-                                get<Type>       ().accept1(ia.type),
-                                get<Designation>().accept1(ia.designation)
-                        ));
-                }
-                auto expr = visitBaseExpr( node,
-                        new UntypedInitExpr(
-                                get<Expression>().accept1(node->expr),
-                                initAlts
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::InitExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new InitExpr(
-                                get<Expression>().accept1(node->expr),
-                                get<Designation>().accept1(node->designation)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::DeletedExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new DeletedExpr(
-                                get<Expression>().accept1(node->expr),
-                                inCache(node->deleteStmt) ?
-                                        this->node :
-                                        get<BaseSyntaxNode>().accept1(node->deleteStmt)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::DefaultArgExpr * node ) override final {
-                auto expr = visitBaseExpr( node,
-                        new DefaultArgExpr(
-                                get<Expression>().accept1(node->expr)
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
 
         const ast::Expr * visit( const ast::GenericExpr * node ) override final {
-                std::list<GenericExpr::Association> associations;
-                for (auto association : node->associations) {
-                        associations.push_back(GenericExpr::Association(
-                                get<Type>      ().accept1(association.type),
-                                get<Expression>().accept1(association.expr)
-                        ));
-                }
-                auto expr = visitBaseExpr( node,
-                        new GenericExpr(
-                                get<Expression>().accept1(node->control),
-                                associations
-                        )
-                );
-                this->node = expr;
+                (void)node;
                 return nullptr;
         }
@@ -1819 +1696 @@
         }
 
-        ast::Expr * visitBaseExpr_SkipResultType(Expression * old, ast::Expr * nw) {
-
+        ast::Expr * visitBaseExpr(Expression * old, ast::Expr * nw) {
+
+                nw->result = GET_ACCEPT_1(result, Type);
                 nw->env    = convertTypeSubstitution(old->env);
 
@@ -1827 +1705 @@
 
                 return nw;
-        }
-
-        ast::Expr * visitBaseExpr(Expression * old, ast::Expr * nw) {
-
-                nw->result = GET_ACCEPT_1(result, Type);
-                return visitBaseExpr_SkipResultType(old, nw);;
         }
 
@@ -1900 +1772 @@
 
         virtual void visit( VirtualCastExpr * old ) override final {
-                this->node = visitBaseExpr_SkipResultType( old,
+                this->node = visitBaseExpr( old,
                         new ast::VirtualCastExpr(
                                 old->location,
                                 GET_ACCEPT_1(arg, Expr),
-                                GET_ACCEPT_1(result, Type)
+                                nullptr // cast's "to" type is expr's result type; converted in visitBaseExpr
                         )
                 );
@@ -2129 +2001 @@
         }
 
-        virtual void visit( TypeExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::TypeExpr(
-                                old->location,
-                                GET_ACCEPT_1(type, Type)
-                        )
-                );
-        }
-
-        virtual void visit( AsmExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::AsmExpr(
-                                old->location,
-                                GET_ACCEPT_1(inout, Expr),
-                                GET_ACCEPT_1(constraint, Expr),
-                                GET_ACCEPT_1(operand, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( ImplicitCopyCtorExpr * old ) override final {
-                auto rslt = new ast::ImplicitCopyCtorExpr(
-                        old->location,
-                        GET_ACCEPT_1(callExpr, ApplicationExpr)
-                );
-
-                rslt->tempDecls = GET_ACCEPT_V(tempDecls, ObjectDecl);
-                rslt->returnDecls = GET_ACCEPT_V(returnDecls, ObjectDecl);
-                rslt->dtors = GET_ACCEPT_V(dtors, Expr);
-
-                this->node = visitBaseExpr( old, rslt );
-        }
-
-        virtual void visit( ConstructorExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::ConstructorExpr(
-                                old->location,
-                                GET_ACCEPT_1(callExpr, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( CompoundLiteralExpr * old ) override final {
-                this->node = visitBaseExpr_SkipResultType( old,
-                        new ast::CompoundLiteralExpr(
-                                old->location,
-                                GET_ACCEPT_1(result, Type),
-                                GET_ACCEPT_1(initializer, Init)
-                        )
-                );
-        }
-
-        virtual void visit( RangeExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::RangeExpr(
-                                old->location,
-                                GET_ACCEPT_1(low, Expr),
-                                GET_ACCEPT_1(high, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( UntypedTupleExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::UntypedTupleExpr(
-                                old->location,
-                                GET_ACCEPT_V(exprs, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( TupleExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::TupleExpr(
-                                old->location,
-                                GET_ACCEPT_V(exprs, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( TupleIndexExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::TupleIndexExpr(
-                                old->location,
-                                GET_ACCEPT_1(tuple, Expr),
-                                old->index
-                        )
-                );
-        }
-
-        virtual void visit( TupleAssignExpr * old ) override final {
-                this->node = visitBaseExpr_SkipResultType( old,
-                        new ast::TupleAssignExpr(
-                                old->location,
-                                GET_ACCEPT_1(result, Type),
-                                GET_ACCEPT_1(stmtExpr, StmtExpr)
-                        )
-                );
-        }
-
-        virtual void visit( StmtExpr * old ) override final {
-                auto rslt = new ast::StmtExpr(
-                        old->location,
-                        GET_ACCEPT_1(statements, CompoundStmt)
-                );
-                rslt->returnDecls = GET_ACCEPT_V(returnDecls, ObjectDecl);
-                rslt->dtors       = GET_ACCEPT_V(dtors      , Expr);
-
-                this->node = visitBaseExpr_SkipResultType( old, rslt );
-        }
-
-        virtual void visit( UniqueExpr * old ) override final {
-                auto rslt = new ast::UniqueExpr(
-                        old->location,
-                        GET_ACCEPT_1(expr, Expr)
-                );
-                rslt->object = GET_ACCEPT_1(object, ObjectDecl);
-                rslt->var    = GET_ACCEPT_1(var   , VariableExpr);
-
-                this->node = visitBaseExpr( old, rslt );
-        }
-
-        virtual void visit( UntypedInitExpr * old ) override final {
-                std::vector<ast::InitAlternative> initAlts;
-                for (auto ia : old->initAlts) {
-                        initAlts.push_back(ast::InitAlternative(
-                                getAccept1< ast::Type, Type * >( ia.type ),
-                                getAccept1< ast::Designation, Designation * >( ia.designation )
-                        ));
-                }
-                this->node = visitBaseExpr( old,
-                        new ast::UntypedInitExpr(
-                                old->location,
-                                GET_ACCEPT_1(expr, Expr),
-                                std::move(initAlts)
-                        )
-                );
-        }
-
-        virtual void visit( InitExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::InitExpr(
-                                old->location,
-                                GET_ACCEPT_1(expr, Expr),
-                                GET_ACCEPT_1(designation, Designation)
-                        )
-                );
-        }
-
-        virtual void visit( DeletedExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::DeletedExpr(
-                                old->location,
-                                GET_ACCEPT_1(expr, Expr),
-                                inCache(old->deleteStmt) ?
-                                        this->node :
-                                        GET_ACCEPT_1(deleteStmt, Node)
-                        )
-                );
-        }
-
-        virtual void visit( DefaultArgExpr * old ) override final {
-                this->node = visitBaseExpr( old,
-                        new ast::DefaultArgExpr(
-                                old->location,
-                                GET_ACCEPT_1(expr, Expr)
-                        )
-                );
-        }
-
-        virtual void visit( GenericExpr * old ) override final {
-                std::vector<ast::GenericExpr::Association> associations;
-                for (auto association : old->associations) {
-                        associations.push_back(ast::GenericExpr::Association(
-                                getAccept1< ast::Type, Type * >( association.type ),
-                                getAccept1< ast::Expr, Expression * >( association.expr )
-                        ));
-                }
-                this->node = visitBaseExpr( old,
-                        new ast::GenericExpr(
-                                old->location,
-                                GET_ACCEPT_1(control, Expr),
-                                std::move(associations)
-                        )
-                );
+        virtual void visit( TypeExpr * ) override final {
+
+        }
+
+        virtual void visit( AsmExpr * ) override final {
+
+        }
+
+        virtual void visit( ImplicitCopyCtorExpr * ) override final {
+
+        }
+
+        virtual void visit( ConstructorExpr *  ) override final {
+
+        }
+
+        virtual void visit( CompoundLiteralExpr * ) override final {
+
+        }
+
+        virtual void visit( RangeExpr * ) override final {
+
+        }
+
+        virtual void visit( UntypedTupleExpr * ) override final {
+
+        }
+
+        virtual void visit( TupleExpr * ) override final {
+
+        }
+
+        virtual void visit( TupleIndexExpr * ) override final {
+
+        }
+
+        virtual void visit( TupleAssignExpr * ) override final {
+
+        }
+
+        virtual void visit( StmtExpr *  ) override final {
+
+        }
+
+        virtual void visit( UniqueExpr *  ) override final {
+
+        }
+
+        virtual void visit( UntypedInitExpr *  ) override final {
+
+        }
+
+        virtual void visit( InitExpr *  ) override final {
+
+        }
+
+        virtual void visit( DeletedExpr * ) override final {
+
+        }
+
+        virtual void visit( DefaultArgExpr * ) override final {
+
+        }
+
+        virtual void visit( GenericExpr * ) override final {
+
         }
 

src/AST/Expr.cpp

@@ -335 +335 @@
 }
 
-TupleAssignExpr::TupleAssignExpr( 
-        const CodeLocation & loc, const Type * result, const StmtExpr * s )
-: Expr( loc, result ), stmtExpr() {
-        stmtExpr = s;
-}
-
 // --- StmtExpr
 

src/AST/Expr.hpp

@@ -30 +30 @@
 #define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
-class ConverterOldToNew;
-
 namespace ast {
 
@@ -530 +528 @@
         std::vector<ptr<ObjectDecl>> tempDecls;
         std::vector<ptr<ObjectDecl>> returnDecls;
-        std::vector<ptr<Expr>> dtors;
+        std::vector<ptr<ObjectDecl>> dtors;
 
         ImplicitCopyCtorExpr( const CodeLocation& loc, const ApplicationExpr * call )
@@ -637 +635 @@
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
-
-        friend class ::ConverterOldToNew;
-
 private:
         TupleAssignExpr * clone() const override { return new TupleAssignExpr{ *this }; }
-    TupleAssignExpr( const CodeLocation & loc, const Type * result, const StmtExpr * s );
-
         MUTATE_FRIEND
 };

src/SynTree/Expression.h

@@ -741 +741 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, Indenter indent = {} ) const;
-
-        friend class ConverterNewToOld;
-  private:
-    TupleAssignExpr( StmtExpr * stmts );
 };
 

src/SynTree/TupleExpr.cc

@@ -105 +105 @@
 }
 
-TupleAssignExpr::TupleAssignExpr( 
-        StmtExpr * s )
-: Expression(), stmtExpr(s) {
-}
-
-
 TupleAssignExpr::~TupleAssignExpr() {
         delete stmtExpr;