Merge branch 'master' into wip-xtconvert

Author: Wohlstand

_Libs/AudioCodecs

@@ -3,4 +3,7 @@ include_directories(${CMAKE_CURRENT_LIST_DIR})
 set(MSG_BOX_PREVIEW_SRC
     ${CMAKE_CURRENT_LIST_DIR}/msg_box_preview.cpp
     ${CMAKE_CURRENT_LIST_DIR}/msg_box_preview.h
+
+    ${CMAKE_CURRENT_LIST_DIR}/msg_macros.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/msg_macros.h
 )

_Libs/SDL_Mixer_X

@@ -1,136 +1,17 @@
-#include <regex>
-#include <string>
 #include <QFontMetrics>
 #include <QPaintEvent>
 #include <QFontDatabase>
 #include <QPainter>
 #include <QStack>
 
 #include "msg_box_preview.h"
+#include "msg_macros.h"
 
 
-static void s_splitString(std::vector<std::string>& out, const std::string& str, char delimiter)
-{
-    std::string::size_type beg = 0;
-    std::string::size_type end = 0;
-
-    out.clear();
-    if(str.empty())
-        return;
-
-    do
-    {
-        end = str.find(delimiter, beg);
-        if(end == std::string::npos)
-            end = str.size();
-        out.emplace_back(str.substr(beg, end - beg));
-        beg = end + 1;
-    }
-    while(end < str.size() - 1);
-}
-
 QString MsgBoxPreview::runPreProcessor()
 {
-    std::regex cond_if = std::regex("^#if *(\\w+\\(.*\\))$");
-    std::regex cond_elif = std::regex("^#elif *(\\w+\\(.*\\))$");
-    const std::string cond_endif = "#endif";
-    const std::string cond_else = "#else";
-
-    std::regex reg_op_player = std::regex("^player\\((.*)\\)$");
-    std::regex reg_op_state = std::regex("^state\\((.*)\\)$");
-
-    struct State
-    {
-        bool open = false;
-        bool cond_true = false;
-        bool skip_to_endif = false;
-    };
-
-    State st;
     std::string ret;
-    std::string tmpS = m_currentText.toStdString();
-    std::vector<std::string> tmp;
-    s_splitString(tmp, tmpS, '\n');
-
-    for(const auto &t : tmp)
-    {
-        std::smatch m_if;
-        std::smatch m_elif;
-
-        if((!st.open && std::regex_search(t, m_if, cond_if)) ||
-           ( st.open && std::regex_search(t, m_elif, cond_elif)))
-        {
-            st.cond_true = false;
-            if(st.open && st.skip_to_endif)
-                continue;
-
-            std::string cond = st.open ? m_elif[1].str() : m_if[1].str();
-            std::smatch m_op_player;
-
-            if(std::regex_search(cond, m_op_player, reg_op_player)) // check whaever player
-            {
-                st.open = true;
-                std::string players = m_op_player[1].str();
-                std::vector<std::string> nums;
-                s_splitString(nums, players, ',');
-
-                for(auto &i : nums)
-                {
-                    if(std::atoi(i.c_str()) == m_macro.player)
-                    {
-                        st.cond_true = true;
-                        st.skip_to_endif = true;
-                        break;
-                    }
-                }
-            }
-            else if(std::regex_search(cond, m_op_player, reg_op_state)) // check whaever state
-            {
-                st.open = true;
-                std::string players = m_op_player[1].str();
-                std::vector<std::string> nums;
-                s_splitString(nums, players, ',');
-
-                for(auto &i : nums)
-                {
-                    if(std::atoi(i.c_str()) == m_macro.state)
-                    {
-                        st.cond_true = true;
-                        st.skip_to_endif = true;
-                        break;
-                    }
-                }
-            }
-            else // invalid line
-            {
-                if(!ret.empty())
-                    ret.push_back('\n');
-                ret.append(t);
-            }
-        }
-        else if(st.open && t == cond_endif)
-        {
-            st.open = false;
-            st.cond_true = false;
-            st.skip_to_endif = false;
-        }
-        else if(st.open && t == cond_else)
-        {
-            st.open = true;
-            st.cond_true = !st.skip_to_endif;
-            if(st.open && st.skip_to_endif)
-                continue;
-
-            st.skip_to_endif = false;
-        }
-        else if(!st.open || st.cond_true) // ordinary line
-        {
-            if(!ret.empty())
-                ret.push_back('\n');
-            ret.append(t);
-        }
-    }
-
+    msgMacroProcess(m_currentText.toStdString(), ret, m_macro.player, m_macro.state);
     return QString::fromStdString(ret);
 }