benji/lib94
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

actually check assertions under new compiler

Browse source
This commit is contained in:
Benji Dial 2023-05-31 13:02:57 -04:00
parent 6aa768c7c8
commit 6be4a1d094
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib94/warrior.cpp
View file

@ -345,7 +345,7 @@ namespace lib94 {
}; };
struct info_from_preprocessor { struct info_from_preprocessor {
std::vector<std::unique_ptr<assert_expr>> assertions; std::vector<assertion> assertions;
std::optional<std::string> name; std::optional<std::string> name;
std::optional<std::string> author; std::optional<std::string> author;
}; };
@ -374,10 +374,10 @@ namespace lib94 {
line = line.substr(0, semicolon); line = line.substr(0, semicolon);
if (comment.starts_with("assert ")) { if (comment.starts_with("assert ")) {
std::unique_ptr<assert_expr> assertion; std::unique_ptr<assert_expr> expr;
try { try {
assertion = std::move(to_assert_expr(comment.substr(7))); expr = std::move(to_assert_expr(comment.substr(7)));
} }
catch (const assert_expr_exception &iex) { catch (const assert_expr_exception &iex) {
compiler_exception ex; compiler_exception ex;
@ -385,7 +385,11 @@ namespace lib94 {
ex.message = iex.message; ex.message = iex.message;
} }
info.assertions.push_back(std::move(assertion)); info.assertions.push_back((assertion){
.source_line = line_number,
.expr = std::move(expr),
.offset = (number_t)into.size()
});
} }
else if (comment.starts_with("name ")) { else if (comment.starts_with("name ")) {
@ -825,6 +829,30 @@ namespace lib94 {
} }
} }
for (const assertion &a : info.assertions) {
bool success;
try {
success = a.expr->is_true(a.offset, inline_macros, labels);
}
catch (const number_expr_exception &iex) {
compiler_exception ex;
ex.line_number = a.source_line;
ex.message = iex.message;
throw ex;
}
if (!success) {
compiler_exception ex;
ex.line_number = a.source_line;
ex.message = "failed assertion";
throw ex;
}
}
return new warrior { return new warrior {
.name = info.name.value(), .name = info.name.value(),
.author = info.author.value(), .author = info.author.value(),