oreodave/ovm
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate changes to lerr_t into preprocesser

Browse Source
This commit is contained in:
Aryadev Chavali
2024-04-15 16:33:02 +06:30
parent b83bdd0d45
commit 4a7341e26c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asm/preprocesser.cpp
View File

@@ -81,7 +81,7 @@ preprocess_use_blocks(const vector<token_t *> &tokens)
std::vector<token_t *> ftokens; std::vector<token_t *> ftokens;
lerr_t lerr = tokenise_buffer(source.value(), ftokens); lerr_t lerr = tokenise_buffer(source.value(), ftokens);
if (lerr != lerr_t::OK) if (lerr.type != lerr_type_t::OK)
{ {
VCLEAR(new_tokens); VCLEAR(new_tokens);
return ERR(pp_err_t(pp_err_type_t::FILE_PARSE_ERROR, name, lerr)); return ERR(pp_err_t(pp_err_type_t::FILE_PARSE_ERROR, name, lerr));
@@ -196,19 +196,17 @@ std::ostream &operator<<(std::ostream &os, pp_err_t &err)
return os << "FILE_NONEXISTENT"; return os << "FILE_NONEXISTENT";
case FILE_PARSE_ERROR: case FILE_PARSE_ERROR:
return os << "FILE_PARSE_ERROR -> \n\t[" << err.reference->content return os << "FILE_PARSE_ERROR -> \n\t[" << err.reference->content
<< "]: " << lerr_as_cstr(err.lerr); << "]: " << err.lerr;
case UNKNOWN_NAME: case UNKNOWN_NAME:
return os << "UNKNOWN_NAME"; return os << "UNKNOWN_NAME";
} }
return os; return os;
} }
pp_err_t::pp_err_t() pp_err_t::pp_err_t() : reference{nullptr}, type{pp_err_type_t::OK}, lerr{}
: reference{nullptr}, type{pp_err_type_t::OK}, lerr{lerr_t::OK}
{} {}
pp_err_t::pp_err_t(pp_err_type_t e) pp_err_t::pp_err_t(pp_err_type_t e) : reference{nullptr}, type{e}, lerr{}
: reference{nullptr}, type{e}, lerr{lerr_t::OK}
{} {}
pp_err_t::pp_err_t(pp_err_type_t err, const token_t *ref) pp_err_t::pp_err_t(pp_err_type_t err, const token_t *ref)