Changeset aa8f9df for src/Tuples

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/Tuples

Files:

• TupleAssignment.cc (modified) (3 diffs)
• TupleExpansion.cc (modified) (1 diff)

src/Tuples/TupleAssignment.cc

@@ -88 +88 @@
         bool isTuple( Expression *expr ) {
                 if ( ! expr ) return false;
-
+                assert( expr->has_result() );
                 // xxx - used to include cast to varExpr and call to isTupleVar, but this doesn't seem like it should be necessary
-                return dynamic_cast<TupleExpr *>(expr) || expr->get_results().size() > 1;
+                return dynamic_cast<TupleExpr *>(expr) || expr->get_result()->size() > 1;
         }
 
@@ -102 +102 @@
 
         bool isTupleExpr( Expression *expr ) {
-                return expr->get_results().size() > 1;
+                assert( expr->has_result() );
+                return expr->get_result()->size() > 1;
         }
 
@@ -191 +192 @@
 
         ObjectDecl * newObject( UniqueName & namer, Expression * expr ) {
-                Type * type;
-                assert( expr->get_results().size() >= 1 );
-                if ( expr->get_results().size() > 1 ) {
-                        TupleType * tt = new TupleType( Type::Qualifiers() );
-                        cloneAll( expr->get_results(), tt->get_types() );
-                        type = tt;
-                } else {
-                        type = expr->get_results().front()->clone();
-                }
-                return new ObjectDecl( namer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, type, new SingleInit( expr->clone() ) );
+                assert( expr->has_result() && ! expr->get_result()->isVoid() );
+                return new ObjectDecl( namer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, expr->get_result()->clone(), new SingleInit( expr->clone() ) );
         }
 

src/Tuples/TupleExpansion.cc

@@ -85 +85 @@
                         addDeclaration( decl );
                 }
+                Type::Qualifiers qualifiers = newType->get_qualifiers();
                 delete newType;
-                return new StructInstType( newType->get_qualifiers(), typeMap[mangleName] );
+                return new StructInstType( qualifiers, typeMap[mangleName] );
         }