Changeset 05d55ff for src/AST/Convert.cpp

Timestamp:

Jun 7, 2019, 4:15:03 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

2d11663, 46438e4

Parents:

60aaa51d (diff), be8518f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/AST/Convert.cpp

@@ -736 +736 @@
                 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 +789 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new SizeofExpr(
                                 get<Type>().accept1(node->type)
@@ -804 +811 @@
                         assert (!rslt->isType);
                 }
-                if (node->type) {
+                else {
+                        assert(node->type);
                         rslt = new AlignofExpr(
                                 get<Type>().accept1(node->type)
@@ -2164 +2172 @@
                 );
 
-                visitBaseExpr( old,
+                visitBaseExpr_SkipResultType( old,
                         expr
                 );
@@ -2170 +2178 @@
                 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;