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

File:

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

src/Tuples/TupleAssignment.cc

@@ -41 +41 @@
 #include "SynTree/Visitor.h"               // for Visitor
 
-#if 0
-#define PRINT(x) x
-#else
-#define PRINT(x)
-#endif
-
 namespace Tuples {
         class TupleAssignSpotter {
@@ -125 +119 @@
                 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 +131 @@
                                         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 +159 @@
                 // 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 {
@@ -264 +248 @@
                         ctorInit->accept( rm );
                 }
-                PRINT( std::cerr << "new object: " << ret << std::endl; )
                 return ret;
         }