From 5d66d1aac3146e959d9ac9a814788e4216f06036 Mon Sep 17 00:00:00 2001
From: Adrian Conlon <adrian.conlon@gmail.com>
Date: Tue, 19 Oct 2021 16:53:10 +0100
Subject: [PATCH] Remove fancy iterator shenigans from simdjson usage.

Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
---
 M6502/HarteTest_6502/byte_t.cpp  | 5 ++---
 M6502/HarteTest_6502/byte_t.h    | 3 ---
 M6502/HarteTest_6502/cycle_t.cpp | 7 +++----
 M6502/HarteTest_6502/cycle_t.h   | 3 ---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/M6502/HarteTest_6502/byte_t.cpp b/M6502/HarteTest_6502/byte_t.cpp
index 45a453b..c1f04a0 100644
--- a/M6502/HarteTest_6502/byte_t.cpp
+++ b/M6502/HarteTest_6502/byte_t.cpp
@@ -14,9 +14,8 @@ byte_t::byte_t(simdjson::dom::element input) noexcept
 : byte_t(input.get_array()) {}
 
 byte_t::byte_t(simdjson::dom::array input) noexcept
-: m_iterator(input.begin()),
-  m_address((uint16_t)(uint64_t)*m_iterator),
-  m_value((uint8_t)(uint64_t)*++m_iterator) {
+: m_address((uint16_t)(uint64_t)input.at(0)),
+  m_value((uint8_t)(uint64_t)input.at(1)) {
     assert(input.size() == 2);
 }
 
diff --git a/M6502/HarteTest_6502/byte_t.h b/M6502/HarteTest_6502/byte_t.h
index 4c176f5..3eb9a84 100644
--- a/M6502/HarteTest_6502/byte_t.h
+++ b/M6502/HarteTest_6502/byte_t.h
@@ -24,9 +24,6 @@
 
 class byte_t final {
 private:
-#ifdef USE_SIMDJSON_JSON
-	simdjson::dom::array::iterator m_iterator;
-#endif
 	uint16_t m_address = 0xffff;
 	uint8_t m_value = 0xff;
 
diff --git a/M6502/HarteTest_6502/cycle_t.cpp b/M6502/HarteTest_6502/cycle_t.cpp
index 79ac9ca..fbee493 100644
--- a/M6502/HarteTest_6502/cycle_t.cpp
+++ b/M6502/HarteTest_6502/cycle_t.cpp
@@ -31,10 +31,9 @@ cycle_t::cycle_t(simdjson::dom::element input) noexcept
 : cycle_t(input.get_array()) {}
 
 cycle_t::cycle_t(simdjson::dom::array input) noexcept
-: m_iterator(input.begin()),
-  m_address((uint16_t)(uint64_t)*m_iterator),
-  m_value((uint8_t)(uint64_t)*++m_iterator),
-  m_action(to_action((std::string)*++m_iterator)) {
+: m_address((uint16_t)(uint64_t)input.at(0)),
+  m_value((uint8_t)(uint64_t)input.at(1)),
+  m_action(to_action((std::string)input.at(2))) {
     assert(input.size() == 3);
 }
 
diff --git a/M6502/HarteTest_6502/cycle_t.h b/M6502/HarteTest_6502/cycle_t.h
index 91d1805..90eba8b 100644
--- a/M6502/HarteTest_6502/cycle_t.h
+++ b/M6502/HarteTest_6502/cycle_t.h
@@ -28,9 +28,6 @@ public:
 	enum class action_t { read, write, unknown };
 
 private:
-#ifdef USE_SIMDJSON_JSON
-	simdjson::dom::array::iterator m_iterator;
-#endif
 	uint16_t m_address = 0xffff;
 	uint8_t m_value = 0xff;
 	action_t m_action = action_t::unknown;