Changeset aa8f9df for src/InitTweak

Timestamp:

Sep 15, 2016, 3:22:50 PM (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:

4ab9536

Parents:

fd782b2 (diff), 906e24d (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 'replace-results-list' into tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/SymTab/Indexer.cc
src/SynTree/Mutator.cc
src/SynTree/Visitor.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (6 diffs)
• InitTweak.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -391 +391 @@
                                 CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *impCpCtorExpr->get_env() << std::endl; )
                                 // xxx - need to handle tuple arguments
-                                assert( ! arg->get_results().empty() );
-                                Type * result = arg->get_results().front();
+                                assert( arg->has_result() );
+                                Type * result = arg->get_result();
                                 if ( skipCopyConstruct( result ) ) continue; // skip certain non-copyable types
                                 // type may involve type variables, so apply type substitution to get temporary variable's actual type
@@ -423 +423 @@
                         // level. Trying to pass that environment along.
                         callExpr->set_env( impCpCtorExpr->get_env()->clone() );
-                        for ( Type * result : appExpr->get_results() ) {
+                        Type * result = appExpr->get_result();
+                        if ( ! result->isVoid() ) {
+                                // need to flatten result type and construct each
                                 result = result->clone();
                                 impCpCtorExpr->get_env()->apply( result );
@@ -479 +481 @@
                                 // know the result type of the assignment is the type of the LHS (minus the pointer), so
                                 // add that onto the assignment expression so that later steps have the necessary information
-                                assign->add_result( returnDecl->get_type()->clone() );
+                                assign->set_result( returnDecl->get_type()->clone() );
 
                                 Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
-                                if ( callExpr->get_results().front()->get_isLvalue() ) {
+                                if ( callExpr->get_result()->get_isLvalue() ) {
                                         // lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any lvalue returning
                                         // non-intrinsic function. Add an AddressExpr to the call to negate the derefence and change the
@@ -500 +502 @@
                                         UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
                                         deref->get_args().push_back( retExpr );
-                                        deref->add_result( resultType );
+                                        deref->set_result( resultType );
                                         retExpr = deref;
                                 } // if
@@ -939 +941 @@
                 Expression * FixCtorExprs::mutate( ConstructorExpr * ctorExpr ) {
                         static UniqueName tempNamer( "_tmp_ctor_expr" );
-                        assert( ctorExpr->get_results().size() == 1 );
-                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_results().front()->clone(), nullptr );
+                        assert( ctorExpr->has_result() && ctorExpr->get_result()->size() == 1 );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
                         addDeclaration( tmp );
 
@@ -952 +954 @@
                         assign->get_args().push_back( new VariableExpr( tmp ) );
                         assign->get_args().push_back( firstArg );
-                        cloneAll( ctorExpr->get_results(), assign->get_results() );
+                        assign->set_result( ctorExpr->get_result()->clone() );
                         firstArg = assign;
 

src/InitTweak/InitTweak.cc

@@ -340 +340 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                assert( ! appExpr->get_function()->get_results().empty() );
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_results().front() );
+                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;