Changes in src/ResolvExpr/CandidateFinder.cpp [d958834b:9e23b446]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (5 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -41 +41 @@
 #include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
+#include "SymTab/Validate.h"      // for validateType
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
 #include "InitTweak/InitTweak.h"  // for getPointerBase
@@ -897 +898 @@
                                                 }
 
-                                                if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);                                             
-                                                // else if (const ast::EnumInstType * enumInst = argType.as<ast::EnumInstType>()) {
-                                                //      const ast::EnumDecl * enumDecl = enumInst->base; // Here
-                                                //      if ( const ast::Type* enumType = enumDecl->base ) {
-                                                //              // instance of enum (T) is a instance of type (T) 
-                                                //              funcFinder.otypeKeys.insert(Mangle::mangle(enumType, Mangle::NoGenericParams | Mangle::Type));
-                                                //      } else {
-                                                //              // instance of an untyped enum is techically int
-                                                //              funcFinder.otypeKeys.insert(Mangle::mangle(enumDecl, Mangle::NoGenericParams | Mangle::Type));
-                                                //      }
-                                                // }
+                                                if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);
+                                                else if (const ast::EnumInstType * enumInst = argType.as<ast::EnumInstType>()) {
+                                                        const ast::EnumDecl * enumDecl = enumInst->base;
+                                                        if ( const ast::Type* enumType = enumDecl->base ) {
+                                                                // instance of enum (T) is a instance of type (T) 
+                                                                funcFinder.otypeKeys.insert(Mangle::mangle(enumType, Mangle::NoGenericParams | Mangle::Type));
+                                                        } else {
+                                                                // instance of an untyped enum is techically int
+                                                                funcFinder.otypeKeys.insert(Mangle::mangle(enumDecl, Mangle::NoGenericParams | Mangle::Type));
+                                                        }
+                                                } 
                                                 else funcFinder.otypeKeys.insert(Mangle::mangle(argType, Mangle::NoGenericParams | Mangle::Type));
                                         }
@@ -1090 +1091 @@
                         assert( toType );
                         toType = resolveTypeof( toType, context );
+                        // toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
@@ -1263 +1265 @@
                                         newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, Cost::zero,
                                         cost );
+
+                                if (newCand->expr->env) {
+                                        newCand->env.add(*newCand->expr->env);
+                                        auto mutExpr = newCand->expr.get_and_mutate();
+                                        mutExpr->env  = nullptr;
+                                        newCand->expr = mutExpr;
+                                }
+
                                 PRINT(
                                         std::cerr << "decl is ";
@@ -1580 +1590 @@
                                 // calculate target type
                                 const ast::Type * toType = resolveTypeof( initAlt.type, context );
+                                // toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
                                 // The call to find must occur inside this loop, otherwise polymorphic return