diff --git a/src/r8asm_asm.cc b/src/r8asm_asm.cc index 0959e7b..be433ce 100644 --- a/src/r8asm_asm.cc +++ b/src/r8asm_asm.cc @@ -109,6 +109,7 @@ std::vector r8asm_tape_out(std::span ops) { case r8asm_builtin::ANCHOR: expand_anchor(tape, it.arg); case r8asm_builtin::ERASE: + break; expand_erase(tape, it.arg); break; default:; diff --git a/src/r8asm_macro.cc b/src/r8asm_macro.cc index 637b7f9..34af0b8 100644 --- a/src/r8asm_macro.cc +++ b/src/r8asm_macro.cc @@ -1,5 +1,6 @@ #include "r8asm/r8asm_macro.hh" #include "r8asm/r8asm_core.hh" +#include #include std::map macros = { @@ -50,4 +51,13 @@ std::vector expand_single_macro(std::string macro_name, std::vector expand_macros(std::vector &ins) { std::vector out_tape; + for (auto i : ins) { + if (r8asm_macro *macro = std::get_if(&i.op)) { + std::vector tmp_tape = + (expand_single_macro(macro->name, macro->args)); + out_tape.insert(out_tape.end(), tmp_tape.begin(), tmp_tape.end()); + } else + out_tape.push_back(i); + } + return (out_tape); } \ No newline at end of file diff --git a/tests/r8_test.cc b/tests/r8_test.cc index f15c50f..7948314 100644 --- a/tests/r8_test.cc +++ b/tests/r8_test.cc @@ -1,6 +1,7 @@ #include #include "r8asm/r8asm.hh" +#include "r8asm/r8asm_asm.hh" #include "r8asm/r8asm_core.hh" #include "r8asm/r8asm_macro.hh" @@ -12,8 +13,9 @@ int main() { {r8asm_macro("STEP"), {15}}, {rot8_bytecode::OUT}, }; + auto out_tape = r8asm_tape_out(expand_macros(ins)); - // for (const auto i : tape) - // std::cout << ROT8_BC_TO_CHAR(i); + // for (auto i : out_tape) + // std::cout << ROT8_BC_TO_CHAR(i); return (0); }