Changeset 1f44196 for src/SynTree/ApplicationExpr.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/SynTree/ApplicationExpr.cc (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -21 +21 @@
 #include "TypeSubstitution.h"
 #include "Common/utility.h"
-
+#include "ResolvExpr/typeops.h"
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
@@ -43 +43 @@
 
 ApplicationExpr::ApplicationExpr( Expression *funcExpr ) : function( funcExpr ) {
-        PointerType *pointer = dynamic_cast< PointerType* >( funcExpr->get_results().front() );
-        assert( pointer );
-        FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
-        assert( function );
+        PointerType *pointer = safe_dynamic_cast< PointerType* >( funcExpr->get_result() );
+        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
 
-        for ( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
-                get_results().push_back( (*i)->get_type()->clone() );
-        } // for
+        set_result( ResolvExpr::extractResultType( function ) );
+
+        assert( has_result() );
 }