Moved public headers to a jessilib subfolder; adjusted code as necessary

src/bot/base_commands.cpp

@@ -16,8 +16,8 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "io/command.hpp"
+#include "jessilib/io/command.hpp"
-#include "io/command_manager.hpp"
+#include "jessilib/io/command_manager.hpp"
 #include "shutdown.hpp"
 
 namespace jessibot {

src/bot/console/console.cpp

@@ -19,8 +19,8 @@
 #include "console.hpp"
 
 #include <iostream>
-#include "io/command_manager.hpp"
+#include "jessilib/io/command_manager.hpp"
-#include "io/ansi/ansi_text.hpp"
+#include "jessilib/io/ansi/ansi_text.hpp"
 #include "shutdown.hpp"
 #include "console/console_command_context.hpp"
 

src/bot/console/console_command_context.cpp

@@ -19,7 +19,7 @@
 #include "console_command_context.hpp"
 
 #include <iostream>
-#include "io/ansi/ansi_text.hpp"
+#include "jessilib/io/ansi/ansi_text.hpp"
 
 namespace jessibot {
 namespace io {

src/bot/console/console_command_context.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "io/command_context.hpp"
+#include "jessilib/io/command_context.hpp"
 
 namespace jessibot {
 namespace io {

src/bot/main.cpp

@@ -17,8 +17,8 @@
  */
 
 #include <iostream>
-#include "app_parameters.hpp"
+#include "jessilib/app_parameters.hpp"
-#include "parsers/json.hpp"
+#include "jessilib/parsers/json.hpp"
 #include "console/console.hpp"
 
 int main(int argc, char** argv) {

src/common/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(jessilib ${SOURCE_FILES})
 
 # Setup include directories
 target_include_directories(jessilib PUBLIC ../include)
+target_include_directories(jessilib PRIVATE ../include/jessilib)
 target_include_directories(jessilib PRIVATE ../include/impl/asio/include)
 
 # Setup additionally needed libs

src/common/parsers/json.cpp

@@ -221,7 +221,7 @@ std::string read_json_string(std::string_view& in_data) {
 
 								if (is_low_surrogate(second_codepoint)) {
 									// We've got a valid surrogate pair; serialize the represented codepoint; decode it
-									codepoint = decode_surrogate_pair(codepoint, second_codepoint).codepoint;
+									codepoint = static_cast<char16_t>(decode_surrogate_pair(codepoint, second_codepoint).codepoint);
 									encode_codepoint(result, codepoint); // serialize the real codepoint
 								}
 								else {
@@ -296,7 +296,7 @@ object read_json_number(std::string_view& in_data) {
 
 	// parse_decimal_part method
 	in_data.remove_prefix(1); // strip leading '.'
-	long double decimal_value = integer_value;
+	long double decimal_value = static_cast<long double>(integer_value);
 	from_chars_end = parse_decimal_part(in_data.data(), in_data.data() + in_data.size(), decimal_value);
 	// TODO: parse exponent
 

src/include/impl/timer_manager.hpp

@@ -24,8 +24,8 @@
 #include <condition_variable>
 #include <atomic>
 #include <thread>
-#include "../timer.hpp"
+#include "timer.hpp"
-#include "../thread_pool.hpp"
+#include "thread_pool.hpp"
 #include "timer_context.hpp"
 
 namespace jessilib {
@@ -76,4 +76,4 @@ class timer_manager {
 }; // class timer_manager
 
 } // namespace impl
-} // namespace jessilib
+} // namespace jessilib

src/include/io/ansi/ansi_text.hpp → src/include/jessilib/io/ansi/ansi_text.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "io/message.hpp"
+#include "jessilib/io/message.hpp"
 
 namespace jessilib {
 namespace io {

src/include/io/color.hpp → src/include/jessilib/io/color.hpp

@@ -23,7 +23,7 @@
 #include <string>
 #include <string_view>
 #include <fmt/format.h>
-#include "util.hpp"
+#include "jessilib/util.hpp"
 
 namespace jessilib {
 namespace io {

src/include/io/command_context.hpp → src/include/jessilib/io/command_context.hpp

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <string_view>
-#include "object.hpp"
+#include "jessilib/object.hpp"
 #include "message.hpp"
 
 namespace jessilib {

src/include/parsers/json.hpp → src/include/jessilib/parsers/json.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "parser.hpp"
+#include "jessilib/parser.hpp"
 
 namespace jessilib {
 
@@ -29,4 +29,4 @@ public:
 	virtual std::string serialize(const object& in_object) override;
 };
 
-} // namespace jessilib
+} // namespace jessilib

src/test/app_parameters.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "test.hpp"
-#include "app_parameters.hpp"
+#include "jessilib/app_parameters.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/config.cpp

@@ -20,8 +20,8 @@
 #include <filesystem>
 #include <fstream>
 #include "test.hpp"
-#include "config.hpp"
+#include "jessilib/config.hpp"
-#include "serialize.hpp" // format_not_available
+#include "jessilib/serialize.hpp" // format_not_available
 
 using namespace jessilib;
 using namespace std::literals;

src/test/duration.cpp

@@ -16,7 +16,7 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "duration.hpp"
+#include "jessilib/duration.hpp"
 #include "test.hpp"
 
 using namespace jessilib;

src/test/io/color.cpp

@@ -16,7 +16,7 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "io/color.hpp"
+#include "jessilib/io/color.hpp"
 #include "test.hpp"
 
 using namespace jessilib;

src/test/object.cpp

@@ -16,9 +16,8 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include <chrono>
 #include "test.hpp"
-#include "object.hpp"
+#include "jessilib/object.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/parser.cpp

@@ -16,11 +16,10 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include <chrono>
 #include <functional>
 #include "test.hpp"
-#include "parser.hpp"
+#include "jessilib/parser.hpp"
-#include "serialize.hpp"
+#include "jessilib/serialize.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/parsers/json.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "test.hpp"
-#include "parsers/json.hpp"
+#include "jessilib/parsers/json.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/split.cpp

@@ -16,8 +16,6 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "split.hpp"
-#include <cassert>
 #include "test_split.hpp"
 
 using namespace jessilib;

src/test/split_compilation.cpp

@@ -20,7 +20,7 @@
 * Tests which exist solely test test compilation for split.hpp, because MSVC demands /bigobj, and I don't want to
 */
 
-#include "split.hpp"
+#include "jessilib/split.hpp"
 #include <deque>
 #include <list>
 #include "test_split.hpp"

src/test/test_split.hpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "split.hpp"
+#include "jessilib/split.hpp"
 #include "test.hpp"
 #include <random>
 

src/test/thread_pool.cpp

@@ -18,7 +18,7 @@
 
 #include <chrono>
 #include "test.hpp"
-#include "thread_pool.hpp"
+#include "jessilib/thread_pool.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/timer.cpp

@@ -18,7 +18,7 @@
 
 #include <future>
 #include "test.hpp"
-#include "timer.hpp"
+#include "jessilib/timer.hpp"
 
 using namespace jessilib;
 using namespace std::literals;

src/test/unicode.cpp

@@ -16,7 +16,7 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "unicode.hpp"
+#include "jessilib/unicode.hpp"
 #include "test.hpp"
 
 using namespace jessilib;

src/test/util.cpp

@@ -16,9 +16,8 @@
  * Written by Jessica James <jessica.aj@outlook.com>
  */
 
-#include "util.hpp"
+#include "jessilib/util.hpp"
 #include "test.hpp"
-#include "object.hpp"
 
 using namespace jessilib;
 using namespace std::literals;