refactor(modules): move files to modules dir

CMakeLists.txt

@@ -9,13 +9,13 @@ project(
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-add_subdirectory(src/ccunit)
-add_subdirectory(src/prep)
+add_subdirectory(src/cppunit)
+add_subdirectory(src/modules)
 
 add_executable(main src/main.cc)
-add_library(lib src/lib.cc src/lib.hh)
+add_library(lib src/lib.cc src/lib.hh src/validation.cc src/validation.hh)
 target_link_libraries(main PUBLIC lib)
-target_link_libraries(lib PUBLIC prepLib)
+target_link_libraries(lib PUBLIC modules)
 target_include_directories(main PUBLIC "${PROJECT_BINARY_DIR}"
                                        "${PROJECT_SOURCE_DIR}/prep")
 target_include_directories(lib PUBLIC "${PROJECT_BINARY_DIR}"

src/cppunit/CMakeLists.txt

@@ -1 +1 @@
-add_library(ccunit ccunit.cc ccunit.hh)
+add_library(cppunit cppunit.cc cppunit.hh)

src/lib.hh

@@ -1 +1 @@
-#include "validation.hh"
+#include "./validation.hh"

src/main.cc

@@ -1,4 +1,4 @@
-#include "lib.hh"
+#include "./lib.hh"
 
 #include <stdlib.h>
 

src/modules/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_library(
+  modules
+  action.cc
+  action.hh
+  event.cc
+  event.hh
+  player.cc
+  player.hh
+  role.cc
+  role.hh
+  room.cc
+  room.hh
+  time.cc
+  time.hh)

src/modules/action.cc

@@ -1,4 +1,4 @@
-#include "action.hh"
+#include "./action.hh"
 
 #include <string>
 

src/modules/event.cc

@@ -1,7 +1,7 @@
-#include "event.hh"
+#include "./event.hh"
 
-#include "action.hh"
-#include "time.hh"
+#include "./action.hh"
+#include "./time.hh"
 
 #include <initializer_list>
 #include <string>

src/modules/event.hh

@@ -1,7 +1,7 @@
 #ifndef EVENT_HH
 #define EVENT_HH
 
-#include "action.hh"
+#include "./action.hh"
 
 #include <cstdint>
 #include <ctime>
@@ -16,7 +16,7 @@ namespace event {
         RoomStateChange,
         PlayerStateChange,
     };
-}
+}  // namespace event
 
 struct Event {
     std::string title;

src/modules/player.cc

@@ -1,6 +1,6 @@
-#include "player.hh"
+#include "./player.hh"
 
-#include "role.hh"
+#include "./role.hh"
 
 #include <string>
 

src/modules/player.hh

@@ -1,7 +1,7 @@
 #ifndef PLAYER_HH
 #define PLAYER_HH
 
-#include "role.hh"
+#include "./role.hh"
 
 #include <cstdint>
 #include <string>
@@ -13,7 +13,7 @@ namespace player {
         Dead,
         VotedOut,
     };
-}
+}  // namespace player
 
 struct Player {
     uint32_t id;

src/modules/role.cc

@@ -1,4 +1,4 @@
-#include "role.hh"
+#include "./role.hh"
 
 #include <initializer_list>
 #include <vector>

src/modules/role.hh

@@ -1,15 +1,15 @@
 #ifndef ROLE_HH
 #define ROLE_HH
 
-#include "action.hh"
+#include "./action.hh"
 
 #include <initializer_list>
 #include <vector>
 
 struct Role {
     std::vector<Action> actions;
-    Role(std::initializer_list<Action> actions);
     Role(std::vector<Action> actions);
+    Role(std::initializer_list<Action> actions);
 };
 
 #endif  // !ROLE_HH

src/modules/room.cc

@@ -1,6 +1,6 @@
-#include "room.hh"
+#include "./room.hh"
 
-#include "time.hh"
+#include "./time.hh"
 
 #include <cstdint>
 #include <initializer_list>

src/modules/room.hh

@@ -1,7 +1,7 @@
 #ifndef ROOM_HH
 #define ROOM_HH
 
-#include "player.hh"
+#include "./player.hh"
 
 #include <cstdint>
 #include <ctime>
@@ -16,7 +16,7 @@ namespace room {
         Stopped,
         Ended,
     };
-}
+}  // namespace room
 
 struct Room {
     uint32_t id;

src/prep/CMakeLists.txt

@@ -1 +0,0 @@
-add_library(prepLib prep.cc prep.hh timeUtils.cc timeUtils.hh)

src/validation.cc

@@ -1,6 +1,6 @@
-#include "validation.hh"
+#include "./validation.hh"
 
-#include "room.hh"
+#include "modules/room.hh"
 
 #include <algorithm>
 

src/validation.hh

@@ -1,9 +1,11 @@
 #ifndef VALIDATION_HH
 #define VALIDATION_HH
 
-#include "event.hh"
-#include "player.hh"
-#include "room.hh"
+#include "modules/event.hh"
+#include "modules/player.hh"
+#include "modules/room.hh"
+
+#include <vector>
 
 namespace validation {
     enum Status {
@@ -19,7 +21,7 @@ namespace validation {
         NoRelatedEvents,
         ActionValid,
     };
-}
+}  // namespace validation
 
 int validateAction(Player *actor, const Action *action, Room *room, std::vector<Event> *relatedEvents, Player *target);