Changes in src/Tuples/TupleAssignment.cc [bd4f2e9:78315272]

File:

• src/Tuples/TupleAssignment.cc (modified) (4 diffs)

src/Tuples/TupleAssignment.cc

@@ -95 +95 @@
         bool isTuple( Expression *expr ) {
                 if ( ! expr ) return false;
-                assert( expr->result );
+                assert( expr->has_result() );
                 return dynamic_cast< TupleType * >( expr->get_result()->stripReferences() );
         }
@@ -251 +251 @@
                 // combine assignment environments into combined expression environment
                 simpleCombineEnvironments( current.begin(), current.end(), matcher->compositeEnv );
-                // xxx -- was push_front
-                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative(
+                currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(
                         new TupleAssignExpr(solved_assigns, matcher->tmpDecls), matcher->compositeEnv, 
                         ResolvExpr::sumCost( current ) + matcher->baseCost ) );
@@ -286 +285 @@
 
         ObjectDecl * TupleAssignSpotter::Matcher::newObject( UniqueName & namer, Expression * expr ) {
-                assert( expr->result && ! expr->get_result()->isVoid() );
+                assert( expr->has_result() && ! expr->get_result()->isVoid() );
                 ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->get_result()->clone(), new SingleInit( expr->clone() ) );
                 // if expression type is a reference, don't need to construct anything, a simple initializer is sufficient.
@@ -296 +295 @@
                         ctorInit->accept( rm );
                 }
-                PRINT( std::cerr << "new object: " << ret << std::endl; )
                 return ret;
         }