Changeset 68195a6 for src/SynTree

Timestamp:

Oct 25, 2017, 4:07:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bb666f64

Parents:

b45d4b2

Message:

Move inferParams print to Expression

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (2 diffs)
• Expression.cc (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -68 +68 @@
 }
 
-void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
-        if ( ! inferParams.empty() ) {
-                os << indent << "with inferred parameters " << level << ":" << std::endl;
-                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
-                        os << indent+1;
-                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
-                        os << std::endl;
-                        printInferParams( *i->second.inferParams, os, indent+1, level+1 );
-                } // for
-        } // if
-}
-
 void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Application of" << std::endl << indent+1;
@@ -88 +76 @@
                 printAll( args, os, indent+1 );
         } // if
-        printInferParams( inferParams, os, indent+1, 0 );
         Expression::print( os, indent );
 }

src/SynTree/Expression.cc

@@ -33 +33 @@
 #include "GenPoly/Lvalue.h"
 
+void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
+        if ( ! inferParams.empty() ) {
+                os << indent << "with inferred parameters " << level << ":" << std::endl;
+                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
+                        os << indent+1;
+                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
+                        os << std::endl;
+                        printInferParams( *i->second.inferParams, os, indent+1, level+1 );
+                } // for
+        } // if
+}
+
 Expression::Expression() : result( 0 ), env( 0 ) {}
 
@@ -44 +56 @@
 
 void Expression::print( std::ostream &os, Indenter indent ) const {
+        printInferParams( inferParams, os, indent+1, 0 );
+
         if ( env ) {
                 os << std::endl << indent << "... with environment:" << std::endl;