Changeset b21c77a for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Jun 29, 2018, 4:14:15 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

184557e

Parents:

97397a26 (diff), 28f3a19 (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 remote-tracking branch 'origin/with_gc' into new-env

File:

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

src/ResolvExpr/TypeEnvironment.cc

@@ -7 +7 @@
 // TypeEnvironment.cc --
 //
-// Author           : Richard C. Bilson
+// Author           : Aaron B. Moss
 // Created On       : Sun May 17 12:19:47 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:23:36 2015
-// Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Jun 29 15:51:00 2018
+// Update Count     : 5
 //
 
@@ -27 +27 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "TypeEnvironment.h"
+#include "typeops.h"                   // for occurs
 #include "Unify.h"                     // for unifyInexact
 
@@ -50 +51 @@
 #if 0
         void EqvClass::initialize( const EqvClass &src, EqvClass &dest ) {
+                initialize( src, dest, src.type );
+        }
+
+        void EqvClass::initialize( const EqvClass &src, EqvClass &dest, const Type *ty ) {
                 dest.vars = src.vars;
-                dest.type = maybeClone( src.type );
+                dest.type = maybeClone( ty );
                 dest.allowWidening = src.allowWidening;
                 dest.data = src.data;
         }
 
-        EqvClass::EqvClass() : vars(), type( 0 ), allowWidening( true ), data() {}
-
-        EqvClass::EqvClass( std::vector<interned_string>&& vs, BoundType&& bound )
-                : vars( vs.begin(), vs.end() ), type( maybeClone( bound.type ) ), 
-                  allowWidening( bound.allowWidening ), data( bound.data ) {}
+        EqvClass::EqvClass() : type( nullptr ), allowWidening( true ) {
+        }
 
         EqvClass::EqvClass( const EqvClass &other ) {
                 initialize( other, *this );
+        }
+
+        EqvClass::EqvClass( const EqvClass &other, const Type *ty ) {
+                initialize( other, *this, ty );
+        }
+
+        EqvClass::EqvClass( EqvClass &&other ) 
+        : vars{std::move(other.vars)}, type{other.type}, 
+          allowWidening{std::move(other.allowWidening)}, data{std::move(other.data)} {
+                  other.type = nullptr;
         }
 
@@ -71 +83 @@
                 return *this;
         }
+
+        EqvClass &EqvClass::operator=( EqvClass &&other ) {
+                if ( this == &other ) return *this;
+                
+                vars = std::move(other.vars);
+                type = other.type;
+                allowWidening = std::move(other.allowWidening);
+                data = std::move(other.data);
+
+                return *this;
+        }
+
+        void EqvClass::set_type( Type* ty ) { type = ty; }
 
         void EqvClass::print( std::ostream &os, Indenter indent ) const {
@@ -88 +113 @@
         const EqvClass* TypeEnvironment::lookup( const std::string &var ) const {
                 for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
-                        if ( i->vars.find( var ) != i->vars.end() ) {
-///       std::cout << var << " is in class ";
-///       i->print( std::cout );
-                                return &*i;
-                        }
-///     std::cout << var << " is not in class ";
-///     i->print( std::cout );
+                        if ( i->vars.find( var ) != i->vars.end() ) return &*i;
                 } // for
                 return nullptr;
@@ -118 +137 @@
                 if ( root ) return { this, root };
                 else return { nullptr, var };
+        }
+
+        bool isFtype( Type *type ) {
+                if ( dynamic_cast< FunctionType* >( type ) ) {
+                        return true;
+                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        return typeInst->get_isFtype();
+                } // if
+                return false;
         }
 
@@ -288 +316 @@
         }
 
-        void TypeEnvironment::add( const EqvClass &eqvClass ) {
-                filterOverlappingClasses( env, eqvClass );
-                env.push_back( eqvClass );
-        }
-
         void TypeEnvironment::add( EqvClass &&eqvClass ) {
                 filterOverlappingClasses( env, eqvClass );
@@ -303 +326 @@
                         newClass.vars.insert( (*i)->get_name() );
                         newClass.data = TypeDecl::Data{ (*i) };
-                        env.push_back( newClass );
+                        env.push_back( std::move(newClass) );
                 } // for
         }
@@ -317 +340 @@
                         // transition to TypeSubstitution
                         newClass.data = TypeDecl::Data{ TypeDecl::Dtype, false };
-                        add( newClass );
+                        add( std::move(newClass) );
                 }
         }
@@ -324 +347 @@
                 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::cerr << "adding " << *theVar;
                                 if ( theClass->type ) {
-///         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::cerr << " bound to variable " << *theClass->vars.begin() << std::endl;
                                         sub.add( *theVar, newTypeInst );
                                 } // if
                         } // for
                 } // for
-///   std::cerr << "input env is:" << std::endl;
-///   print( std::cerr, 8 );
-///   std::cerr << "sub is:" << std::endl;
-///   sub.print( std::cerr, 8 );
                 sub.normalize();
         }
 
         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 );
+                for ( const EqvClass & theClass : env ) {
+                        theClass.print( os, indent );
                 } // for
         }
@@ -352 +366 @@
         std::list< EqvClass >::iterator TypeEnvironment::internal_lookup( const std::string &var ) {
                 for ( std::list< EqvClass >::iterator i = env.begin(); i != env.end(); ++i ) {
-                        if ( i->vars.find( var ) == i->vars.end() ) {
-                                return i;
-                        } // if
+                        if ( i->vars.count( var ) ) return i;
                 } // for
                 return env.end();