Changes in src/ResolvExpr/Resolver.cc [62e5546:5f5083e]

File:

• src/ResolvExpr/Resolver.cc (modified) (7 diffs)

src/ResolvExpr/Resolver.cc

@@ -19 +19 @@
 #include "RenameVars.h"
 #include "ResolveTypeof.h"
+#include "typeops.h"
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
@@ -68 +69 @@
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
           void fallbackInit( ConstructorInit * ctorInit );
-                std::list< Type * > functionReturn;
-                Type *initContext;
+
+                Type * functionReturn = nullptr;
+                Type *initContext = nullptr;
                 bool inEnumDecl = false;
         };
@@ -157 +159 @@
                         const TypeEnvironment *newEnv = 0;
                         for ( AltList::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
-                                if ( i->expr->get_results().size() == 1 && isIntegralType( i->expr->get_results().front() ) ) {
+                                if ( i->expr->get_result()->size() == 1 && isIntegralType( i->expr->get_result() ) ) {
                                         if ( newExpr ) {
                                                 throw SemanticError( "Too many interpretations for case control expression", untyped );
@@ -234 +236 @@
                 Type *new_type = resolveTypeof( functionDecl->get_type(), *this );
                 functionDecl->set_type( new_type );
-                std::list< Type * > oldFunctionReturn = functionReturn;
-                functionReturn.clear();
-                for ( std::list< DeclarationWithType * >::const_iterator i = functionDecl->get_functionType()->get_returnVals().begin(); i != functionDecl->get_functionType()->get_returnVals().end(); ++i ) {
-                        functionReturn.push_back( (*i)->get_type() );
-                } // for
+                ValueGuard< Type * > oldFunctionReturn( functionReturn );
+                functionReturn = ResolvExpr::extractResultType( functionDecl->get_functionType() );
                 SymTab::Indexer::visit( functionDecl );
-                functionReturn = oldFunctionReturn;
         }
 
@@ -338 +336 @@
         void Resolver::visit( ReturnStmt *returnStmt ) {
                 if ( returnStmt->get_expr() ) {
-                        CastExpr *castExpr = new CastExpr( returnStmt->get_expr() );
-                        cloneAll( functionReturn, castExpr->get_results() );
+                        CastExpr *castExpr = new CastExpr( returnStmt->get_expr(), functionReturn->clone() );
                         Expression *newExpr = findSingleExpression( castExpr, *this );
                         delete castExpr;
@@ -384 +381 @@
                                 if ( isCharType( at->get_base() ) ) {
                                         // check if the resolved type is char *
-                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
+                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
                                                 if ( isCharType( pt->get_base() ) ) {
                                                         // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
@@ -446 +443 @@
                                 (*iter)->accept( *this );
                         } // for
+                } else if ( TupleType * tt = dynamic_cast< TupleType * > ( initContext ) ) {
+                        for ( Type * t : *tt ) {
+                                if ( iter == end ) break;
+                                initContext = t;
+                                (*iter++)->accept( *this );
+                        }
                 } else if ( StructInstType * st = dynamic_cast< StructInstType * >( initContext ) ) {
                         resolveAggrInit( st->get_baseStruct(), iter, end );