Changeset 3e5dd913 for src/GenPoly

Timestamp:

Dec 16, 2020, 2:43:12 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

53449a4

Parents:

13fece5

Message:

reimplement function type and eliminate deep copy

File:

• src/GenPoly/GenPoly.cc (modified) (3 diffs)

src/GenPoly/GenPoly.cc ¶

@@ -115 +115 @@
                 if (!env) return type;
                 if (auto typeInst = dynamic_cast<const ast::TypeInstType*> (type)) {
-                        auto newType = env->lookup(typeInst->name);
+                        auto newType = env->lookup(typeInst);
                         if (newType) return newType;
                 }
@@ -172 +172 @@
 
                 if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                        return tyVars.find(typeInst->name) != tyVars.end() ? type : nullptr;
+                        return tyVars.find(typeInst->typeString()) != tyVars.end() ? type : nullptr;
                 } else if ( auto arrayType = dynamic_cast< const ast::ArrayType * >( type ) ) {
                         return isPolyType( arrayType->base, env );
@@ -552 +552 @@
         }
 
-        void addToTyVarMap( const ast::TypeDecl * tyVar, TyVarMap & tyVarMap) {
-                tyVarMap.insert(tyVar->name, convData(ast::TypeDecl::Data{tyVar}));
+        void addToTyVarMap( const ast::TypeInstType * tyVar, TyVarMap & tyVarMap) {
+                tyVarMap.insert(tyVar->typeString(), convData(ast::TypeDecl::Data{tyVar->base}));
         }