common: rename repl_wrapper files

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

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) {

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"
 

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 {

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"

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"

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"

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"

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"

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())