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

File:

• src/Tuples/TupleAssignment.cc (modified) (7 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
-
-#if 0
-#define PRINT(x) x
-#else
-#define PRINT(x)
-#endif
+#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 {
@@ -90 +77 @@
         bool isTuple( Expression *expr ) {
                 if ( ! expr ) return false;
-                assert( expr->result );
+                assert( expr->has_result() );
                 return dynamic_cast< TupleType * >( expr->get_result()->stripReferences() );
         }
@@ -125 +112 @@
                 if (  NameExpr *op = dynamic_cast< NameExpr * >(expr->get_function()) ) {
                         if ( CodeGen::isCtorDtorAssign( op->get_name() ) ) {
-                               fname = op->get_name();
-                                PRINT( std::cerr << "TupleAssignment: " << fname << std::endl; )
+                                fname = op->get_name();
                                 for ( std::list<ResolvExpr::AltList>::const_iterator ali = possibilities.begin(); ali != possibilities.end(); ++ali ) {
                                         if ( ali->size() == 0 ) continue; // AlternativeFinder will natrually handle this case, if it's legal
@@ -138 +124 @@
                                         const ResolvExpr::Alternative & alt1 = ali->front();
                                         auto begin = std::next(ali->begin(), 1), end = ali->end();
-                                        PRINT( std::cerr << "alt1 is " << alt1.expr << std::endl; )
                                         if ( refToTuple(alt1.expr) ) {
-                                                PRINT( std::cerr << "and is reference to tuple" << std::endl; )
                                                 if ( isMultAssign( begin, end ) ) {
-                                                        PRINT( std::cerr << "possible multiple assignment" << std::endl; )
                                                         matcher.reset( new MultipleAssignMatcher( *this, *ali ) );
                                                 } else {
                                                         // mass assignment
-                                                        PRINT( std::cerr << "possible mass assignment" << std::endl; )
                                                         matcher.reset( new MassAssignMatcher( *this,  *ali ) );
                                                 }
@@ -170 +152 @@
                 // now resolve new assignments
                 for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) {
-                        PRINT(
-                                std::cerr << "== resolving tuple assign ==" << std::endl;
-                                std::cerr << *i << std::endl;
-                        )
-
                         ResolvExpr::AlternativeFinder finder( currentFinder.get_indexer(), currentFinder.get_environ() );
                         try {
@@ -254 +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.
@@ -264 +241 @@
                         ctorInit->accept( rm );
                 }
-                PRINT( std::cerr << "new object: " << ret << std::endl; )
                 return ret;
         }