From 2ae7b4aef861ffda793a7cff920246e54ad0ca6a Mon Sep 17 00:00:00 2001
From: Andre Wagner <WagnerAndre@JohnDeere.com>
Date: Thu, 30 Apr 2026 14:00:19 -0500
Subject: [PATCH] .

---
 .idea/editor.xml           |  1 -
 src/assembler/assembler.cc |  7 ++-----
 src/assembler/assembler.hh |  8 ++++++--
 src/assembler/lexer.cc     | 16 ++++++++++++++++
 src/assembler/lexer.hh     | 20 +++++++++++++++++++-
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/.idea/editor.xml b/.idea/editor.xml
index 43702aa..aa2a125 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -27,7 +27,6 @@
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue" value="LINE_BREAK" type="string" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="true" type="bool" />
     <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_LINES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/Generate/=CppEqualityOperators/Options/=GenerateSecondaryOperators/@EntryIndexedValue" value="False" type="string" />
     <option name="/Default/CodeStyle/Naming/CppNaming/Rules/=Classes_0020and_0020structs/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;1&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;__interface&quot; /&gt;&lt;type Name=&quot;class&quot; /&gt;&lt;type Name=&quot;struct&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
     <option name="/Default/CodeStyle/Naming/CppNaming/Rules/=Concepts/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;2&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;concept&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
     <option name="/Default/CodeStyle/Naming/CppNaming/Rules/=Enum_0020members/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;14&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;scoped enumerator&quot; /&gt;&lt;type Name=&quot;unscoped enumerator&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
diff --git a/src/assembler/assembler.cc b/src/assembler/assembler.cc
index ed464ed..b16396e 100644
--- a/src/assembler/assembler.cc
+++ b/src/assembler/assembler.cc
@@ -2,13 +2,10 @@
 
 namespace tyche::as {
 
-Assembler::Assembler(std::string const& source)
+ByteArray Assembler::assemble()
 {
+    lexer_.reset();
 
-}
-
-ByteArray Assembler::assemble() const
-{
     return {};
 }
 
diff --git a/src/assembler/assembler.hh b/src/assembler/assembler.hh
index b5cd1bb..144963c 100644
--- a/src/assembler/assembler.hh
+++ b/src/assembler/assembler.hh
@@ -3,15 +3,19 @@
 
 #include <string>
 
+#include "lexer.hh"
 #include "../common/bytearray.hh"
 
 namespace tyche::as {
 
 class Assembler {
 public:
-    explicit Assembler(std::string const& source);
+    explicit Assembler(std::string source) : lexer_(std::move(source)) {}
 
-    [[nodiscard]] ByteArray assemble() const;
+    [[nodiscard]] ByteArray assemble();
+
+private:
+    Lexer lexer_;
 };
 
 } // tyche
diff --git a/src/assembler/lexer.cc b/src/assembler/lexer.cc
index 234e844..2a9c5ab 100644
--- a/src/assembler/lexer.cc
+++ b/src/assembler/lexer.cc
@@ -1,4 +1,20 @@
 #include "lexer.hh"
 
 namespace tyche::as {
+
+void Lexer::reset()
+{
+
+}
+
+Token Lexer::peek() const
+{
+    return {};
+}
+
+Token Lexer::ingest()
+{
+    return {};
+}
+
 } // tyche
diff --git a/src/assembler/lexer.hh b/src/assembler/lexer.hh
index 75bfc2d..1fc4fbd 100644
--- a/src/assembler/lexer.hh
+++ b/src/assembler/lexer.hh
@@ -1,10 +1,28 @@
 #ifndef TYCHE_LEXER_HH
 #define TYCHE_LEXER_HH
 
+#include <string>
+#include <utility>
+
 namespace tyche::as {
 
-class Lexer {
+enum class TokenType { Directive, Instruction, Number, Float, String, Enter, EOF_ };
 
+struct Token {
+    TokenType   type;
+    std::string token;
+};
+
+class Lexer {
+public:
+    explicit Lexer(std::string source) : source_(std::move(source)) {}
+
+    void reset();
+    [[nodiscard]] Token peek() const;
+    [[nodiscard]] Token ingest();
+
+private:
+    std::string source_;
 };
 
 } // tyche