Changes in src/ResolvExpr/TypeEnvironment.cc [a585396:50377a4]

File:

• src/ResolvExpr/TypeEnvironment.cc (modified) (4 diffs)

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 ) {
@@ -123 +123 @@
                 for ( std::list< EqvClass >::const_iterator theClass = env.begin(); theClass != env.end(); ++theClass ) {
                         for ( std::set< std::string >::const_iterator theVar = theClass->vars.begin(); theVar != theClass->vars.end(); ++theVar ) {
-///       std::cout << "adding " << *theVar;
+///       std::cerr << "adding " << *theVar;
                                 if ( theClass->type ) {
-///         std::cout << " bound to ";
-///         theClass->type->print( std::cout );
-///         std::cout << std::endl;
+///         std::cerr << " bound to ";
+///         theClass->type->print( std::cerr );
+///         std::cerr << std::endl;
                                         sub.add( *theVar, theClass->type );
                                 } else if ( theVar != theClass->vars.begin() ) {
                                         TypeInstType *newTypeInst = new TypeInstType( Type::Qualifiers(), *theClass->vars.begin(), theClass->data.kind == TypeDecl::Ftype );
-///         std::cout << " bound to variable " << *theClass->vars.begin() << std::endl;
+///         std::cerr << " bound to variable " << *theClass->vars.begin() << std::endl;
                                         sub.add( *theVar, newTypeInst );
                                         delete newTypeInst;
@@ -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 );
@@ -201 +201 @@
         }
 
-        void TypeEnvironment::addActual( const TypeEnvironment& actualEnv, OpenVarSet& openVars ) {
-                for ( const EqvClass& c : actualEnv ) {
-                        EqvClass c2 = c;
-                        c2.allowWidening = false;
-                        for ( const std::string& var : c2.vars ) {
-                                openVars[ var ] = c2.data;
-                        }
-                        env.push_back( std::move(c2) );
-                }
-        }
-
 } // namespace ResolvExpr