From 2a0a7dc86250a04f1d819bc8d9add360138b1a50 Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xtvaser@gmail.com>
Date: Sun, 2 Jun 2024 12:50:28 -0400
Subject: [PATCH] common: rename repl_wrapper files

---
 common/CMakeLists.txt                          | 2 +-
 common/cross_sockets/XSocketClient.cpp         | 4 ++--
 common/goos/Reader.cpp                         | 1 -
 common/goos/Reader.h                           | 2 +-
 game/kernel/jak2/kboot.cpp                     | 2 +-
 game/kernel/jak3/kboot.cpp                     | 2 +-
 goalc/compiler/Compiler.h                      | 2 +-
 goalc/compiler/compilation/CompilerControl.cpp | 2 +-
 goalc/main.cpp                                 | 2 +-
 scripts/examples/nrepl-test.py                 | 6 ++++--
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index caba17a241..69c86b5216 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -51,7 +51,7 @@ add_library(common
         repl/config.cpp
         repl/nrepl/ReplClient.cpp
         repl/nrepl/ReplServer.cpp
-        repl/util.cpp
+        repl/repl_wrapper.cpp
         serialization/subtitles/subtitles_v1.cpp
         serialization/subtitles/subtitles_v2.cpp
         serialization/subtitles/subtitles.cpp
diff --git a/common/cross_sockets/XSocketClient.cpp b/common/cross_sockets/XSocketClient.cpp
index 0c6c791e0b..57d01eeffa 100644
--- a/common/cross_sockets/XSocketClient.cpp
+++ b/common/cross_sockets/XSocketClient.cpp
@@ -5,6 +5,8 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/log/log.h"
 
+#include "fmt/core.h"
+
 // clang-format off
 #ifdef _WIN32
 #define NOMINMAX
@@ -13,9 +15,7 @@
 #include <WinSock2.h>
 #include <WS2tcpip.h>
 #endif
-#include "common/repl/nrepl/ReplServer.h"
 
-#include "fmt/core.h"
 // clang-format on
 
 XSocketClient::XSocketClient(int _tcp_port) {
diff --git a/common/goos/Reader.cpp b/common/goos/Reader.cpp
index 3c5d666d1a..f438a410d0 100644
--- a/common/goos/Reader.cpp
+++ b/common/goos/Reader.cpp
@@ -12,7 +12,6 @@
 #include "Reader.h"
 
 #include "common/log/log.h"
-#include "common/repl/util.h"
 #include "common/util/FileUtil.h"
 #include "common/util/FontUtils.h"
 
diff --git a/common/goos/Reader.h b/common/goos/Reader.h
index 32b51f075b..c20071e1a3 100644
--- a/common/goos/Reader.h
+++ b/common/goos/Reader.h
@@ -18,7 +18,7 @@
 
 #include "common/goos/Object.h"
 #include "common/goos/TextDB.h"
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/util/Assert.h"
 
 namespace goos {
diff --git a/game/kernel/jak2/kboot.cpp b/game/kernel/jak2/kboot.cpp
index 6e9d44f9fb..ce50468e94 100644
--- a/game/kernel/jak2/kboot.cpp
+++ b/game/kernel/jak2/kboot.cpp
@@ -6,7 +6,7 @@
 
 #include "common/goal_constants.h"
 #include "common/log/log.h"
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/util/Timer.h"
 
 #include "game/common/game_common_types.h"
diff --git a/game/kernel/jak3/kboot.cpp b/game/kernel/jak3/kboot.cpp
index d2aaba79d5..bcc8acfcaa 100644
--- a/game/kernel/jak3/kboot.cpp
+++ b/game/kernel/jak3/kboot.cpp
@@ -3,7 +3,7 @@
 #include <cstring>
 
 #include "common/log/log.h"
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/util/Timer.h"
 
 #include "game/common/game_common_types.h"
diff --git a/goalc/compiler/Compiler.h b/goalc/compiler/Compiler.h
index b299ad0c96..994e844cab 100644
--- a/goalc/compiler/Compiler.h
+++ b/goalc/compiler/Compiler.h
@@ -5,7 +5,7 @@
 #include <optional>
 
 #include "common/goos/Interpreter.h"
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/type_system/TypeSystem.h"
 
 #include "goalc/compiler/CompilerException.h"
diff --git a/goalc/compiler/compilation/CompilerControl.cpp b/goalc/compiler/compilation/CompilerControl.cpp
index 7fcdd33b83..61929e5408 100644
--- a/goalc/compiler/compilation/CompilerControl.cpp
+++ b/goalc/compiler/compilation/CompilerControl.cpp
@@ -6,7 +6,7 @@
 #include <regex>
 #include <stack>
 
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/util/DgoWriter.h"
 #include "common/util/FileUtil.h"
 #include "common/util/Timer.h"
diff --git a/goalc/main.cpp b/goalc/main.cpp
index b080243c9d..e8f5c0d446 100644
--- a/goalc/main.cpp
+++ b/goalc/main.cpp
@@ -3,7 +3,7 @@
 
 #include "common/log/log.h"
 #include "common/repl/nrepl/ReplServer.h"
-#include "common/repl/util.h"
+#include "common/repl/repl_wrapper.h"
 #include "common/util/FileUtil.h"
 #include "common/util/diff.h"
 #include "common/util/string_util.h"
diff --git a/scripts/examples/nrepl-test.py b/scripts/examples/nrepl-test.py
index 81145e7e7e..33e00201ad 100644
--- a/scripts/examples/nrepl-test.py
+++ b/scripts/examples/nrepl-test.py
@@ -1,5 +1,7 @@
 import socket
 import struct
+from time import sleep
+
 clientSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM);
 clientSocket.connect(("127.0.0.1", 8181))
 print(clientSocket)
@@ -11,5 +13,5 @@ form = "(:status)"
 header = struct.pack('<II', len(form), 10)
 
 clientSocket.sendall(header + form.encode())
-
-
+sleep(1)
+clientSocket.sendall(header + form.encode())