preprocessor: split preprocessor into its own file

cmake.ysfx.txt

@@ -55,6 +55,8 @@ add_library(ysfx-private
         "sources/ysfx_api_gfx_lice.hpp"
         "sources/ysfx_eel_utils.cpp"
         "sources/ysfx_eel_utils.hpp"
+        "sources/ysfx_preprocess.cpp"
+        "sources/ysfx_preprocess.hpp"
         "sources/utility/sync_bitset.hpp"
         "sources/base64/Base64.hpp")
 target_compile_definitions(ysfx-private

sources/ysfx.cpp

@@ -22,6 +22,7 @@
 #include "ysfx_config.hpp"
 #include "ysfx_eel_utils.hpp"
 #include "ysfx_api_eel.hpp"
+#include "ysfx_preprocess.hpp"
 #include <type_traits>
 #include <algorithm>
 #include <functional>

sources/ysfx_api_eel.cpp

@@ -47,7 +47,6 @@ static ysfx::mutex atomic_mutex;
 #include "WDL/eel2/eel_fft.h"
 #include "WDL/eel2/eel_mdct.h"
 #include "WDL/eel2/eel_atomic.h"
-#include "WDL/eel2/eel_pproc.h"
 
 //------------------------------------------------------------------------------
 void ysfx_api_init_eel()
@@ -146,29 +145,3 @@ void NSEEL_HOSTSTUB_EnterMutex()
 void NSEEL_HOSTSTUB_LeaveMutex()
 {
 }
-
-bool ysfx_preprocess(ysfx::text_reader &reader, ysfx_parse_error *error, std::string& in_str)
-{
-    std::string line;
-    uint32_t lineno = 0;
-
-    line.reserve(256);
-
-    WDL_FastString file_str, pp_str;
-    while (reader.read_next_line(line)) {
-        line += "\n";
-        const char *linep = line.c_str();
-        file_str.Append(linep);
-    }
-
-    EEL2_PreProcessor pproc;
-    const char *err = pproc.preprocess(file_str.Get(), &pp_str);
-    if (err) {
-        error->line = 0;
-        error->message = std::string("Invalid section: ") + err;
-        return false;
-    }
-
-    in_str.append(pp_str.Get(), pp_str.GetLength());
-    return true;
-}

sources/ysfx_api_eel.hpp

@@ -58,5 +58,3 @@ struct ysfx_string_scoped_lock {
 #define EEL_STRING_GET_FOR_INDEX(x, wr) (ysfx_string_access_unlocked((ysfx_t *)(opaque), x, wr, false))
 #define EEL_STRING_GET_FOR_WRITE(x, wr) (ysfx_string_access_unlocked((ysfx_t *)(opaque), x, wr, true))
 #define EEL_STRING_MUTEXLOCK_SCOPE ysfx_string_scoped_lock lock{(ysfx_t *)(opaque)};
-
-bool ysfx_preprocess(ysfx::text_reader &reader, ysfx_parse_error *error, std::string &str);

sources/ysfx_preprocess.cpp

@@ -0,0 +1,53 @@
+// Copyright 2024 Joep Vanlier
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include "ysfx.hpp"
+#include "ysfx_utils.hpp"
+
+#include "WDL/ptrlist.h"
+#include "WDL/assocarray.h"
+#include "WDL/mutex.h"
+
+#include "WDL/wdlstring.h"
+#include "WDL/eel2/eel_pproc.h"
+
+
+bool ysfx_preprocess(ysfx::text_reader &reader, ysfx_parse_error *error, std::string& in_str)
+{
+    std::string line;
+    uint32_t lineno = 0;
+
+    line.reserve(256);
+
+    WDL_FastString file_str, pp_str;
+    while (reader.read_next_line(line)) {
+        line += "\n";
+        const char *linep = line.c_str();
+        file_str.Append(linep);
+    }
+
+    EEL2_PreProcessor pproc;
+    const char *err = pproc.preprocess(file_str.Get(), &pp_str);
+    if (err) {
+        error->line = 0;
+        error->message = std::string("Invalid section: ") + err;
+        return false;
+    }
+
+    in_str.append(pp_str.Get(), pp_str.GetLength());
+    return true;
+}

sources/ysfx_preprocess.hpp

@@ -0,0 +1,5 @@
+#pragma once
+#include "ysfx.h"
+#include <string>
+
+bool ysfx_preprocess(ysfx::text_reader &reader, ysfx_parse_error *error, std::string& in_str);

tests/ysfx_test_parse.cpp

@@ -19,6 +19,7 @@
 //
 
 #include "ysfx.hpp"
+#include "ysfx_preprocess.hpp"
 #include "ysfx_parse.hpp"
 #include "ysfx_test_utils.hpp"
 #include <catch.hpp>

tests/ysfx_test_serialization.cpp

@@ -169,5 +169,5 @@ TEST_CASE("save and load", "[serialization]")
         REQUIRE(ysfx::unpack_f32le(&state->data[2 * sizeof(float)]) == 200);
         REQUIRE(ysfx::unpack_f32le(&state->data[3 * sizeof(float)]) == 300);
         REQUIRE(ysfx::unpack_f32le(&state->data[4 * sizeof(float)]) == 400);
-    };    
+    };
 }