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

feat: add member access to expressions

Browse Source
This commit is contained in:
TopchetoEU 2022-10-20 14:30:44 +03:00
parent eb167d0a50
commit 3229d41d85
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/treeifier/ast/parsers/exp.cc
View File

@ -164,24 +164,25 @@ class exp_parser_t : public parser_t {
h.advance("Expected a value on the right side of the operator."); h.advance("Expected a value on the right side of the operator.");
continue; continue;
} }
if (!last_val && h.push_parse("$_exp_val", res)) last_val = true;
if (h.curr().is_operator()) { if (h.curr().is_operator()) {
auto op = h.curr()._operator(); auto op = h.curr()._operator();
if (last_val) { if (last_val) {
if (op == operator_t::PAREN_OPEN) { if (op == operator_t::PAREN_OPEN) {
h.advance("Expected an argument.");
call_args_n.push_back(0); call_args_n.push_back(0);
op_stack.push_back({ h.loc(), { precedence_t::CALL_START } }); op_stack.push_back({ h.loc(), { precedence_t::CALL_START } });
h.advance("Expected an argument.");
last_val = false; last_val = false;
} }
else if (op == operator_t::COMMA) { else if (op == operator_t::COMMA) {
if (call_args_n.size() == 0) break; if (call_args_n.size() == 0) break;
h.advance("Expected an argument.");
pop_until({ precedence_t::CALL_START, .assoc = true }, h, op_stack, res); pop_until({ precedence_t::CALL_START, .assoc = true }, h, op_stack, res);
h.advance("Expected an argument.");
call_args_n.back()++; call_args_n.back()++;
last_val = false; last_val = false;
} }
else if (h.curr().is_operator(operator_t::PAREN_CLOSE)) { else if (op == operator_t::PAREN_CLOSE) {
bool is_call = false, is_paren = false; bool is_call = false, is_paren = false;
for (auto i = op_stack.rbegin(); i != op_stack.rend(); i++) { for (auto i = op_stack.rbegin(); i != op_stack.rend(); i++) {
@ -201,7 +202,7 @@ class exp_parser_t : public parser_t {
if (!h.try_advance()) break; if (!h.try_advance()) break;
} }
else if (h.curr().is_operator(operator_t::COLON)) { else if (op == operator_t::COLON) {
h.advance("Expected a type."); h.advance("Expected a type.");
pop_until({ precedence_t::PREFIX, .assoc = true }, h, op_stack, res); pop_until({ precedence_t::PREFIX, .assoc = true }, h, op_stack, res);
map_t cast = { map_t cast = {
@ -213,6 +214,24 @@ class exp_parser_t : public parser_t {
h.force_parse("$_type", "Expected a type.", cast["type"].map({})); h.force_parse("$_type", "Expected a type.", cast["type"].map({}));
res.push_back(cast); res.push_back(cast);
} }
else if (op == operator_t::DOT || op == operator_t::PTR_MEMBER) {
h.advance("Expected an identifier.");
pop_until({ precedence_t::POSTFIX, .assoc = true }, h, op_stack, res);
map_t member_access = {
{ "$_name", "$_member" },
{ "exp", res.back() },
{ "is_ptr", op == operator_t::PTR_MEMBER },
};
h.force_parse("$_identifier", "Expected an identifier.", member_access["name"].map({}));
member_access["location"] = conv::loc_to_map(
conv::map_to_loc(member_access["name"].map()["location"].string()).intersect(
conv::map_to_loc(res.back().map()["location"].string())
)
);
res.pop_back();
res.push_back(member_access);
}
else if (bin_ops.find(op) != bin_ops.end()) { else if (bin_ops.find(op) != bin_ops.end()) {
auto data = bin_ops[op]; auto data = bin_ops[op];
pop_until(data, h, op_stack, res); pop_until(data, h, op_stack, res);
@ -244,7 +263,6 @@ class exp_parser_t : public parser_t {
} }
continue; continue;
} }
if (!last_val && h.push_parse("$_exp_val", res)) last_val = true;
else break; else break;
} }