Serene/serene
Serene
/
serene
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix some test cases related to call exprs

This commit is contained in:
Sameer Rahmani 2021-05-24 21:17:33 +01:00
parent 328c8c7e41
commit c21055716c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/serene/exprs/call.cpp
View File

@ -92,9 +92,9 @@ MaybeNode Call::make(SereneContext &ctx, List *list) {
// into the current environment.
auto maybeResult = ctx.getCurrentNS()->semanticEnv.lookup(sym->name);
if (!maybeResult) {
if (!maybeResult.hasValue()) {
std::string msg =
llvm::formatv("Can't resolve the symbol '{0}'!", sym->name);
llvm::formatv("Can't resolve the symbol '{0}'", sym->name);
return makeErrorful<Node>(sym->location, &errors::CantResolveSymbol, msg);
}

18
src/tests/exprs/list_tests.cpp.inc
View File

@ -162,21 +162,29 @@ TEST_CASE("Complex semantic analysis", "[semantic]") {
auto ast =
reader::read("(def a (fn (x) x))\n((def b (fn (x) (fn (y) y))))\n\n");
auto afterAst = reader::analyze(ctx, ast.getValue());
REQUIRE(afterAst);
CHECK(astToString(&afterAst.getValue()) ==
"<Def a -> <Fn Anonymous <List <Symbol x>> to <Symbol x>>> <Call <Def "
"b -> <Fn Anonymous <List <Symbol x>> to <Fn Anonymous <List <Symbol "
"y>> to <Symbol y>>>> >");
ast = reader::read("((fn (x) (def x b) x) (fn (x) x) (a b))");
ctx = makeSereneContext();
ns = makeNamespace(ctx, "user", llvm::None);
ast = reader::read("((a b))");
afterAst = reader::analyze(ctx, ast.getValue());
REQUIRE_FALSE(afterAst);
auto errs = afterAst.getError();
CHECK(errs[0]->toString() == "<Error E5: Can't resolve the symbol 'a'>");
ctx = makeSereneContext();
ns = makeNamespace(ctx, "user", llvm::None);
ast = reader::read("(def a (fn (x) x)) (a b)");
afterAst = reader::analyze(ctx, ast.getValue());
REQUIRE(afterAst);
CHECK(astToString(&afterAst.getValue()) ==
"<Call <Fn Anonymous <List <Symbol x>> to <Def x -> <Symbol b>> "
"<Symbol x>> <Fn Anonymous <List <Symbol x>> to <Symbol x>> <Call <Fn "
"Anonymous <List <Symbol x>> to <Symbol x>> <Symbol b>>>");
"<Def a -> <Fn Anonymous <List <Symbol x>> to <Symbol x>>> <Call <Fn "
"Anonymous <List <Symbol x>> to <Symbol x>> <Symbol b>>");
}
} // namespace exprs
} // namespace serene