Changeset 933f32f for src/SynTree/TypeSubstitution.h

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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 branch 'master' into cleanup-dtors

File:

• src/SynTree/TypeSubstitution.h (modified) (11 diffs)

src/SynTree/TypeSubstitution.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:52:24 2017
-// Update Count     : 3
+// Last Modified On : Tue Apr 30 22:52:47 2019
+// Update Count     : 9
 //
 
@@ -19 +19 @@
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
-#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
-#include <set>                     // for set
+#include <unordered_map>
+#include <unordered_set>
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
@@ -39 +39 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( SynTreeClass *&input );
-        template< typename SynTreeClass > int applyFree( SynTreeClass *&input );
+        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
 
         void add( std::string formalType, Type *actualType );
@@ -48 +48 @@
         bool empty() const;
 
+        void addVar( std::string formalExpr, Expression *actualExpr );
+
         template< typename FormalIterator, typename ActualIterator >
         void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
@@ -56 +58 @@
 
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
-        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
+        static TypeSubstitution * newFromExpr( Expression * expr, const TypeSubstitution * env );
 
         void normalize();
@@ -78 +80 @@
         friend class PassVisitor;
 
-        typedef std::map< std::string, Type* > TypeEnvType;
-        typedef std::map< std::string, Expression* > VarEnvType;
+        typedef std::unordered_map< std::string, Type * > TypeEnvType;
+        typedef std::unordered_map< std::string, Expression * > VarEnvType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
@@ -89 +91 @@
         auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
         auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+
+        auto beginVar()       -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar()       -> decltype( varEnv.  end() ) { return varEnv.  end(); }
+        auto beginVar() const -> decltype( varEnv.begin() ) { return varEnv.begin(); }
+        auto   endVar() const -> decltype( varEnv.  end() ) { return varEnv.  end(); }
 };
 
@@ -98 +105 @@
         ActualIterator actualIt = actualBegin;
         for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
-                if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
-                        if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+                if ( TypeDecl *formal = dynamic_cast< TypeDecl * >( *formalIt ) ) {
+                        if ( TypeExpr *actual = dynamic_cast< TypeExpr * >( *actualIt ) ) {
                                 if ( formal->get_name() != "" ) {
                                         TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
@@ -130 +137 @@
 // definitition must happen after PassVisitor is included so that WithGuards can be used
 struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter> {
-                Substituter( TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
+                Substituter( const TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
 
                 Type * postmutate( TypeInstType * aggregateUseType );
@@ -143 +150 @@
                 void premutate( UnionInstType * aggregateUseType );
 
-                TypeSubstitution & sub;
+                const TypeSubstitution & sub;
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::set< std::string > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( SynTreeClass *&input ) {
+int TypeSubstitution::apply( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, false );
@@ -163 +170 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( SynTreeClass *&input ) {
+int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, true );