Changeset aa8f9df for src/ResolvExpr/ResolveTypeof.cc

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/ResolvExpr/ResolveTypeof.cc (modified) (2 diffs)

src/ResolvExpr/ResolveTypeof.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.cc -- 
+// ResolveTypeof.cc --
 //
 // Author           : Richard C. Bilson
@@ -58 +58 @@
                 if ( typeofType->get_expr() ) {
                         Expression *newExpr = resolveInVoidContext( typeofType->get_expr(), indexer );
-                        assert( newExpr->get_results().size() > 0 );
-                        Type *newType;
-                        if ( newExpr->get_results().size() > 1 ) {
-                                TupleType *tupleType = new TupleType( Type::Qualifiers() );
-                                cloneAll( newExpr->get_results(), tupleType->get_types() );
-                                newType = tupleType;
-                        } else {
-                                newType = newExpr->get_results().front()->clone();
-                        } // if
+                        assert( newExpr->has_result() && ! newExpr->get_result()->isVoid() );
+                        Type *newType = newExpr->get_result();
                         delete typeofType;
                         return newType;