Changes in src/ResolvExpr/Unify.cc [302ef2a:361bf01]

File:

• src/ResolvExpr/Unify.cc (modified) (8 diffs)

src/ResolvExpr/Unify.cc

@@ -773 +773 @@
 
                         const ast::Type * postvisit( const ast::TypeInstType * typeInst ) {
-                                if ( const ast::EqvClass * clz = tenv.lookup( *typeInst ) ) {
+                                if ( const ast::EqvClass * clz = tenv.lookup( typeInst->name ) ) {
                                         // expand ttype parameter into its actual type
                                         if ( clz->data.kind == ast::TypeDecl::Ttype && clz->bound ) {
@@ -811 +811 @@
                 /// Creates a tuple type based on a list of DeclWithType
                 template< typename Iter >
-                static const ast::Type * tupleFromTypes( Iter crnt, Iter end ) {
+                static ast::ptr< ast::Type > tupleFromTypes( Iter crnt, Iter end ) {
                         std::vector< ast::ptr< ast::Type > > types;
                         while ( crnt != end ) {
@@ -821 +821 @@
                         }
 
-                        return new ast::TupleType{ std::move(types) };
+                        return { new ast::TupleType{ std::move(types) } };
                 }
 
@@ -888 +888 @@
                 }
 
-                static void markAssertionSet( ast::AssertionSet & assns, const ast::VariableExpr * assn ) {
+                static void markAssertionSet( ast::AssertionSet & assns, const ast::DeclWithType * assn ) {
                         auto i = assns.find( assn );
                         if ( i != assns.end() ) {
@@ -900 +900 @@
                         const ast::FunctionType * type
                 ) {
-                        for ( auto & assert : type->assertions ) {
-                                markAssertionSet( assn1, assert );
-                                markAssertionSet( assn2, assert );
+                        for ( const auto & tyvar : type->forall ) {
+                                for ( const ast::DeclWithType * assert : tyvar->assertions ) {
+                                        markAssertionSet( assn1, assert );
+                                        markAssertionSet( assn2, assert );
+                                }
                         }
                 }
@@ -1028 +1030 @@
 
                 void postvisit( const ast::TypeInstType * typeInst ) {
-                        assert( open.find( *typeInst ) == open.end() );
+                        assert( open.find( typeInst->name ) == open.end() );
                         handleRefType( typeInst, type2 );
                 }
@@ -1034 +1036 @@
         private:
                 /// Creates a tuple type based on a list of Type
-                static const ast::Type * tupleFromTypes(
+                static ast::ptr< ast::Type > tupleFromTypes(
                         const std::vector< ast::ptr< ast::Type > > & tys
                 ) {
@@ -1169 +1171 @@
                 auto var2 = dynamic_cast< const ast::TypeInstType * >( type2 );
                 ast::OpenVarSet::const_iterator
-                        entry1 = var1 ? open.find( *var1 ) : open.end(),
-                        entry2 = var2 ? open.find( *var2 ) : open.end();
+                        entry1 = var1 ? open.find( var1->name ) : open.end(),
+                        entry2 = var2 ? open.find( var2->name ) : open.end();
                 bool isopen1 = entry1 != open.end();
                 bool isopen2 = entry2 != open.end();