Changeset 09c72d5

Timestamp:

Mar 2, 2018, 5:34:52 PM (6 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:

b8baa37

Parents:

dd05e12

git-author:

Rob Schluntz <rschlunt@…> (03/02/18 17:10:28)

git-committer:

Rob Schluntz <rschlunt@…> (03/02/18 17:34:52)

Message:

Add function to add bindings from TypeSubstitution? to TypeEnvironment?

Location:

src

Files:

• ResolvExpr/TypeEnvironment.cc (modified) (1 diff)
• ResolvExpr/TypeEnvironment.h (modified) (1 diff)
• SynTree/TypeSubstitution.h (modified) (1 diff)

src/ResolvExpr/TypeEnvironment.cc

@@ -118 +118 @@
                         env.push_back( newClass );
                 } // for
+        }
+
+        void TypeEnvironment::add( const TypeSubstitution & sub ) {
+                EqvClass newClass;
+                for ( auto p : sub ) {
+                        newClass.vars.insert( p.first );
+                        newClass.type = p.second->clone();
+                        newClass.allowWidening = false;
+                        // Minimal assumptions. Not technically correct, but might be good enough, and
+                        // is the best we can do at the moment since information is lost in the
+                        // transition to TypeSubstitution
+                        newClass.data = TypeDecl::Data{ TypeDecl::Dtype, false };
+                        add( newClass );
+                }
         }
 

src/ResolvExpr/TypeEnvironment.h

@@ -76 +76 @@
                 void add( const EqvClass &eqvClass );
                 void add( const Type::ForallList &tyDecls );
+                void add( const TypeSubstitution & sub );
                 template< typename SynTreeClass > int apply( SynTreeClass *&type ) const;
                 template< typename SynTreeClass > int applyFree( SynTreeClass *&type ) const;

src/SynTree/TypeSubstitution.h

@@ -82 +82 @@
         TypeEnvType typeEnv;
         VarEnvType varEnv;
+
+  public:
+        // has to come after declaration of typeEnv
+        auto begin()       -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end()       -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+        auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
 };