Changeset eb5962a for src/AST/TypeSubstitution.hpp

Timestamp:

Jun 21, 2022, 1:39:24 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b62d1d6

Parents:

1df492a (diff), 1dbbef6 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/TypeSubstitution.hpp (modified) (3 diffs)

src/AST/TypeSubstitution.hpp

@@ -75 +75 @@
         void add( const TypeSubstitution &other );
         void remove( const TypeInstType * formalType );
+        const Type *lookup( const TypeInstType::TypeEnvKey & formalType ) const;
         const Type *lookup( const TypeInstType * formalType ) const;
         bool empty() const;
@@ -104 +105 @@
         friend class Pass;
 
-        typedef std::unordered_map< TypeInstType::TypeEnvKey, ptr<Type> > TypeEnvType;
-        TypeEnvType typeEnv;
+        typedef std::unordered_map< TypeInstType::TypeEnvKey, ptr<Type> > TypeMap;
+        TypeMap typeMap;
 
   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(); }
+        // has to come after declaration of typeMap
+        auto begin()       -> decltype( typeMap.begin() ) { return typeMap.begin(); }
+        auto   end()       -> decltype( typeMap.  end() ) { return typeMap.  end(); }
+        auto begin() const -> decltype( typeMap.begin() ) { return typeMap.begin(); }
+        auto   end() const -> decltype( typeMap.  end() ) { return typeMap.  end(); }
 
 };
@@ -144 +145 @@
                         if ( const TypeExpr *actual = actualIt->template as<TypeExpr>() ) {
                                 if ( formal->name != "" ) {
-                                        typeEnv[ formal ] = actual->type;
+                                        typeMap[ formal ] = actual->type;
                                 } // if
                         } else {