diff --git a/include/r8asm/r8asm.hh b/include/r8asm/r8asm.hh index af15692..553c6d1 100644 --- a/include/r8asm/r8asm.hh +++ b/include/r8asm/r8asm.hh @@ -26,6 +26,7 @@ public: REPEAT, ROT8, CODEBLOCK, + STRING, }; struct ast_node { ast_node_t type; @@ -34,15 +35,11 @@ public: }; class ast { private: - public: ast_node root = {r8asm::ast_node_t::CODEBLOCK, "", {}}; addr dataptr = 0; std::vector> scopes = {{}}; std::map macros; - general_data expand_node_to_data(const ast_node &node); - ast_node expand_node_to_ins(const ast_node &node); - enum class operator_t { ADD, SUB, @@ -92,6 +89,11 @@ public: {"rot8_biz", rot8_t::BIZ}, {"rot8_rnz", rot8_t::RNZ}, {"rot8_out", rot8_t::OUT}, {"rot8_inp", rot8_t::INP}, }; + general_data expand_node_to_data(const ast_node &node); + std::string expand_node_to_string(const ast_node &node); + + public: + ast_node expand_node_to_ins(const ast_node &node); }; enum class directive_t { MACRO, diff --git a/src/r8asm.cc b/src/r8asm.cc index d061b3f..4713c53 100644 --- a/src/r8asm.cc +++ b/src/r8asm.cc @@ -72,6 +72,18 @@ r8asm::general_data r8asm::ast::expand_node_to_data(const ast_node &node) { return to_return; } +std::string r8asm::ast::expand_node_to_string(const ast_node &node) { + std::string to_return = ""; + switch (node.type) { + case ast_node_t::STRING: + to_return = node.value; + break; + default: + break; + } + return to_return; +} + // TODO: FILL THE BLANK #define ROT8_NODE(INS) \ { \ @@ -138,12 +150,14 @@ r8asm::ast_node r8asm::ast::expand_node_to_ins(const ast_node &node) { case ast_node_t::BUILTIN: { switch (builtin_map.at(node.value)) { + // WARNING: node.value HAS BEEN USED!!! DO NOT CONSUME IT AGAIN!!! case builtin_t::ANCHOR: { /* ANCHOR - value: var_name + children[0]: var_name */ - scopes.back().insert_or_assign(node.value, dataptr); + scopes.back().insert_or_assign(expand_node_to_string(node.children[0]), + dataptr); } break; case builtin_t::TP: { /* @@ -201,11 +215,11 @@ r8asm::ast_node r8asm::ast::expand_node_to_ins(const ast_node &node) { case builtin_t::VAR: { /* VAR - value: var_name - children[0]: var_value + children[0]: var_name + children[1]: var_value */ - scopes.back().insert_or_assign(node.value, - expand_node_to_data(node.children[0])); + scopes.back().insert_or_assign(expand_node_to_string(node.children[0]), + expand_node_to_data(node.children[1])); } break; default: break;