Changes in src/AST/Convert.cpp [60aaa51d:6355ba7]

File:

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

src/AST/Convert.cpp

@@ -154 +154 @@
                 auto&& attr = get<Attribute>().acceptL( node->attributes );
                 if ( inCache( node ) ) {
-                        if(node->name == "tmp") {
-                                std::cerr << (void*)node << "(new) in cache " << (void*)this->node << "(old)" << std::endl;
-                        }
                         return nullptr;
                 }
@@ -169 +166 @@
                         Type::FuncSpecifiers( node->funcSpec.val )
                 );
-                if(node->name == "tmp") {
-                        std::cerr << (void*)node << "(new) created " << (void*)decl << "(old)" << std::endl;
-                }
                 return declWithTypePostamble( decl, node );
         }
@@ -736 +730 @@
                 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 +783 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new SizeofExpr(
                                 get<Type>().accept1(node->type)
@@ -804 +805 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new AlignofExpr(
                                 get<Type>().accept1(node->type)
@@ -1414 +1416 @@
 #       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 ) {
@@ -1462 +1464 @@
 
         virtual void visit( ObjectDecl * old ) override final {
-                if( old->name == "tmp" ) {
-                        std::cerr << "building parameters for" << (void*)old << std::endl;
-                }
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& init = GET_ACCEPT_1(init, Init);
                 auto&& bfwd = GET_ACCEPT_1(bitfieldWidth, Expr);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
-                if( old->name == "tmp" ) {
-                        std::cerr << "checking cache for " << (void*)old << std::endl;
-                }
                 if ( inCache( old ) ) {
-                        if( old->name == "tmp" ) {
-                                std::cerr << (void*)old << "(old) in cache " << (void*)this->node << "(new)" << std::endl;
-                        }
                         return;
                 }
@@ -1490 +1483 @@
                 );
                 cache.emplace(old, decl);
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) added to cache with " << (void*)decl << "(new)" << std::endl;
-                }
                 assert(cache.find( old ) != cache.end());
                 decl->scopeLevel = old->scopeLevel;
@@ -1501 +1491 @@
 
                 this->node = decl;
-
-                if( old->name == "tmp" ) {
-                        std::cerr << (void*)old << "(old) created " << (void*)this->node << "(new)" << std::endl;
-                }
         }
 
@@ -2164 +2150 @@
                 );
 
-                visitBaseExpr( old,
+                visitBaseExpr_SkipResultType( old,
                         expr
                 );
@@ -2170 +2156 @@
                 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;