From 40f2537c05620348a32388704eb1f72c2cc97d80 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 24 Mar 2021 00:44:11 -0500
Subject: [PATCH] [ox] Move ptrarith into fs

---
 deps/ox/src/ox/CMakeLists.txt                        |  1 -
 deps/ox/src/ox/fs/CMakeLists.txt                     |  9 +++++++++
 deps/ox/src/ox/fs/filestore/filestoretemplate.hpp    |  2 +-
 deps/ox/src/ox/fs/filesystem/directory.hpp           |  2 +-
 deps/ox/src/ox/{ => fs}/ptrarith/nodebuffer.hpp      |  0
 deps/ox/src/ox/{ => fs}/ptrarith/ptr.hpp             |  0
 deps/ox/src/ox/{ => fs}/ptrarith/test/CMakeLists.txt |  0
 deps/ox/src/ox/{ => fs}/ptrarith/test/tests.cpp      |  2 +-
 deps/ox/src/ox/ptrarith/CMakeLists.txt               | 11 -----------
 9 files changed, 12 insertions(+), 15 deletions(-)
 rename deps/ox/src/ox/{ => fs}/ptrarith/nodebuffer.hpp (100%)
 rename deps/ox/src/ox/{ => fs}/ptrarith/ptr.hpp (100%)
 rename deps/ox/src/ox/{ => fs}/ptrarith/test/CMakeLists.txt (100%)
 rename deps/ox/src/ox/{ => fs}/ptrarith/test/tests.cpp (97%)
 delete mode 100644 deps/ox/src/ox/ptrarith/CMakeLists.txt

diff --git a/deps/ox/src/ox/CMakeLists.txt b/deps/ox/src/ox/CMakeLists.txt
index f475ee8f..0a7bfdb3 100644
--- a/deps/ox/src/ox/CMakeLists.txt
+++ b/deps/ox/src/ox/CMakeLists.txt
@@ -5,6 +5,5 @@ add_subdirectory(clargs)
 add_subdirectory(claw)
 add_subdirectory(fs)
 add_subdirectory(mc)
-add_subdirectory(ptrarith)
 add_subdirectory(model)
 add_subdirectory(std)
diff --git a/deps/ox/src/ox/fs/CMakeLists.txt b/deps/ox/src/ox/fs/CMakeLists.txt
index 029f7889..2ca883fc 100644
--- a/deps/ox/src/ox/fs/CMakeLists.txt
+++ b/deps/ox/src/ox/fs/CMakeLists.txt
@@ -59,6 +59,14 @@ install(
 		include/ox/fs/filesystem
 )
 
+install(
+	FILES
+		ptrarith/nodebuffer.hpp
+		ptrarith/ptr.hpp
+	DESTINATION
+		include/ox/fs/ptrarith
+)
+
 install(
 	TARGETS
 		OxFS
@@ -68,4 +76,5 @@ install(
 
 if(OX_RUN_TESTS)
 	add_subdirectory(test)
+	add_subdirectory(ptrarith/test)
 endif()
diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
index acb02be3..209140ee 100644
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ox/ptrarith/nodebuffer.hpp>
+#include <ox/fs/ptrarith/nodebuffer.hpp>
 
 namespace ox {
 
diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/ox/fs/filesystem/directory.hpp
index 78f33b64..9016c147 100644
--- a/deps/ox/src/ox/fs/filesystem/directory.hpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.hpp
@@ -10,7 +10,7 @@
 
 #include <ox/fs/filesystem/pathiterator.hpp>
 #include <ox/fs/filestore/filestoretemplate.hpp>
-#include <ox/ptrarith/nodebuffer.hpp>
+#include <ox/fs/ptrarith/nodebuffer.hpp>
 #include <ox/std/byteswap.hpp>
 
 #include "types.hpp"
diff --git a/deps/ox/src/ox/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
similarity index 100%
rename from deps/ox/src/ox/ptrarith/nodebuffer.hpp
rename to deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
diff --git a/deps/ox/src/ox/ptrarith/ptr.hpp b/deps/ox/src/ox/fs/ptrarith/ptr.hpp
similarity index 100%
rename from deps/ox/src/ox/ptrarith/ptr.hpp
rename to deps/ox/src/ox/fs/ptrarith/ptr.hpp
diff --git a/deps/ox/src/ox/ptrarith/test/CMakeLists.txt b/deps/ox/src/ox/fs/ptrarith/test/CMakeLists.txt
similarity index 100%
rename from deps/ox/src/ox/ptrarith/test/CMakeLists.txt
rename to deps/ox/src/ox/fs/ptrarith/test/CMakeLists.txt
diff --git a/deps/ox/src/ox/ptrarith/test/tests.cpp b/deps/ox/src/ox/fs/ptrarith/test/tests.cpp
similarity index 97%
rename from deps/ox/src/ox/ptrarith/test/tests.cpp
rename to deps/ox/src/ox/fs/ptrarith/test/tests.cpp
index 3dfc6da2..af30ddb8 100644
--- a/deps/ox/src/ox/ptrarith/test/tests.cpp
+++ b/deps/ox/src/ox/fs/ptrarith/test/tests.cpp
@@ -14,7 +14,7 @@
 #include <map>
 #include <vector>
 #include <string>
-#include <ox/ptrarith/nodebuffer.hpp>
+#include <ox/fs/ptrarith/nodebuffer.hpp>
 #include <ox/std/std.hpp>
 
 using namespace std;
diff --git a/deps/ox/src/ox/ptrarith/CMakeLists.txt b/deps/ox/src/ox/ptrarith/CMakeLists.txt
deleted file mode 100644
index a6092fad..00000000
--- a/deps/ox/src/ox/ptrarith/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-install(
-	FILES
-		nodebuffer.hpp
-		ptr.hpp
-	DESTINATION
-		include/ox/ptrarith
-)
-
-if(OX_RUN_TESTS)
-	add_subdirectory(test)
-endif()