for issue #80

NevilClavain · Aug 3, 2023 · 12ab03f · 12ab03f
1 parent d0032b7
commit 12ab03f
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 125 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,6 +88,9 @@ ALL_BUILD.vcxproj*
 /CORE_maths/CMakeFiles/
 /CORE_maths/*.sln
 /CORE_maths/*.vcxproj*
+/CORE_parser/CMakeFiles/
+/CORE_parser/*.sln
+/CORE_parser/*.vcxproj*
 /CEGUIWrapper_project/CMakeFiles/
 /CEGUIWrapper_project/*.sln
 /CEGUIWrapper_project/*.vcxproj*

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,7 @@ add_subdirectory(drawspacecore_project)
 
 add_subdirectory(CORE_logger)
 add_subdirectory(CORE_maths)
+add_subdirectory(CORE_parser)
 
 add_subdirectory(CEGUIWrapper_project)
 add_subdirectory(Plugins/d3d11_project)

diff --git a/CORE_parser/CMakeLists.txt b/CORE_parser/CMakeLists.txt
@@ -0,0 +1,42 @@
+# -*-LIC_BEGIN-*-
+#                                                                          
+# DrawSpace Rendering engine                                               
+# Emmanuel Chaumont Copyright (c) 2013-2023                     
+#                                                                          
+# This file is part of DrawSpace.                                          
+#                                                                          
+#    DrawSpace is free software: you can redistribute it and/or modify     
+#    it under the terms of the GNU General Public License as published by  
+#    the Free Software Foundation, either version 3 of the License, or     
+#    (at your option) any later version.                                   
+#                                                                          
+#    DrawSpace is distributed in the hope that it will be useful,          
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of        
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         
+#    GNU General Public License for more details.                          
+#                                                                          
+#    You should have received a copy of the GNU General Public License     
+#    along with DrawSpace.  If not, see <http://www.gnu.org/licenses/>.    
+#
+# -*-LIC_END-*-
+
+cmake_minimum_required(VERSION 3.0)
+project(CORE_parser)
+
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${physfs_include_dir})
+
+file(
+        GLOB_RECURSE
+        source_files
+		${CMAKE_SOURCE_DIR}/CORE_parser/src/*.h
+        ${CMAKE_SOURCE_DIR}/CORE_parser/src/*.cpp		
+)
+
+
+add_definitions( -D_FROMCMAKE )
+
+add_library(CORE_parser ${source_files})
+
+
+
diff --git a/src/parser.cpp → CORE_parser/src/parser.cpp b/src/parser.cpp → CORE_parser/src/parser.cpp
@@ -1,82 +1,82 @@
-/* -*-LIC_BEGIN-*- */
-/*
-*
-* DrawSpace Rendering engine
-* Emmanuel Chaumont Copyright (c) 2013-2023
-*
-* This file is part of DrawSpace.
-*
-*    DrawSpace is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
-*
-*    DrawSpace is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-*
-*    You should have received a copy of the GNU General Public License
-*    along with DrawSpace.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-/* -*-LIC_END-*- */
-
-#include <vector>
-#include "parser.h"
-#include "file.h"
-
-
-using namespace DrawSpace;
-using namespace DrawSpace::Utils;
-
-static std::vector<dsstring> split(const std::string& s, const std::string& seperators)
-{
-    std::vector<std::string> output;
-    std::string::size_type prev_pos{ 0 };
-    std::string::size_type pos{ 0 };
-
-    while ((pos = s.find(seperators, pos)) != std::string::npos)
-    {
-        std::string substring(s.substr(prev_pos, pos - prev_pos));
-
-        output.push_back(substring);
-        prev_pos = ++pos;
-    }
-
-    output.push_back(s.substr(prev_pos, pos - prev_pos)); // Last word
-    return output;
-}
-
-void Parser::run(const dsstring& p_filepath, const dsstring& p_separators, const ParserCallback& p_callback)
-{
-    long line_count{ 0 };
-
-    File file(p_filepath, File::OPENEXISTINGTEXT);
-    constexpr int lineMaxSize{ 1024 };
-
-    char line[lineMaxSize];
-
-    while (file.Gets(line, lineMaxSize))
-    {
-        line_count++;
-        // supprimer le retour chariot en fin de ligne
-        if (0x0a != line[0])
-        {
-            const auto len{ strlen(line) };
-
-            if (0x0a == line[len - 1])
-            {
-                line[len - 1] = 0x00;
-            }
-
-            const dsstring current_line(line);
-            if (current_line != "")
-            {
-                const auto words{ split(current_line, p_separators)};
-
-                p_callback(current_line, line_count, words);
-            }
-        }
-    }
+/* -*-LIC_BEGIN-*- */
+/*
+*
+* DrawSpace Rendering engine
+* Emmanuel Chaumont Copyright (c) 2013-2023
+*
+* This file is part of DrawSpace.
+*
+*    DrawSpace is free software: you can redistribute it and/or modify
+*    it under the terms of the GNU General Public License as published by
+*    the Free Software Foundation, either version 3 of the License, or
+*    (at your option) any later version.
+*
+*    DrawSpace is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU General Public License for more details.
+*
+*    You should have received a copy of the GNU General Public License
+*    along with DrawSpace.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+/* -*-LIC_END-*- */
+
+#include <vector>
+#include "parser.h"
+#include "file.h"
+
+
+using namespace DrawSpace;
+using namespace DrawSpace::Utils;
+
+static std::vector<dsstring> split(const std::string& s, const std::string& seperators)
+{
+    std::vector<std::string> output;
+    std::string::size_type prev_pos{ 0 };
+    std::string::size_type pos{ 0 };
+
+    while ((pos = s.find(seperators, pos)) != std::string::npos)
+    {
+        std::string substring(s.substr(prev_pos, pos - prev_pos));
+
+        output.push_back(substring);
+        prev_pos = ++pos;
+    }
+
+    output.push_back(s.substr(prev_pos, pos - prev_pos)); // Last word
+    return output;
+}
+
+void Parser::run(const dsstring& p_filepath, const dsstring& p_separators, const ParserCallback& p_callback)
+{
+    long line_count{ 0 };
+
+    File file(p_filepath, File::OPENEXISTINGTEXT);
+    constexpr int lineMaxSize{ 1024 };
+
+    char line[lineMaxSize];
+
+    while (file.Gets(line, lineMaxSize))
+    {
+        line_count++;
+        // supprimer le retour chariot en fin de ligne
+        if (0x0a != line[0])
+        {
+            const auto len{ strlen(line) };
+
+            if (0x0a == line[len - 1])
+            {
+                line[len - 1] = 0x00;
+            }
+
+            const dsstring current_line(line);
+            if (current_line != "")
+            {
+                const auto words{ split(current_line, p_separators)};
+
+                p_callback(current_line, line_count, words);
+            }
+        }
+    }
 }
diff --git a/src/parser.h → CORE_parser/src/parser.h b/src/parser.h → CORE_parser/src/parser.h
@@ -1,43 +1,43 @@
-/* -*-LIC_BEGIN-*- */
-/*
-*
-* DrawSpace Rendering engine
-* Emmanuel Chaumont Copyright (c) 2013-2023
-*
-* This file is part of DrawSpace.
-*
-*    DrawSpace is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
-*
-*    DrawSpace is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-*
-*    You should have received a copy of the GNU General Public License
-*    along with DrawSpace.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-/* -*-LIC_END-*- */
-
-#pragma once
-
-#include <vector>
-#include <functional>
-#include "ds_types.h"
-
-namespace DrawSpace
-{
-    namespace Parser
-    {
-        using ParserCallback = std::function<void(const dsstring&, long, const std::vector<dsstring>&)>;
-
-        void run(const dsstring& p_filepath, 
-                    const dsstring& p_separators, 
-                    const ParserCallback& p_callback
-                );
-    }
-}
-
+/* -*-LIC_BEGIN-*- */
+/*
+*
+* DrawSpace Rendering engine
+* Emmanuel Chaumont Copyright (c) 2013-2023
+*
+* This file is part of DrawSpace.
+*
+*    DrawSpace is free software: you can redistribute it and/or modify
+*    it under the terms of the GNU General Public License as published by
+*    the Free Software Foundation, either version 3 of the License, or
+*    (at your option) any later version.
+*
+*    DrawSpace is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU General Public License for more details.
+*
+*    You should have received a copy of the GNU General Public License
+*    along with DrawSpace.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+/* -*-LIC_END-*- */
+
+#pragma once
+
+#include <vector>
+#include <functional>
+#include "ds_types.h"
+
+namespace DrawSpace
+{
+    namespace Parser
+    {
+        using ParserCallback = std::function<void(const dsstring&, long, const std::vector<dsstring>&)>;
+
+        void run(const dsstring& p_filepath, 
+                    const dsstring& p_separators, 
+                    const ParserCallback& p_callback
+                );
+    }
+}
+
diff --git a/drawspacecore_project/CMakeLists.txt b/drawspacecore_project/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(${st_tree_include_dir})
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_maths/src)
 
+
 file(
         GLOB_RECURSE
         source_files

diff --git a/lua_core/CMakeLists.txt b/lua_core/CMakeLists.txt
@@ -34,6 +34,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_maths/src)
 
+
 file(
         GLOB_RECURSE
         source_files

diff --git a/lua_extensions/fpsmvt_luaext/CMakeLists.txt b/lua_extensions/fpsmvt_luaext/CMakeLists.txt
@@ -38,6 +38,7 @@ link_directories(${bullet_lib_dir})
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_maths/src)
+
 include_directories(${CMAKE_SOURCE_DIR}/lua_core/src)
 
 file(

diff --git a/rt_project/CMakeLists.txt b/rt_project/CMakeLists.txt
@@ -26,6 +26,7 @@ project(rt)
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_logger/src)
 include_directories(${CMAKE_SOURCE_DIR}/CORE_maths/src)
+include_directories(${CMAKE_SOURCE_DIR}/CORE_parser/src)
 
 include_directories(${jsonjsmn_include_dir})
 link_directories(${jsonjsmn_lib_dir})
@@ -49,7 +50,7 @@ file(
 )
 
 add_executable(rt WIN32 ${source_files})
-target_link_libraries(rt physfs jsmn BulletDynamics_vs2017 BulletCollision_vs2017 LinearMath_vs2017 drawspace_core CORE_logger CORE_maths)
+target_link_libraries(rt physfs jsmn BulletDynamics_vs2017 BulletCollision_vs2017 LinearMath_vs2017 drawspace_core CORE_logger CORE_maths CORE_parser)
 
 install(TARGETS rt CONFIGURATIONS Debug RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/apps/Debug)
 install(TARGETS rt CONFIGURATIONS Release RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/apps/Release)