From c0d456b6fbaffaaf8340745d0dc1b1f74d0dc03d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Sun, 22 Oct 2023 15:56:23 +0200
Subject: [PATCH] EgtExecutor 2.5j4 : - aggiunta funzione lua EgtReplaceString.

---
 EgtExecutor.rc  | Bin 18898 -> 18898 bytes
 LUA_General.cpp |  28 ++++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index f56203f7e8c375ae0bfb323d221a774f6fb060f7..73ba95a6cf40b896cd09eb14f5ebf1a4ff1bc5fd 100644
GIT binary patch
delta 286
zcmcaKneozO#trM3bzK?q7}6PX7%~}(88R3Y7&I6{fg+g<B@C$yDL{TOkd+AL6*Fi~
zKIkDl*}%DAa}>)wCPtIZXT`2FO}@aH$7nLyP*``fgOnfR=3U%+%s{EVa+jGV?-7Jb
zO?Hqn+uSE)#{$;m3RD2qPy-U#E9VFmfvOW=++3vmPnImlu}%KrwrnyN^RmhRoOt*_
e9`XcxA%~$7;(^Tu&U2WtNdSGuw)uzKEhYfyJx)CU

delta 243
zcmcaKneozO#trM3)jb*V7}6PX7*ZLEfmne-gCUrqgdq`#Gl9HNpll|HJz3tlb#olc
zJSIlt%@@V4Gflq2na5~6Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|F@rU@0x76s
zKgP|Iq`|@m<s4zc21+jS#5!g3e8*x&!F;e=J;83x0lG19v%K?0W=!G9^BoUvp671D
F1ORO1KZpPT

diff --git a/LUA_General.cpp b/LUA_General.cpp
index 1066edb..4ffcf0e 100644
--- a/LUA_General.cpp
+++ b/LUA_General.cpp
@@ -178,11 +178,11 @@ LuaSplitStringPlus( lua_State* L)
   // 2 parametri : sVal, sHea
    string sVal ;
    string sHea ;
-   bool bFound = LuaGetParam( L, 1, sVal) ;
-   LuaCheckParam( L, 2, sHea)
+   bool bOk = LuaGetParam( L, 1, sVal)  &&
+              LuaGetParam( L, 2, sHea) ;
    LuaClearStack( L) ;
-  // se ricevuta stringa, la divido in parti conservandone le intestazioni
-   if ( bFound) {
+  // se ricevute stringhe, divido la prima in parti con intestazioni della seconda (che conservo)
+   if ( bOk) {
       STRVECTOR vsVal ;
       TokenizePlus( sVal, sHea, vsVal) ;
      // ritorno il risultato
@@ -194,6 +194,25 @@ LuaSplitStringPlus( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaReplaceString( lua_State* L)
+{
+  // 3 parametri : sVal, sOld, sNew
+   string sVal ;
+   LuaCheckParam( L, 1, sVal)
+   string sOld ;
+   LuaCheckParam( L, 2, sOld)
+   string sNew ;
+   LuaCheckParam( L, 3, sNew)
+   LuaClearStack( L) ;
+  // eseguo sostituzione nella stringa della sequenza indicata dal secondo parametro con quella del terzo
+   int nRes = ReplaceString( sVal, sOld, sNew) ;
+  // restituisco il risultato
+   LuaSetParam( L, sVal) ;
+   LuaSetParam( L, nRes) ;
+   return 2 ;
+}
 //-------------------------------------------------------------------------------
 static int
 LuaSetVal( lua_State* L)
@@ -1245,6 +1264,7 @@ LuaInstallGeneral( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtNumToString", LuaNumToString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSplitString", LuaSplitString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSplitStringPlus", LuaSplitStringPlus) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtReplaceString", LuaReplaceString) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetVal", LuaSetVal) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetVal", LuaGetVal) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetUUID", LuaGetUUID) ;