Changeset 3f7e12cb for src/ResolvExpr/Alternative.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/ResolvExpr/Alternative.cc (modified) (1 diff)

src/ResolvExpr/Alternative.cc

@@ -66 +66 @@
         }
 
-        void Alternative::print( std::ostream &os, int indent ) const {
-                os << std::string( indent, ' ' ) << "Cost " << cost << ": ";
+        void Alternative::print( std::ostream &os, Indenter indent ) const {
+                os << "Cost " << cost << ": ";
                 if ( expr ) {
-                        expr->print( os, indent );
-                        os << "(types:" << std::endl;
-                        os << std::string( indent+4, ' ' );
-                        expr->get_result()->print( os, indent + 4 );
-                        os << std::endl << ")" << std::endl;
+                        expr->print( os, indent+1 );
+                        os << std::endl << indent << "(types:" << std::endl;
+                        os << indent+1;
+                        expr->result->print( os, indent+1 );
+                        os << std::endl << indent << ")" << std::endl;
                 } else {
                         os << "Null expression!" << std::endl;
                 } // if
-                os << std::string( indent, ' ' ) << "Environment: ";
-                env.print( os, indent+2 );
+                os << indent << "Environment: ";
+                env.print( os, indent+1 );
                 os << std::endl;
         }