Changes in src/AST/Convert.cpp [60aaa51d:0b73f0c]

File:

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

src/AST/Convert.cpp

@@ -16 +16 @@
 #include "Convert.hpp"
 
-#include <deque>
 #include <unordered_map>
 
@@ -576 +575 @@
 
                 if ( srcInferred.mode == ast::Expr::InferUnion::Params ) {
-                        const ast::InferredParams &srcParams = srcInferred.inferParams();
+                        const ast::InferredParams &srcParams = srcInferred.inferParamsConst();
                         for (auto srcParam : srcParams) {
                                 tgtInferParams[srcParam.first] = ParamEntry(
@@ -586 +585 @@
                         }
                 } else if ( srcInferred.mode == ast::Expr::InferUnion::Slots  ) {
-                        const ast::ResnSlots &srcSlots = srcInferred.resnSlots();
+                        const ast::ResnSlots &srcSlots = srcInferred.resnSlotsConst();
                         for (auto srcSlot : srcSlots) {
                                 tgtResnSlots.push_back(srcSlot);
@@ -736 +735 @@
                 expr->var = get<DeclarationWithType>().accept1(node->var);
                 Type * type = expr->var->get_type()->clone();
+                if(FunctionType * ft = dynamic_cast<FunctionType*>(type)) {
+                        if(node->result.as<ast::PointerType>()) {
+                                type = new PointerType({}, ft);
+                        }
+                }
+
                 type->set_lvalue( true );
-                expr->set_result( type );
+                expr->result = type ;
                 this->node = expr;
                 return nullptr;
@@ -783 +788 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new SizeofExpr(
                                 get<Type>().accept1(node->type)
@@ -804 +810 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new AlignofExpr(
                                 get<Type>().accept1(node->type)
@@ -1414 +1421 @@
 #       define GET_ACCEPT_V(child, type) \
                 getAcceptV< ast::type, decltype( old->child ) >( old->child )
-        
-        template<typename NewT, typename OldC>
-        std::deque< ast::ptr<NewT> > getAcceptD( OldC& old ) {
-                std::deque< ast::ptr<NewT> > ret;
-                for ( auto a : old ) {
-                        a->accept( *this );
-                        ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
-                        node = nullptr;
-                }
-                return ret;
-        }
-
-#       define GET_ACCEPT_D(child, type) \
-                getAcceptD< ast::type, decltype( old->child ) >( old->child )
 
         ast::Label make_label(Label* old) {
@@ -2164 +2157 @@
                 );
 
-                visitBaseExpr( old,
+                visitBaseExpr_SkipResultType( old,
                         expr
                 );
@@ -2170 +2163 @@
                 expr->var = GET_ACCEPT_1(var, DeclWithType);
                 expr->result = expr->var->get_type();
+                if(const ast::FunctionType * ft = expr->result.as<ast::FunctionType>()) {
+                        if(dynamic_cast<PointerType *>(old->result)) {
+                                expr->result = new ast::PointerType(ft);
+                        }
+                }
                 add_qualifiers( expr->result, ast::CV::Lvalue );
                 this->node = expr;
@@ -2464 +2462 @@
 
         virtual void visit( UntypedInitExpr * old ) override final {
-                std::deque<ast::InitAlternative> initAlts;
+                std::vector<ast::InitAlternative> initAlts;
                 for (auto ia : old->initAlts) {
                         initAlts.push_back(ast::InitAlternative(
@@ -2729 +2727 @@
                 this->node = new ast::Designation(
                         old->location,
-                        GET_ACCEPT_D(designators, Expr)
+                        GET_ACCEPT_V(designators, Expr)
                 );
         }