mirrors/codon
1
0
Fork 0
mirror of https://github.com/exaloop/codon.git synced 2025-06-03 15:03:52 +08:00
Code Issues Projects Releases Wiki Activity

Fix ctx->age in realizeFunction

Browse Source
This commit is contained in:
Ibrahim Numanagić 2022-01-31 10:33:32 -08:00
parent 363caec2ac
commit bbdd51cf9e
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
codon/parser/cache.cpp
View File

@ -111,14 +111,18 @@ ir::Func *Cache::realizeFunction(types::FuncTypePtr type,
}
}
}
int oldAge = typeCtx->age;
typeCtx->age = 99999;
auto tv = TypecheckVisitor(typeCtx);
ir::Func *f = nullptr;
if (auto rtv = tv.realize(type)) {
auto pr = pendingRealizations; // copy it as it might be modified
for (auto &fn : pr)
TranslateVisitor(codegenCtx).transform(functions[fn.first].ast->clone());
return functions[rtv->getFunc()->ast->name].realizations[rtv->realizedName()]->ir;
f = functions[rtv->getFunc()->ast->name].realizations[rtv->realizedName()]->ir;
}
return nullptr;
typeCtx->age = oldAge;
return f;
}
ir::types::Type *Cache::makeTuple(const std::vector<types::TypePtr> &types) {

17
codon/parser/visitors/typecheck/typecheck_expr.cpp
View File

@ -867,7 +867,8 @@ ExprPtr TypecheckVisitor::transformDot(DotExpr *expr,
N<CallExpr>(N<DotExpr>(expr->expr, "_getattr"), N<StringExpr>(expr->member)));
} else {
// For debugging purposes:
ctx->findMethod(typ->name, expr->member);
if (expr->member == "ticker")
ctx->findMethod(typ->name, expr->member);
error("cannot find '{}' in {}", expr->member, typ->toString());
}
}
@ -1392,13 +1393,13 @@ ExprPtr TypecheckVisitor::transformCall(CallExpr *expr, const types::TypePtr &in
// TODO: needs cleaner logic for this. Maybe just use normal record type
// and just track partialized function args, not the whole function as it's done
// now. Major caveat: needs rewiring of the function generic partialization logic.
if (startswith(calleeFn->ast->name, TYPE_PARTIAL) &&
endswith(calleeFn->ast->name, ".__new__:0")) {
seqassert(expr->type->getRecord(), "expected a partial record");
auto r = expr->type->getRecord();
expr->type = std::make_shared<PartialType>(r, ctx->cache->partials[r->name].first,
ctx->cache->partials[r->name].second);
}
// if (startswith(calleeFn->ast->name, TYPE_PARTIAL) &&
// endswith(calleeFn->ast->name, ".__new__:0")) {
// seqassert(expr->type->getRecord(), "expected a partial record");
// auto r = expr->type->getRecord();
// expr->type = std::make_shared<PartialType>(r, ctx->cache->partials[r->name].first,
// ctx->cache->partials[r->name].second);
// }
return nullptr;
}
}

7
codon/parser/visitors/typecheck/typecheck_stmt.cpp
View File

@ -508,6 +508,13 @@ void TypecheckVisitor::visit(ClassStmt *stmt) {
else
typ = std::make_shared<ClassType>(
stmt->name, ctx->cache->reverseIdentifierLookup[stmt->name]);
if (stmt->isRecord() && startswith(stmt->name, TYPE_PARTIAL)) {
seqassert(in(ctx->cache->partials, stmt->name),
"invalid partial initialization: {}", stmt->name);
typ = std::make_shared<PartialType>(typ->getRecord(),
ctx->cache->partials[stmt->name].first,
ctx->cache->partials[stmt->name].second);
}
typ->setSrcInfo(stmt->getSrcInfo());
ctx->add(TypecheckItem::Type, stmt->name, typ);
ctx->bases[0].visitedAsts[stmt->name] = {TypecheckItem::Type, typ};

3
codon/sir/module.cpp
View File

@ -142,7 +142,8 @@ Func *Module::getOrRealizeFunc(const std::string &funcName,
try {
return cache->realizeFunction(func, arg, gens);
} catch (const exc::ParserException &e) {
LOG_IR("getOrRealizeFunc parser error: {}", e.what());
for (int i = 0; i < e.messages.size(); i++)
LOG_IR("getOrRealizeFunc parser error at {}: {}", e.locations[i], e.messages[i]);
return nullptr;
}
}