Changes in src/AST/TypeSubstitution.hpp [3e5dd913:361bf01]

File:

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

src/AST/TypeSubstitution.hpp

@@ -69 +69 @@
         }
 
-        void add( const TypeInstType * formalType, const Type *actualType );
-        void add( const TypeInstType::TypeEnvKey & key, const Type *actualType );
+        void add( std::string formalType, const Type *actualType );
         void add( const TypeSubstitution &other );
-        void remove( const TypeInstType * formalType );
-        const Type *lookup( const TypeInstType * formalType ) const;
+        void remove( std::string formalType );
+        const Type *lookup( std::string formalType ) const;
         bool empty() const;
+
+        void addVar( std::string formalExpr, const Expr *actualExpr );
 
         template< typename FormalIterator, typename ActualIterator >
@@ -100 +101 @@
         friend class Pass;
 
-        typedef std::unordered_map< TypeInstType::TypeEnvKey, ptr<Type> > TypeEnvType;
+        typedef std::unordered_map< std::string, ptr<Type> > TypeEnvType;
+        typedef std::unordered_map< std::string, ptr<Expr> > VarEnvType;
         TypeEnvType typeEnv;
+        VarEnvType varEnv;
 
   public:
@@ -110 +113 @@
         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(); }
 };
 
-// this is the only place where type parameters outside a function formal may be substituted.
 template< typename FormalIterator, typename ActualIterator >
 void TypeSubstitution::add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
@@ -123 +129 @@
                         if ( const TypeExpr *actual = actualIt->template as<TypeExpr>() ) {
                                 if ( formal->name != "" ) {
-                                        typeEnv[ formal ] = actual->type;
+                                        typeEnv[ formal->name ] = actual->type;
                                 } // if
                         } else {
@@ -129 +135 @@
                         } // if
                 } else {
-                        
+                        // TODO: type check the formal and actual parameters
+                        if ( (*formalIt)->name != "" ) {
+                                varEnv[ (*formalIt)->name ] = *actualIt;
+                        } // if
                 } // if
         } // for
 }
-
-
 
 template< typename FormalIterator, typename ActualIterator >
@@ -140 +147 @@
         add( formalBegin, formalEnd, actualBegin );
 }
-
 
 } // namespace ast
@@ -158 +164 @@
 
                 const Type * postvisit( const TypeInstType * aggregateUseType );
+                const Expr * postvisit( const NameExpr * nameExpr );
 
                 /// Records type variable bindings from forall-statements
                 void previsit( const FunctionType * type );
                 /// Records type variable bindings from forall-statements and instantiations of generic types
-                // void handleAggregateType( const BaseInstType * type );
-
-                // void previsit( const StructInstType * aggregateUseType );
-                // void previsit( const UnionInstType * aggregateUseType );
+                void handleAggregateType( const BaseInstType * type );
+
+                void previsit( const StructInstType * aggregateUseType );
+                void previsit( const UnionInstType * aggregateUseType );
 
                 const TypeSubstitution & sub;
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::unordered_set< TypeInstType::TypeEnvKey > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;