Changeset 50377a4 for src/ResolvExpr

Timestamp:

Oct 2, 2017, 4:39:42 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:

bf4b4cf

Parents:

a8555c5

Message:

Refactor tree print code to use Indenter

Location:

src/ResolvExpr

Files:

• Alternative.cc (modified) (1 diff)
• Alternative.h (modified) (1 diff)
• AlternativeFinder.cc (modified) (3 diffs)
• TypeEnvironment.cc (modified) (2 diffs)
• TypeEnvironment.h (modified) (2 diffs)

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;
         }

src/ResolvExpr/Alternative.h

@@ -39 +39 @@
                 ~Alternative();
 
-                void print( std::ostream &os, int indent = 0 ) const;
+                void print( std::ostream &os, Indenter indent = {} ) const;
 
                 Cost cost;

src/ResolvExpr/AlternativeFinder.cc

@@ -75 +75 @@
 
         namespace {
-                void printAlts( const AltList &list, std::ostream &os, int indent = 0 ) {
+                void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 ) {
+                        Indenter indent = { Indenter::tabsize, indentAmt };
                         for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
                                 i->print( os, indent );
@@ -195 +196 @@
                                 AltList winners;
                                 findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
-                                stream << "Cannot choose between " << winners.size() << " alternatives for expression ";
+                                stream << "Cannot choose between " << winners.size() << " alternatives for expression\n";
                                 expr->print( stream );
-                                stream << "Alternatives are:";
-                                printAlts( winners, stream, 8 );
+                                stream << "Alternatives are:\n";
+                                printAlts( winners, stream, 1 );
                                 throw SemanticError( stream.str() );
                         }
@@ -728 +729 @@
                 PRINT(
                         std::cerr << "known function ops:" << std::endl;
-                        printAlts( funcOpFinder.alternatives, std::cerr, 8 );
+                        printAlts( funcOpFinder.alternatives, std::cerr, 1 );
                 )
 

src/ResolvExpr/TypeEnvironment.cc

@@ -68 +68 @@
         }
 
-        void EqvClass::print( std::ostream &os, int indent ) const {
-                os << std::string( indent, ' ' ) << "( ";
+        void EqvClass::print( std::ostream &os, Indenter indent ) const {
+                os << "( ";
                 std::copy( vars.begin(), vars.end(), std::ostream_iterator< std::string >( os, " " ) );
                 os << ")";
                 if ( type ) {
                         os << " -> ";
-                        type->print( os, indent );
+                        type->print( os, indent+1 );
                 } // if
                 if ( ! allowWidening ) {
@@ -144 +144 @@
         }
 
-        void TypeEnvironment::print( std::ostream &os, int indent ) const {
+        void TypeEnvironment::print( std::ostream &os, Indenter indent ) const {
                 for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
                         i->print( os, indent );

src/ResolvExpr/TypeEnvironment.h

@@ -68 +68 @@
                 EqvClass &operator=( const EqvClass &other );
                 ~EqvClass();
-                void print( std::ostream &os, int indent = 0 ) const;
+                void print( std::ostream &os, Indenter indent = {} ) const;
         };
 
@@ -80 +80 @@
                 void makeSubstitution( TypeSubstitution &result ) const;
                 bool isEmpty() const { return env.empty(); }
-                void print( std::ostream &os, int indent = 0 ) const;
+                void print( std::ostream &os, Indenter indent = {} ) const;
                 void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
                 void simpleCombine( const TypeEnvironment &second );