standardized all vector<ast_node> to ast_node with type CODEBLOCK

This commit is contained in:
starcells committed 2026-08-26 19:32:14 +08:00
1 parent 3122dee186
commit d3cbf6b2e1
2 files changed
+35 -29

No files matched your search

+1 -1
View File
@@ -41,7 +41,7 @@ public:
std::map<std::string, ast_node> macros;
general_data expand_node_to_data(const ast_node &node);
std::vector<ast_node> expand_node_to_ins(const ast_node &node);
ast_node expand_node_to_ins(const ast_node &node);
enum class operator_t {
ADD,
+34 -28
View File
@@ -25,25 +25,32 @@ r8asm::general_data r8asm::ast::expand_node_to_data(const ast_node &node) {
case ast_node_t::OPERATOR: {
switch (operator_map.at(node.value)) {
case operator_t::ADD:
to_return = expand_node_to_data(node.children[0]) + expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) +
expand_node_to_data(node.children[1]);
break;
case operator_t::SUB:
to_return = expand_node_to_data(node.children[0]) - expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) -
expand_node_to_data(node.children[1]);
break;
case operator_t::MUL:
to_return = expand_node_to_data(node.children[0]) * expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) *
expand_node_to_data(node.children[1]);
break;
case operator_t::DIV:
to_return = expand_node_to_data(node.children[0]) / expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) /
expand_node_to_data(node.children[1]);
break;
case operator_t::XOR:
to_return = expand_node_to_data(node.children[0]) ^ expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) ^
expand_node_to_data(node.children[1]);
break;
case operator_t::AND:
to_return = expand_node_to_data(node.children[0]) & expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) &
expand_node_to_data(node.children[1]);
break;
case operator_t::OR:
to_return = expand_node_to_data(node.children[0]) | expand_node_to_data(node.children[1]);
to_return = expand_node_to_data(node.children[0]) |
expand_node_to_data(node.children[1]);
break;
case operator_t::NOT:
to_return = ~expand_node_to_data(node.children[0]);
@@ -75,9 +82,8 @@ r8asm::general_data r8asm::ast::read_parameter(std::string index_str) {
{ \
r8asm::ast_node_t::ROT8, std::string("rot8_") + INS, {} \
}
std::vector<r8asm::ast_node>
r8asm::ast::expand_node_to_ins(const ast_node &node) {
std::vector<ast_node> to_return = {};
r8asm::ast_node r8asm::ast::expand_node_to_ins(const ast_node &node) {
ast_node to_return = {ast_node_t::CODEBLOCK,"",{}};
switch (node.type) {
case ast_node_t::ROT8: {
/*
@@ -103,8 +109,8 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) {
children[1]: codeblock
*/
for (data count = expand_node_to_data(node.children[0]); count > 0; count--)
for (const auto &i : expand_node_to_ins(node.children[1]))
to_return.push_back(i);
for (const auto &i : expand_node_to_ins(node.children[1]).children)
to_return.children.push_back(i);
} break;
case ast_node_t::MACROCALL: {
/*
@@ -119,8 +125,8 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) {
// %1 in macro means children[0]
expand_node_to_data(node.children[i]));
scopes.push_back(tmp_scope);
for (const auto &it : expand_node_to_ins(macros.at(node.value)))
to_return.push_back(it);
for (const auto &it : expand_node_to_ins(macros.at(node.value)).children)
to_return.children.push_back(it);
scopes.pop_back();
} break;
@@ -130,9 +136,9 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) {
CODEBLOCK
children: ins
*/
for (const auto &child : node.children)
for (const auto &ins : expand_node_to_ins(child))
to_return.push_back(ins);
for (const auto &i : node.children)
for (const auto &ins : expand_node_to_ins(i).children)
to_return.children.push_back(ins);
} break;
case ast_node_t::BUILTIN: {
@@ -152,10 +158,10 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) {
addr destination = expand_node_to_data(node.children[0]);
if (destination > dataptr)
for (addr i = 0; i < destination - dataptr; i++)
to_return.push_back(ROT8_NODE("stp"));
to_return.children.push_back(ROT8_NODE("stp"));
else
for (addr i = 0; i < dataptr - destination; i++)
to_return.push_back(ROT8_NODE("btp"));
to_return.children.push_back(ROT8_NODE("btp"));
dataptr = destination;
// stp or btp might be created
// so dataptr must be updated at the same time.
@@ -179,22 +185,22 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) {
data d = expand_node_to_data(node.children[0]);
for (auto i = 0; i < CELL_SIZE; i++) {
if (d & 1)
to_return.push_back(ROT8_NODE("flb"));
to_return.push_back(ROT8_NODE("ror"));
to_return.children.push_back(ROT8_NODE("flb"));
to_return.children.push_back(ROT8_NODE("ror"));
d >>= 1;
}
} break;
case builtin_t::LOOP: {
to_return.push_back(ROT8_NODE("stp"));
to_return.push_back(ROT8_NODE("biz"));
to_return.push_back(ROT8_NODE("btp"));
to_return.children.push_back(ROT8_NODE("stp"));
to_return.children.push_back(ROT8_NODE("biz"));
to_return.children.push_back(ROT8_NODE("btp"));
// >[<
} break;
case builtin_t::ENDLOOP: {
to_return.push_back(ROT8_NODE("stp"));
to_return.push_back(ROT8_NODE("flb"));
to_return.push_back(ROT8_NODE("rnz"));
to_return.push_back(ROT8_NODE("btp"));
to_return.children.push_back(ROT8_NODE("stp"));
to_return.children.push_back(ROT8_NODE("flb"));
to_return.children.push_back(ROT8_NODE("rnz"));
to_return.children.push_back(ROT8_NODE("btp"));
// >-+]<
} break;
case builtin_t::VAR: {