samvv/bolt
1
0
Fork 0
Code Issues 24 Pull requests Projects Releases Packages Wiki Activity Actions

Fix return-statements not being type-checked

Browse source
This commit is contained in:
Sam Vervaeck 2023-05-23 21:51:44 +02:00
parent 1d314808a9
commit 7024b8790d
Signed by: samvv
SSH key fingerprint: SHA256:dIg0ywU1OP+ZYifrYxy8c5esO72cIKB+4/9wkZj1VaY
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Checker.cc
View file

@ -393,8 +393,9 @@ namespace bolt {
case NodeKind::LetDeclaration: case NodeKind::LetDeclaration:
{ {
auto Decl = static_cast<LetDeclaration*>(N); auto Decl = static_cast<LetDeclaration*>(N);
bool HasContext = !Decl->Params.empty();
if (!Decl->Params.empty()) { if (HasContext) {
Contexts.push_back(Decl->Ctx); Contexts.push_back(Decl->Ctx);
} }
@ -419,7 +420,8 @@ namespace bolt {
case NodeKind::LetBlockBody: case NodeKind::LetBlockBody:
{ {
auto Block = static_cast<LetBlockBody*>(Decl->Body); auto Block = static_cast<LetBlockBody*>(Decl->Body);
RetType = createTypeVar(); ZEN_ASSERT(HasContext);
RetType = Decl->Ctx->ReturnType;
for (auto Element: Block->Elements) { for (auto Element: Block->Elements) {
infer(Element); infer(Element);
} }
@ -432,16 +434,13 @@ namespace bolt {
RetType = createTypeVar(); RetType = createTypeVar();
} }
if (ParamTypes.empty()) { if (HasContext) {
// Declaration is a plain (typed) variable
addConstraint(new CEqual { Decl->Ty, RetType, N });
} else {
// Declaration is a function // Declaration is a function
addConstraint(new CEqual { Decl->Ty, new TArrow(ParamTypes, RetType), N }); addConstraint(new CEqual { Decl->Ty, new TArrow(ParamTypes, RetType), N });
}
if (!Decl->Params.empty()) {
Contexts.pop_back(); Contexts.pop_back();
} else {
// Declaration is a plain (typed) variable
addConstraint(new CEqual { Decl->Ty, RetType, N });
} }
break; break;