Changes in src/Tuples/TupleAssignment.cc [d29fa5f:5fb6830]

File:

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

src/Tuples/TupleAssignment.cc

@@ -14 +14 @@
 //
 
-#include <algorithm>                       // for transform
-#include <cassert>                         // for assert
-#include <iterator>                        // for back_insert_iterator, back...
-#include <list>                            // for _List_const_iterator, _Lis...
-#include <memory>                          // for unique_ptr, allocator_trai...
-#include <string>                          // for string
-
+#include "ResolvExpr/AlternativeFinder.h"
+#include "ResolvExpr/Alternative.h"
+#include "ResolvExpr/typeops.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
+#include "Tuples.h"
+#include "Explode.h"
+#include "Common/SemanticError.h"
 #include "CodeGen/OperatorTable.h"
-#include "Common/UniqueName.h"             // for UniqueName
-#include "Common/utility.h"                // for zipWith
-#include "Explode.h"                       // for explode
-#include "InitTweak/GenInit.h"             // for genCtorInit
-#include "InitTweak/InitTweak.h"           // for getPointerBase, isAssignment
-#include "Parser/LinkageSpec.h"            // for Cforall
-#include "ResolvExpr/Alternative.h"        // for AltList, Alternative
-#include "ResolvExpr/AlternativeFinder.h"  // for AlternativeFinder, simpleC...
-#include "ResolvExpr/Cost.h"               // for Cost
-#include "ResolvExpr/Resolver.h"           // for resolveCtorInit
-#include "ResolvExpr/TypeEnvironment.h"    // for TypeEnvironment
-#include "SynTree/Declaration.h"           // for ObjectDecl
-#include "SynTree/Expression.h"            // for Expression, CastExpr, Name...
-#include "SynTree/Initializer.h"           // for ConstructorInit, SingleInit
-#include "SynTree/Statement.h"             // for ExprStmt
-#include "SynTree/Type.h"                  // for Type, Type::Qualifiers
-#include "SynTree/TypeSubstitution.h"      // for TypeSubstitution
-#include "SynTree/Visitor.h"               // for Visitor
+#include "InitTweak/InitTweak.h"
+#include "InitTweak/GenInit.h"
+
+#include <functional>
+#include <algorithm>
+#include <iterator>
+#include <iostream>
+#include <cassert>
+#include <set>
+#include <unordered_set>
 
 namespace Tuples {
@@ -84 +77 @@
         bool isTuple( Expression *expr ) {
                 if ( ! expr ) return false;
-                assert( expr->result );
+                assert( expr->has_result() );
                 return dynamic_cast< TupleType * >( expr->get_result()->stripReferences() );
         }
@@ -238 +231 @@
 
         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.