Changeset 4ee36bf0 for src/ResolvExpr

Timestamp:

Nov 8, 2017, 2:50:35 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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 'master' into cleanup-dtors

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (4 diffs)
• CurrentObject.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -312 +312 @@
                 Cost convCost = conversionCost( actualType, formalType, indexer, env );
                 PRINT(
-                        std::cerr << std::endl << "cost is" << convCost << std::endl;
+                        std::cerr << std::endl << "cost is " << convCost << std::endl;
                 )
                 if ( convCost == Cost::infinity ) {
@@ -318 +318 @@
                 }
                 convCost.incPoly( polyCost( formalType, env, indexer ) + polyCost( actualType, env, indexer ) );
+                PRINT(
+                        std::cerr << "cost with polycost is " << convCost << std::endl;
+                )
                 return convCost;
         }
@@ -370 +373 @@
                                 if ( function->get_isVarArgs() ) {
                                         convCost.incUnsafe();
+                                        PRINT( std::cerr << "end of formals with varargs function: inc unsafe: " << convCost << std::endl; ; )
                                         // convert reference-typed expressions to value-typed expressions
                                         referenceToRvalueConversion( *actualExpr );
@@ -378 +382 @@
                         }
                         Type * formalType = (*formal)->get_type();
-                        PRINT(
-                                std::cerr << std::endl << "converting ";
-                                actualType->print( std::cerr, 8 );
-                                std::cerr << std::endl << " to ";
-                                formalType->print( std::cerr, 8 );
-                                std::cerr << std::endl << "environment is: ";
-                                alt.env.print( std::cerr, 8 );
-                                std::cerr << std::endl;
-                        )
                         convCost += computeExpressionConversionCost( *actualExpr, formalType, indexer, alt.env );
                         ++formal; // can't be in for-loop update because of the continue

src/ResolvExpr/CurrentObject.cc

@@ -260 +260 @@
 
                 AggregateIterator( const std::string & kind, const std::string & name, Type * inst, const MemberList & members ) : kind( kind ), name( name ), inst( inst ), members( members ), curMember( members.begin() ), sub( makeGenericSubstitution( inst ) ) {
+                        PRINT( std::cerr << "Creating " << kind << "(" << name << ")"; )
                         init();
                 }