Changeset aa8f9df for src/CodeGen

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

File:

• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -309 +309 @@
                                                         UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
-                                                        assert( (*arg)->get_results().size() == 1 );
-                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_result() );
                                                         assert( type );
-                                                        newExpr->get_results().push_back( type->clone() );
+                                                        newExpr->set_result( type->clone() );
                                                         *arg = newExpr;
                                                 } // if
@@ -527 +526 @@
                 extension( castExpr );
                 output << "(";
-                if ( castExpr->get_results().empty() ) {
+                if ( castExpr->get_result()->isVoid() ) {
                         output << "(void)" ;
-                } else if ( ! castExpr->get_results().front()->get_isLvalue() ) {
+                } else if ( ! castExpr->get_result()->get_isLvalue() ) {
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_results().front(), "" );
+                        output << genType( castExpr->get_result(), "" );
                         output << ")";
                 } else {