Changeset 906e24d for src/ResolvExpr/Resolver.cc

Timestamp:

Sep 15, 2016, 10:17:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

aa8f9df

Parents:

96a10cd

git-author:

Rob Schluntz <rschlunt@…> (09/14/16 22:32:34)

git-committer:

Rob Schluntz <rschlunt@…> (09/15/16 10:17:16)

Message:

replace results list on Expressions with a single Type field

File:

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

src/ResolvExpr/Resolver.cc

@@ -19 +19 @@
 #include "RenameVars.h"
 #include "ResolveTypeof.h"
+#include "typeops.h"
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
@@ -67 +68 @@
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
           void fallbackInit( ConstructorInit * ctorInit );
-                std::list< Type * > functionReturn;
+                Type * functionReturn;
                 Type *initContext;
                 Type *switchType;
@@ -155 +156 @@
                         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 );
@@ -232 +233 @@
                 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;
         }
 
@@ -336 +333 @@
         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;
@@ -382 +378 @@
                                 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";