Changeset 4ee1efb for src/SynTree/Expression.cc

Timestamp:

Oct 26, 2017, 11:23:26 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

136ccd7

Parents:

0b9be4d (diff), 598f50e (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.

git-author:

Rob Schluntz <rschlunt@…> (10/26/17 10:43:08)

git-committer:

Rob Schluntz <rschlunt@…> (10/26/17 11:23:26)

Message:

Merge branch 'fix-missing-cast-warning' into cleanup-dtors

File:

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

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 ) {}
 
-Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ) {
+Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ) {
 }
 
@@ -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;