Halting work on preprocesser units and rewrite as a wholeasm-rewrite-cpp

I've decided to split the project into 2 repositories: the assembler
and the runtime.  The runtime will contain both the executable and
lib/ while the assembler will have the runtime as a git submodule and
use it to build.  I think this is a clean solution, a lot cleaner than
having them all in one project where the Makefile has to massively
expand.

2 files changed, 23 insertions, 0 deletions

diff --git a/asm/preprocesser.cpp b/asm/preprocesser.cpp
index f5e31e4..7f52e40 100644
--- a/asm/preprocesser.cpp
+++ b/asm/preprocesser.cpp
@@ -208,3 +208,11 @@ pp_err_t::pp_err_t(pp_err_type_t err, const token_t *ref)
 pp_err_t::pp_err_t(pp_err_type_t err, const token_t *ref, lerr_t lerr)
     : reference{ref}, type{err}, lerr{lerr}
 {}
+
+// pp_unit_t::pp_unit_t(const token_t *const token) : resolved{false},
+// token{token}
+// {}
+
+// pp_unit_t::pp_unit_t(std::string_view name, std::vector<pp_unit_t> elements)
+//     : resolved{false}, token{nullptr}, container{name, elements}
+// {}
diff --git a/asm/preprocesser.hpp b/asm/preprocesser.hpp
index aac3041..4938d4e 100644
--- a/asm/preprocesser.hpp
+++ b/asm/preprocesser.hpp
@@ -42,6 +42,21 @@ struct pp_err_t
 
 std::ostream &operator<<(std::ostream &, pp_err_t &);
 
+struct pp_unit_t
+{
+  const token_t *const token;
+  struct
+  {
+    std::string_view name;
+    std::vector<pp_unit_t> elements;
+  } container;
+
+  pp_unit_t(const token_t *const);
+  pp_unit_t(std::string_view, std::vector<pp_unit_t>);
+};
+
+std::vector<pp_unit_t> tokens_to_units(const std::vector<token_t *> &);
+pp_err_t preprocess_use(std::vector<pp_unit_t> &);
 pp_err_t preprocesser(const std::vector<token_t *> &, std::vector<token_t *> &);
 
 #endif