Feature: Refactor UTF defs to use new lua parser (#3018)

Co-authored-by: patrikjuvonen <[email protected]>

Author: Sebastian Jura

Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp

@@ -4,166 +4,100 @@
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        Shared/mods/logic/luadefs/CLuaUTFDefs.cpp
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
 #include "StdInc.h"
 #include "CLuaUTFDefs.h"
-#include "CScriptArgReader.h"
+#include "lua/CLuaFunctionParser.h"
 
-void CLuaUTFDefs::LoadFunctions()
+auto UtfLen(std::string input) -> int
 {
-    constexpr static const std::pair<const char*, lua_CFunction> functions[]{
-        {"utfLen", UtfLen}, {"utfSeek", UtfSeek}, {"utfSub", UtfSub}, {"utfChar", UtfChar}, {"utfCode", UtfCode},
-    };
-
-    // Add functions
-    for (const auto& [name, func] : functions)
-        CLuaCFunctions::AddFunction(name, func);
+    return MbUTF8ToUTF16(input).size();
 }
 
-int CLuaUTFDefs::UtfLen(lua_State* luaVM)
+auto UtfSeek(std::string input, const int position) -> std::variant<bool, int>
 {
-    SString strInput;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadString(strInput);
-
-    if (!argStream.HasErrors())
+    if (std::wstring utfString = MbUTF8ToUTF16(input); position <= static_cast<int>(utfString.size()) && position >= 0)
     {
-        lua_pushnumber(luaVM, MbUTF8ToUTF16(strInput).size());
-        return 1;
+        utfString = utfString.substr(0, position);
+
+        return static_cast<int>(UTF16ToMbUTF8(utfString).size());
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    lua_pushboolean(luaVM, false);
-    return 1;
+    return false;
 }
 
-int CLuaUTFDefs::UtfSeek(lua_State* luaVM)
+auto UtfSub(std::string input, int start, int end) -> std::string
 {
-    SString strInput;
-    int     iPos;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadString(strInput);
-    argStream.ReadNumber(iPos);
+    std::wstring    utfString = MbUTF8ToUTF16(input);
+    const ptrdiff_t length = utfString.size();
 
-    if (!argStream.HasErrors())
+    // posrelat them both
+    if (start < 0)
     {
-        std::wstring strUTF = MbUTF8ToUTF16(strInput);
-        if (iPos <= static_cast<int>(strUTF.size()) && iPos >= 0)
-        {
-            strUTF = strUTF.substr(0, iPos);
-            lua_pushnumber(luaVM, UTF16ToMbUTF8(strUTF).size());
-            return 1;
-        }
+        start += length + 1;
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    lua_pushboolean(luaVM, false);
-    return 1;
-}
-
-int CLuaUTFDefs::UtfSub(lua_State* luaVM)
-{
-    SString   strInput;
-    ptrdiff_t iStart;
-    ptrdiff_t iEnd;
+    start = (start >= 0) ? start : 0;
 
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadString(strInput);
-    argStream.ReadNumber(iStart);
-    argStream.ReadNumber(iEnd, -1);
-
-    if (!argStream.HasErrors())
+    if (end < 0)
     {
-        std::wstring strUTF = MbUTF8ToUTF16(strInput);
-        size_t       l = strUTF.size();
-
-        // posrelat them both
-        if (iStart < 0)
-            iStart += (ptrdiff_t)l + 1;
-        iStart = (iStart >= 0) ? iStart : 0;
-
-        if (iEnd < 0)
-            iEnd += (ptrdiff_t)l + 1;
-        iEnd = (iEnd >= 0) ? iEnd : 0;
-
-        if (iStart < 1)
-            iStart = 1;
-        if (iEnd > (ptrdiff_t)l)
-            iEnd = (ptrdiff_t)l;
-        if (iStart <= iEnd)
-        {
-            strUTF = strUTF.substr(iStart - 1, iEnd - iStart + 1);
-            lua_pushstring(luaVM, UTF16ToMbUTF8(strUTF).c_str());
-        }
-        else
-            lua_pushliteral(luaVM, "");
-
-        return 1;
+        end += length + 1;
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    lua_pushboolean(luaVM, false);
-    return 1;
-}
+    end = (end >= 0) ? end : 0;
 
-int CLuaUTFDefs::UtfChar(lua_State* luaVM)
-{
-    int iCode;
+    if (start < 1)
+    {
+        start = 1;
+    }
 
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadNumber(iCode);
+    if (end > length)
+    {
+        end = length;
+    }
 
-    if (!argStream.HasErrors())
+    if (start <= end)
     {
-        if (iCode > 65534 || iCode < 32)
-        {
-            m_pScriptDebugging->LogBadType(luaVM);
-            lua_pushnil(luaVM);
-            return 1;
-        }
+        utfString = utfString.substr(start - 1, end - start + 1);
 
-        // Generate a null-terminating string for our character
-        wchar_t wUNICODE[2] = {static_cast<wchar_t>(iCode), '\0'};
+        return UTF16ToMbUTF8(utfString);
+    }
 
-        // Convert our UTF character into an ANSI string
-        SString strANSI = UTF16ToMbUTF8(wUNICODE);
+    return "";
+}
 
-        lua_pushstring(luaVM, strANSI.c_str());
-        return 1;
+auto UtfChar(const int code) -> std::string
+{
+    if (code > 65534 || code < 32)
+    {
+        throw std::invalid_argument("characterCode out of range, expected number between 32 and 65534.");
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    lua_pushboolean(luaVM, false);
-    return 1;
+    // Generate a null-terminating string for our character
+    const wchar_t string[2] = {static_cast<wchar_t>(code), '\0'};
+
+    // Convert our UTF character into an ANSI string
+    return UTF16ToMbUTF8(string);
 }
 
-int CLuaUTFDefs::UtfCode(lua_State* luaVM)
+auto UtfCode(std::string input) -> int
 {
-    SString strInput;
+    return static_cast<unsigned long>(MbUTF8ToUTF16(input).c_str()[0]);
+}
 
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadString(strInput);
+void CLuaUTFDefs::LoadFunctions()
+{
+    constexpr static const std::pair<const char*, lua_CFunction> functions[]{
+        {"utfLen", ArgumentParserWarn<false, UtfLen>},     {"utfSeek", ArgumentParserWarn<false, UtfSeek>}, {"utfSub", ArgumentParserWarn<false, UtfSub>},
+        {"utfChar", ArgumentParserWarn<nullptr, UtfChar>}, {"utfCode", ArgumentParserWarn<false, UtfCode>},
+    };
 
-    if (!argStream.HasErrors())
+    // Add functions
+    for (const auto& [name, func] : functions)
     {
-        std::wstring  strUTF = MbUTF8ToUTF16(strInput);
-        unsigned long ulCode = strUTF.c_str()[0];
-
-        lua_pushnumber(luaVM, ulCode);
-        return 1;
+        CLuaCFunctions::AddFunction(name, func);
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
-
-    lua_pushboolean(luaVM, false);
-    return 1;
 }

Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.h

@@ -4,21 +4,16 @@
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        Shared/mods/logic/luadefs/CLuaUTFDefs.h
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
 #pragma once
+
 #include "luadefs/CLuaDefs.h"
 
 class CLuaUTFDefs : public CLuaDefs
 {
 public:
     static void LoadFunctions();
-
-    LUA_DECLARE(UtfLen);
-    LUA_DECLARE(UtfSeek);
-    LUA_DECLARE(UtfSub);
-    LUA_DECLARE(UtfChar);
-    LUA_DECLARE(UtfCode);
 };