From 175042eb7cbcb6bb2e32cffac9ee751b61679237 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Thu, 22 Dec 2022 15:20:32 +0100
Subject: [PATCH] rename stuff

---
 version0/CMakeLists.txt                            | 8 ++++----
 version0/{crdt => green_crdt/v0}/list.hpp          | 4 ++--
 version0/{crdt => green_crdt/v0}/text_document.hpp | 4 ++--
 version0/test1.cpp                                 | 6 +++---
 version0/test2.cpp                                 | 6 +++---
 vim_research/test1.cpp                             | 4 ++--
 vim_research/test2.cpp                             | 8 ++++----
 7 files changed, 20 insertions(+), 20 deletions(-)
 rename version0/{crdt => green_crdt/v0}/list.hpp (99%)
 rename version0/{crdt => green_crdt/v0}/text_document.hpp (99%)

diff --git a/version0/CMakeLists.txt b/version0/CMakeLists.txt
index 354e278..5c12381 100644
--- a/version0/CMakeLists.txt
+++ b/version0/CMakeLists.txt
@@ -10,17 +10,17 @@ target_include_directories(crdt_version0 INTERFACE "${PROJECT_SOURCE_DIR}")
 
 ########################################
 
-add_executable(test1
+add_executable(v0_test1
 	./test1.cpp
 )
 
-target_link_libraries(test1 PUBLIC crdt_version0)
+target_link_libraries(v0_test1 PUBLIC crdt_version0)
 
 ########################################
 
-add_executable(test2
+add_executable(v0_test2
 	./test2.cpp
 )
 
-target_link_libraries(test2 PUBLIC crdt_version0)
+target_link_libraries(v0_test2 PUBLIC crdt_version0)
 
diff --git a/version0/crdt/list.hpp b/version0/green_crdt/v0/list.hpp
similarity index 99%
rename from version0/crdt/list.hpp
rename to version0/green_crdt/v0/list.hpp
index 94591c3..e038133 100644
--- a/version0/crdt/list.hpp
+++ b/version0/green_crdt/v0/list.hpp
@@ -8,7 +8,7 @@
 
 #include <cassert>
 
-namespace GreenCRDT {
+namespace GreenCRDT::V0 {
 
 template<typename ValueType, typename AgentType>
 struct List {
@@ -243,5 +243,5 @@ struct List {
 	}
 };
 
-} // GreenCRDT
+} // GreenCRDT::V0
 
diff --git a/version0/crdt/text_document.hpp b/version0/green_crdt/v0/text_document.hpp
similarity index 99%
rename from version0/crdt/text_document.hpp
rename to version0/green_crdt/v0/text_document.hpp
index b3b4183..db00447 100644
--- a/version0/crdt/text_document.hpp
+++ b/version0/green_crdt/v0/text_document.hpp
@@ -6,7 +6,7 @@
 
 //#include <iostream> // debug
 
-namespace GreenCRDT {
+namespace GreenCRDT::V0 {
 
 template<typename AgentType>
 struct TextDocument {
@@ -281,5 +281,5 @@ struct TextDocument {
 	}
 };
 
-} // GreenCRDT
+} // GreenCRDT::V0
 
diff --git a/version0/test1.cpp b/version0/test1.cpp
index 77a886c..4a8e586 100644
--- a/version0/test1.cpp
+++ b/version0/test1.cpp
@@ -1,5 +1,5 @@
-#include <crdt/list.hpp>
-#include <crdt/text_document.hpp>
+#include <green_crdt/v0/list.hpp>
+#include <green_crdt/v0/text_document.hpp>
 
 #include <numeric>
 #include <random>
@@ -8,7 +8,7 @@
 
 // single letter agent, for testing only
 using Agent = char;
-using DocType = GreenCRDT::TextDocument<Agent>;
+using DocType = GreenCRDT::V0::TextDocument<Agent>;
 using ListType = DocType::ListType;
 
 void testSingle1(void) {
diff --git a/version0/test2.cpp b/version0/test2.cpp
index 43467b7..ecaab3c 100644
--- a/version0/test2.cpp
+++ b/version0/test2.cpp
@@ -1,4 +1,4 @@
-#include <crdt/text_document.hpp>
+#include <green_crdt/v0/text_document.hpp>
 
 #include <numeric>
 #include <optional>
@@ -9,8 +9,8 @@
 
 // single letter agent, for testing only
 using Agent = char;
-using Doc = GreenCRDT::TextDocument<Agent>;
-using Op = GreenCRDT::TextDocument<Agent>::Op;
+using Doc = GreenCRDT::V0::TextDocument<Agent>;
+using Op = Doc::Op;
 using ListType = Doc::ListType;
 
 // maybe switch it up?
diff --git a/vim_research/test1.cpp b/vim_research/test1.cpp
index 4401bff..e6ec2d3 100644
--- a/vim_research/test1.cpp
+++ b/vim_research/test1.cpp
@@ -1,4 +1,4 @@
-#include <crdt/text_document.hpp>
+#include <green_crdt/v0/text_document.hpp>
 #include <nlohmann/json.hpp>
 
 extern "C" {
@@ -15,7 +15,7 @@ extern "C" {
 // single letter agent, for testing only
 //using Agent = char;
 using Agent = uint16_t; // tmp local port
-using Doc = GreenCRDT::TextDocument<Agent>;
+using Doc = GreenCRDT::V0::TextDocument<Agent>;
 using ListType = Doc::ListType;
 
 std::ostream& operator<<(std::ostream& out, const std::optional<ListType::ListID>& id) {
diff --git a/vim_research/test2.cpp b/vim_research/test2.cpp
index 4743631..11f5c5c 100644
--- a/vim_research/test2.cpp
+++ b/vim_research/test2.cpp
@@ -1,4 +1,4 @@
-#include <crdt/text_document.hpp>
+#include <green_crdt/v0/text_document.hpp>
 #include <nlohmann/json.hpp>
 
 extern "C" {
@@ -59,7 +59,7 @@ struct std::hash<ToxPubKey> {
 //using Agent = char;
 //using Agent = uint16_t; // tmp local port
 using Agent = ToxPubKey;
-using Doc = GreenCRDT::TextDocument<Agent>;
+using Doc = GreenCRDT::V0::TextDocument<Agent>;
 using ListType = Doc::ListType;
 
 struct Command {
@@ -89,7 +89,7 @@ namespace std {
 	}
 } // namespace std
 
-namespace GreenCRDT {
+namespace GreenCRDT::V0 {
 
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ListType::ListID,
 	id,
@@ -107,7 +107,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ListType::OpDel,
 	id
 )
 
-} // namespace GreenCRDT
+} // namespace GreenCRDT::V0
 
 // bc variant <.<
 namespace std {