Changes in src/SynTree/ApplicationExpr.cc [6c3a988f:2c57025]

File:

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

src/SynTree/ApplicationExpr.cc

@@ -24 +24 @@
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ), inferParams( new InferredParams( *other.inferParams ) ) {
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
 }
 
@@ -34 +34 @@
         formalType = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
-        *inferParams = *other.inferParams;
         return *this;
 }
@@ -63 +62 @@
 }
 
-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, ' ');
@@ -82 +69 @@
                 printAll( args, os, indent+2 );
         } // if
-        printInferParams( inferParams, os, indent+2, 0 );
+        if ( ! inferParams.empty() ) {
+                os << std::string(indent, ' ') << "with inferred parameters:" << 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;
+                } // for
+        } // if
         Expression::print( os, indent );
 }