Changes in src/SynTree/ApplicationExpr.cc [68195a6:e3e16bc]

File:

• src/SynTree/ApplicationExpr.cc (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -55 +55 @@
         set_result( ResolvExpr::extractResultType( function ) );
 
-        assert( result );
+        assert( has_result() );
 }
 
 ApplicationExpr::ApplicationExpr( const ApplicationExpr &other ) :
-                Expression( other ), function( maybeClone( other.function ) ) {
+                Expression( other ), function( maybeClone( other.function ) ), inferParams( other.inferParams ) {
         cloneAll( other.args, args );
 }
@@ -68 +68 @@
 }
 
-void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Application of" << std::endl << indent+1;
-        function->print( os, indent+1 );
-        os << std::endl;
+void printInferParams( const InferredParams & inferParams, std::ostream &os, int indent, int level ) {
+        if ( ! inferParams.empty() ) {
+                os << std::string(indent, ' ') << "with inferred parameters " << level << ":" << std::endl;
+                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
+                        os << std::string(indent+2, ' ');
+                        Declaration::declFromId( i->second.decl )->printShort( os, indent+2 );
+                        os << std::endl;
+                        printInferParams( *i->second.inferParams, os, indent+2, level+1 );
+                } // for
+        } // if
+}
+
+void ApplicationExpr::print( std::ostream &os, int indent ) const {
+        os << "Application of" << std::endl << std::string(indent+2, ' ');
+        function->print( os, indent+2 );
         if ( ! args.empty() ) {
-                os << indent << "... to arguments" << std::endl;
-                printAll( args, os, indent+1 );
+                os << std::string( indent, ' ' ) << "to arguments" << std::endl;
+                printAll( args, os, indent+2 );
         } // if
+        printInferParams( inferParams, os, indent+2, 0 );
         Expression::print( os, indent );
 }