Changeset 3f7e12cb for src/SynTree/ApplicationExpr.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/SynTree/ApplicationExpr.cc

@@ -55 +55 @@
         set_result( ResolvExpr::extractResultType( function ) );
 
-        assert( has_result() );
+        assert( result );
 }
 
 ApplicationExpr::ApplicationExpr( const ApplicationExpr &other ) :
-                Expression( other ), function( maybeClone( other.function ) ), inferParams( other.inferParams ) {
+                Expression( other ), function( maybeClone( other.function ) ) {
         cloneAll( other.args, args );
 }
@@ -68 +68 @@
 }
 
-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
+void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
+        os << "Application of" << std::endl << indent+1;
+        function->print( os, indent+1 );
+        os << std::endl;
+        if ( ! args.empty() ) {
+                os << indent << "... to arguments" << std::endl;
+                printAll( args, os, indent+1 );
         } // 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 << std::string( indent, ' ' ) << "to arguments" << std::endl;
-                printAll( args, os, indent+2 );
-        } // if
-        printInferParams( inferParams, os, indent+2, 0 );
         Expression::print( os, indent );
 }