Changeset 6c3a988f for src/SynTree/ApplicationExpr.cc

Timestamp:

Jan 5, 2017, 3:47:36 PM (8 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:

f831177

Parents:

1e3d5b6

Message:

fix inferred parameter data structures to correctly associate parameters with the entity that requested them, modify tuple specialization and unification to work with self-recursive assertions

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 ) ) {
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ), inferParams( new InferredParams( *other.inferParams ) ) {
 }
 
@@ -34 +34 @@
         formalType = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
+        *inferParams = *other.inferParams;
         return *this;
 }
@@ -62 +63 @@
 }
 
+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, ' ');
@@ -69 +82 @@
                 printAll( args, os, indent+2 );
         } // if
-        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
+        printInferParams( inferParams, os, indent+2, 0 );
         Expression::print( os, indent );
 }