Changes in src/ResolvExpr/Resolver.cc [7583c02:2dda05d]

File:

• src/ResolvExpr/Resolver.cc (modified) (7 diffs)

src/ResolvExpr/Resolver.cc

@@ -986 +986 @@
                 };
         } // anonymous namespace
+
         /// Check if this expression is or includes a deleted expression
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
@@ -1151 +1152 @@
                         const ast::Expr * untyped, const ast::SymbolTable & symtab
                 ) {
+                        resetTyVarRenaming();
                         ast::TypeEnvironment env;
                         ast::ptr< ast::Expr > newExpr = resolveInVoidContext( untyped, symtab, env );
@@ -1310 +1312 @@
         }
 
-        const ast::Expr * resolveStmtExpr(
+        ast::ptr< ast::Expr > resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab
         ) {
                 assert( stmtExpr );
                 ast::Pass< Resolver_new > resolver{ symtab };
-                auto ret = mutate(stmtExpr->accept(resolver));
-                strict_dynamic_cast< ast::StmtExpr * >( ret )->computeResult();
+                ast::ptr< ast::Expr > ret = stmtExpr;
+                ret = ret->accept( resolver );
+                strict_dynamic_cast< ast::StmtExpr * >( ret.get_and_mutate() )->computeResult();
                 return ret;
         }
@@ -1372 +1375 @@
                         }
 
-                        // handle assertions
+                        // handle assertions. (seems deep)
 
                         symtab.enterScope();
-                        mutType->forall.clear();
-                        mutType->assertions.clear();
-                        for (auto & typeParam : mutDecl->type_params) {
-                                symtab.addType(typeParam);
-                                mutType->forall.emplace_back(new ast::TypeInstType(typeParam->name, typeParam));
-                        }
-                        for (auto & asst : mutDecl->assertions) {
-                                asst = fixObjectType(asst.strict_as<ast::ObjectDecl>(), symtab);
-                                symtab.addId(asst);
-                                mutType->assertions.emplace_back(new ast::VariableExpr(functionDecl->location, asst));
+                        for (auto & typeParam : mutType->forall) {
+                                auto mutParam = typeParam.get_and_mutate();
+                                symtab.addType(mutParam);
+                                for (auto & asst : mutParam->assertions) {
+                                        asst = fixObjectType(asst.strict_as<ast::ObjectDecl>(), symtab);
+                                        symtab.addId(asst);
+                                }
+                                typeParam = mutParam;
                         }
 
@@ -1406 +1407 @@
                         mutType->returns = std::move(returnTypes);
 
-                        auto renamedType = strict_dynamic_cast<const ast::FunctionType *>(renameTyVars(mutType, RenameMode::GEN_EXPR_ID));
-
                         std::list<ast::ptr<ast::Stmt>> newStmts;
                         resolveWithExprs (mutDecl->withExprs, newStmts);
@@ -1419 +1418 @@
                         symtab.leaveScope();
 
-                        mutDecl->type = renamedType;
                         mutDecl->mangleName = Mangle::mangle(mutDecl);
                         mutDecl->isTypeFixed = true;
@@ -1536 +1534 @@
         const PtrType * handlePtrType( const PtrType * type, const ast::SymbolTable & symtab ) {
                 if ( type->dimension ) {
-                        ast::ptr< ast::Type > sizeType = ast::sizeType;
+                        #warning should use new equivalent to Validate::SizeType rather than sizeType here
+                        ast::ptr< ast::Type > sizeType = new ast::BasicType{ ast::BasicType::LongUnsignedInt };
                         ast::mutate_field(
                                 type, &PtrType::dimension,