topchetoeu/ppc-lang
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: some issues with glob parser

Browse Source
This commit is contained in:
TopchetoEU 2022-10-11 13:13:10 +03:00
parent a8cda64516
commit 9dca34696b
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/compiler/treeifier/ast/helper.hh
View File

@ -21,6 +21,20 @@ namespace ppc::comp::tree::ast {
public:
size_t i;
location_t loc(size_t n) {
location_t res = prev_loc();
res.start += res.length;
res.code_start += res.length;
res.length = n;
return res;
}
location_t prev_loc() {
auto prev_i = i;
if (i > 0) i--;
auto res = loc();
i = prev_i;
return res;
}
location_t next_loc(size_t n = 1) {
location_t res = loc();
res.start += res.length;
@ -51,6 +65,9 @@ namespace ppc::comp::tree::ast {
void err(std::string message) {
throw message_t::error(message, loc());
}
void err(std::string message, size_t n) {
throw message_t::error(message, loc(n));
}
bool submit(bool inc_i = true) {
res_i = (i += inc_i);

19
src/compiler/treeifier/ast/parsers/glob.cc
View File

@ -10,8 +10,10 @@ class nmsp_def_parser_t : public parser_t {
if (!h.curr().is_identifier("namespace")) return false;
h.force_parse("$_nmsp", "Expected a namespace.", res);
if (!h.curr().is_operator(operator_t::SEMICOLON)) h.err("Expected a semicolon.");
if (!h.curr().is_operator(operator_t::SEMICOLON)) {
ctx.messages.push(message_t::error("Expected a semicolon.", h.loc(1)));
return h.submit(false);
}
return h.submit(true);
}
@ -24,7 +26,10 @@ class import_parser_t : public parser_t {
if (!h.curr().is_identifier("import")) return false;
h.force_parse("$_nmsp", "Expected a namespace.", res);
if (!h.curr().is_operator(operator_t::SEMICOLON)) h.err("Expected a semicolon.");
if (!h.curr().is_operator(operator_t::SEMICOLON)) {
ctx.messages.push(message_t::error("Expected a semicolon.", h.loc(1)));
return h.submit(false);
}
return h.submit(true);
}
@ -39,11 +44,12 @@ class glob_parser_t : public parser_t {
bool parse(ast_ctx_t &ctx, size_t &res_i, data::map_t &out) const {
tree_helper_t h(ctx, res_i);
if (h.ended()) return true;
nmsp_def_parser(ctx, h.i, (out["namespace"] = map_t()).map());
ctx.nmsp = conv::map_to_nmsp(out["namespace"].map());
if (nmsp_def_parser(ctx, h.i, (out["namespace"] = map_t()).map())) {
ctx.nmsp = conv::map_to_nmsp(out["namespace"].map());
}
auto &imports = (out["imports"] = array_t()).array();
auto &contents = (out["content"] = array_t()).array();
/* auto &contents = */ (out["content"] = array_t()).array();
while (true) {
map_t map;
@ -56,6 +62,7 @@ class glob_parser_t : public parser_t {
if (!h.ended()) h.err("Invalid token.");
if (ctx.messages.is_failed()) return false;
return h.submit();
}