Merging SaX-based parsing support to increase read performance

.appveyor.yml

@@ -4,22 +4,22 @@ environment:
   global:
     PLATFORMTOOLSET: "v140"
   matrix:
-    - BUILD_TYPE: Debug
-      COMPILER: MinGW
-      COMPILER_FAMILY: MinGW
-      GENERATOR: "MinGW Makefiles"
-      PLATFORM: Win32
-      QT_BUILD: OFF
-      QT_PATH: C:\Qt\5.15.2\mingw81_32
-      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
-    - BUILD_TYPE: Release
-      COMPILER: MinGW
-      COMPILER_FAMILY: MinGW
-      GENERATOR: "MinGW Makefiles"
-      PLATFORM: Win32
-      QT_BUILD: OFF
-      QT_PATH: C:\Qt\5.15.2\mingw81_32
-      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+#    - BUILD_TYPE: Debug
+#      COMPILER: MinGW
+#      COMPILER_FAMILY: MinGW
+#      GENERATOR: "MinGW Makefiles"
+#      PLATFORM: Win32
+#      QT_BUILD: OFF
+#      QT_PATH: C:\Qt\5.15.2\mingw81_32
+#      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+#    - BUILD_TYPE: Release
+#      COMPILER: MinGW
+#      COMPILER_FAMILY: MinGW
+#      GENERATOR: "MinGW Makefiles"
+#      PLATFORM: Win32
+#      QT_BUILD: OFF
+#      QT_PATH: C:\Qt\5.15.2\mingw81_32
+#      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
     - BUILD_TYPE: Debug
       COMPILER: MinGW-w64
       COMPILER_FAMILY: MinGW

CMakeLists.txt

@@ -23,6 +23,7 @@ if(NOT CMAKE_DEBUG_POSTFIX)
 endif()
 
 option(PGEFL_ENABLE_RWOPS "Enable SDL_RWops interfaces (if this option is enabled, then PGE-FL has a build-time dependency on SDL2's headers)" OFF)
+option(PGEFL_DISABLE_SMBX38A "Disable loading of SMBX-38A content" OFF)
 
 if(NOT DEFINED PGE_FORCE_QT5 AND NOT DEFINED PGEFL_PREFER_QT5)
     option(PGE_FORCE_QT5 "Try to find Qt5 instead of Qt6 if available" ON)
@@ -47,15 +48,15 @@ macro(pgeflFindQt)
     endif()
 endmacro()
 
-if(NOT DEFINED PGEFL_QT_SUPPORT AND NOT VITA AND NOT PS2)
+if(NOT DEFINED PGEFL_QT_SUPPORT AND NOT VITA AND NOT PSP AND NOT PS2)
     pgeflFindQt()
 endif()
 
 if(PGEFL_QT_SUPPORT)
     pgeflFindQt()
 endif()
 
-if(VITA OR PS2 OR PGEFL_USE_QT5 OR PGEFL_USE_QT6)
+if(VITA OR PSP OR PS2 OR PGEFL_USE_QT5 OR PGEFL_USE_QT6)
     set(OPT_DEF_PGEFL_QT_SUPPORT OFF)
 else()
     set(OPT_DEF_PGEFL_QT_SUPPORT ON)
@@ -64,7 +65,7 @@ endif()
 if(NOT PGEFL_QT_SUPPORT)
     option(PGEFL_QT_SUPPORT "Build also Qt variant" ${OPT_DEF_PGEFL_QT_SUPPORT})
 endif()
-if(PGEFL_QT_SUPPORT AND NOT VITA AND NOT NINTENDO_3DS AND NOT NINTENDO_WII AND NOT NINTENDO_WIIU AND NOT NINTENDO_SWITCH)
+if(PGEFL_QT_SUPPORT AND NOT VITA AND NOT PSP AND NOT NINTENDO_3DS AND NOT NINTENDO_WII AND NOT NINTENDO_WIIU AND NOT NINTENDO_SWITCH)
     message("== PGE-FL Qt Edition WILL be built!")
     if(POLICY CMP0071) # Automoc
         cmake_policy(SET CMP0071 NEW)
@@ -103,6 +104,25 @@ if(PGEFL_ENABLE_RWOPS)
     target_compile_definitions(pgefl PUBLIC -DPGEFL_ENABLE_RWOPS)
 endif()
 
+if(PGEFL_DISABLE_SMBX38A)
+    target_compile_definitions(pgefl PRIVATE -DPGEFL_DISABLE_SMBX38A)
+endif()
+
+if(NOT EMSCRIPTEN)
+    try_compile(HAS_STD_STOX_WRAPPED
+        ${CMAKE_CURRENT_BINARY_DIR}/cmake-checks
+        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/checks/stdstrtoi/has_std_stol.cpp
+        CMAKE_FLAGS -DCMAKE_CXX_STANDARD=11
+    )
+endif()
+
+if(NOT EMSCRIPTEN AND NOT HAS_STD_STOX_WRAPPED)
+    target_compile_definitions(pgefl PRIVATE -DPGEFL_MISSING_STD_STOX_FUNCS)
+endif()
+
+pgefl_target_disable_cxx_warning_flag(pgefl "c++20-extensions" CPP20EXTENSIONS)
+pgefl_target_disable_cxx_warning_flag(pgefl "c++20-attribute-extensions" CPP20ATTRIBEXTENSIONS)
+
 if(PGEFL_QT_SUPPORT)
     add_library(pgefl_qt STATIC
         ${PGE_FILE_LIBRARY_SRCS}
@@ -118,6 +138,10 @@ if(PGEFL_QT_SUPPORT)
     if(PGEFL_ENABLE_RWOPS)
         target_compile_definitions(pgefl_qt PUBLIC -DPGEFL_ENABLE_RWOPS)
     endif()
+
+    if(PGEFL_DISABLE_SMBX38A)
+        target_compile_definitions(pgefl PRIVATE -DPGEFL_DISABLE_SMBX38A)
+    endif()
 endif()
 
 # Don't install libraries when PGE-FL was built as a part of Moondust master project

CSVReader.h

@@ -27,11 +27,8 @@
 #ifndef CSVReader_H
 #define CSVReader_H
 
-#include <iostream>
-#include <fstream>
 #include <string>
 #include <type_traits>
-#include <sstream>
 #include <array>
 #include <exception>
 #include <stdexcept>

build_props.cmake

@@ -114,6 +114,7 @@ endif()
 if(LIBRARY_PROJECT
     AND NOT WIN32
     AND NOT VITA
+    AND NOT PSP
     AND NOT PS2
     AND NOT NINTENDO_DS
     AND NOT NINTENDO_3DS
@@ -156,3 +157,10 @@ macro(pgefl_disable_cxx_warning_flag WARNINGFLAG WARNING_VAR)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${WARNINGFLAG}")
     endif()
 endmacro()
+
+macro(pgefl_target_disable_cxx_warning_flag TARGETNAME WARNINGFLAG WARNING_VAR)
+    check_cxx_compiler_flag("-W${WARNINGFLAG}" HAVE_CXX_W_${WARNING_VAR})
+    if(HAVE_CXX_W_${WARNING_VAR})
+        target_compile_options(${TARGETNAME} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-Wno-${WARNINGFLAG}>")
+    endif()
+endmacro()

cmake/checks/stdstrtoi/has_std_stol.cpp

@@ -0,0 +1,11 @@
+#include <string>
+
+int main()
+{
+    long x1 = std::stol("42");
+    unsigned long long x2 = std::stoull("42");
+    float x3 = std::stof("42.0");
+    double x4 = std::stod("42.0");
+
+    return 0;
+}

file_formats.h

@@ -48,6 +48,8 @@
 #   define PGEFL_DEPRECATED(func) func
 #endif
 
+#define PGEFL_CALLBACK_API
+
 /*!
  * \brief PGE File library class of static functions.
  *        Library is buildable in both Qt and STL applications
@@ -63,6 +65,8 @@ class FileFormats PGE_FILES_INHERED
     static const unsigned int c_latest_version_smbx38a = 69;
     static const unsigned int c_version_default = 0xFFFFFFFF;
 
+    static bool g_use_legacy_pgex_parser;
+
 
     /******************************non-SMBX64 Meda-data file***********************************/
     /*!
@@ -161,6 +165,13 @@ class FileFormats PGE_FILES_INHERED
      * @return true if file successfully opened and parsed, false if error occouped
      */
     static bool OpenLevelFileT(PGE_FileFormats_misc::TextInput &file, LevelData &FileData);
+    /**
+     * @brief Parses a level file data with auto-detection of a file type (SMBX1...64 LVL or PGE-LVLX)
+     * @param [__in] file Input file descriptor
+     * @param [__out] callbacks Callbacks to receive level data
+     * @return true if file successfully opened and parsed, false if error occouped
+     */
+    static bool OpenLevelFileT(PGE_FileFormats_misc::TextInput &file, const LevelLoadCallbacks &callbacks);
     /*!
      * \brief Parses a level file header only with auto-detection of a file type (SMBX1...64 LVL or PGE-LVLX)
      * \param [__in] filePath Full path to file which must be opened
@@ -260,6 +271,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadSMBX64LvlFile(PGE_FileFormats_misc::TextInput &in, LevelData /*output*/ &FileData);
+    /*!
+     * \brief Parses SMBX1...64 level file data
+     * \param [__in] in Input file descriptor
+     * \param [__in] callbacks Callbacks for level load
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadSMBX64LvlFile(PGE_FileFormats_misc::TextInput &in, const LevelLoadCallbacks &callbacks);
     /*!
      * \brief Generates SMBX1...64 Level file data and saves into file
      * \param [__in] filePath Target file path
@@ -331,6 +349,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadSMBX38ALvlFile(PGE_FileFormats_misc::TextInput &in, LevelData /*output*/ &FileData);
+    /*!
+     * \brief Parses SMBX-38A level file data from raw data string
+     * \param [__in] in File input descriptor
+     * \param [__out] callbacks LevelLoadCallbacks Level data structure
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadSMBX38ALvlFile(PGE_FileFormats_misc::TextInput &in, const LevelLoadCallbacks &callbacks);
 #if 0 // Removed
     /*!
      * \brief Parses SMBX-38A level file data from raw data string (Old algorithm)
@@ -390,6 +415,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadExtendedLvlFileHeaderT(PGE_FileFormats_misc::TextInput &inf, LevelData &FileData);
+    /*!
+     * \brief Parses PGE-X Level file header from the file
+     * \param [__in] inf Input file descriptor
+     * \param [__in] callbacks Level load callbacks (will only attempt to call the load_head and on_error callbacks)
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadExtendedLvlFileHeaderT(PGE_FileFormats_misc::TextInput &inf, const LevelLoadCallbacks &callbacks);
     /*!
      * \brief Parses PGE-X level file data from file
      * \param [__in] filePath Full path to the file
@@ -412,6 +444,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadExtendedLvlFile(PGE_FileFormats_misc::TextInput &in, LevelData /*output*/ &FileData);
+    /*!
+     * \brief Parses PGE-X level file data from file input descriptor
+     * \param [__in] in File Input descriptor
+     * \param [__in] callbacks Level load callbacks
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadExtendedLvlFile(PGE_FileFormats_misc::TextInput &in, const LevelLoadCallbacks &callbacks);
     /*!
      * \brief Generates PGE-X Level file
      * \param [__in] filePath Target file path
@@ -604,6 +643,13 @@ class FileFormats PGE_FILES_INHERED
      * @return true if file successfully opened and parsed, false if error occouped
      */
     static bool OpenWorldFileT(PGE_FileFormats_misc::TextInput &file, WorldData &data);
+    /**
+     * @brief Parses a level world map data with auto-detection of a file type (SMBX1...64 LVL or PGE-LVLX)
+     * @param [__in] file Input file descriptor
+     * \param [__out] callbacks WorldLoadCallbacks Callbacks to store loaded world data
+     * @return true if file successfully opened and parsed, false if error occouped
+     */
+    static bool OpenWorldFileT(PGE_FileFormats_misc::TextInput &file, const WorldLoadCallbacks &data);
     /*!
      * \brief Parses a world map file header only with auto-detection of a file type (SMBX1...64 LVL or PGE-WLDX)
      * \param [__in] filePath Full path to file which must be opened
@@ -691,6 +737,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadSMBX64WldFile(PGE_FileFormats_misc::TextInput &in, WorldData /*output*/ &FileData);
+    /*!
+     * \brief Parses SMBX1...64 World map file from raw data from file input descriptor
+     * \param [__in] in File Input descriptor
+     * \param [__out] callbacks WorldLoadCallbacks Callbacks to store loaded world data
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadSMBX64WldFile(PGE_FileFormats_misc::TextInput &in, const WorldLoadCallbacks &callbacks);
     /*!
      * \brief Saves level data into file of SMBX1...64 World map format
      * \param [__in] filePath Target file path
@@ -761,6 +814,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadSMBX38AWldFile(PGE_FileFormats_misc::TextInput &in, WorldData /*output*/ &FileData);
+    /*!
+     * \brief Parses SMBX-38A world map file data from raw data string
+     * \param [__in] in File input descriptor
+     * \param [__out] callbacks WorldLoadCallbacks Callbacks to store loaded world data
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadSMBX38AWldFile(PGE_FileFormats_misc::TextInput &in, const WorldLoadCallbacks& callbacks);
     /*!
      * \brief Generates SMBX-38A Level file data and saves into file
      * \param [__in] filePath Target file path
@@ -831,6 +891,13 @@ class FileFormats PGE_FILES_INHERED
      * \return true if file successfully parsed, false if error occouped
      */
     static bool ReadExtendedWldFile(PGE_FileFormats_misc::TextInput &in, WorldData /*output*/ &FileData);
+    /*!
+     * \brief Parses PGE-X World map file from file input descriptor
+     * \param [__in] in File Input descriptor
+     * \param [__out] callbacks WorldLoadCallbacks Callbacks to store loaded world data
+     * \return true if file successfully parsed, false if error occouped
+     */
+    static bool ReadExtendedWldFile(PGE_FileFormats_misc::TextInput &in, const WorldLoadCallbacks& callbacks);
     /*!
      * \brief Saves world map data into file of PGE-X World map format
      * \param [__in] filePath Target file path