diff --git a/src/r8asm.cc b/src/r8asm.cc index 004b594..5e0ec57 100644 --- a/src/r8asm.cc +++ b/src/r8asm.cc @@ -72,10 +72,10 @@ r8asm::general_data r8asm::ast::read_parameter(std::string index_str) { return scopes.back().at('%' + index_str); } -// TODO: FILL THE BLANK +#define ADD_ROT8_PR(INS) std::string("rot8_") + INS #define ROT8_NODE(INS) \ { \ - r8asm::ast_node_t::ROT8, std::string("rot8_") + INS, {} \ + r8asm::ast_node_t::ROT8, ADD_ROT8_PR(INS), {} \ } std::vector r8asm::ast::expand_node_to_ins(const ast_node &node) { @@ -83,9 +83,9 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) { switch (node.type) { case ast_node_t::ROT8: { to_return = {node}; - if (node.value == "stp") + if (node.value == ADD_ROT8_PR("stp")) dataptr++; - if (node.value == "btp") + if (node.value == ADD_ROT8_PR("btp")) dataptr--; } break; case ast_node_t::REPEAT: { @@ -207,4 +207,5 @@ r8asm::ast::expand_node_to_ins(const ast_node &node) { } return to_return; } -#undef ROT8_NODE \ No newline at end of file +#undef ROT8_NODE +#undef ADD_ROT8_PR \ No newline at end of file