admin/RepoMain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:70043918bb2e61129b733e76710a5cabc5a58d73
Branches Tags
admin:main admin:bmain admin:init admin:master
...
compare: admin:f52ff234d75e0c8b63d5c8437f9c4aefa386d646
Branches Tags
admin:bmain admin:main admin:init admin:master

2 Commits
70043918bb ... f52ff234d7

Author SHA1 Message Date
/* User with id == 0 is a fake user from git author */ sauron
f52ff234d7 commit 2025-09-02 14:37 refine Replace() in ZCppMain/ZtCStringEx.H 2025-09-02 14:37:39 +09:00
/* User with id == 0 is a fake user from git author */ sauron
832cd98558 commit 2025-09-02 14:24 fix bug in Replace() in ZCppMain/ZtCStringEx.H 2025-09-02 14:36:49 +09:00
2 changed files with 41 additions and 19 deletions
Expand all files Collapse all files

20
ZCppMain/ZCStringStd.H
View File

@ -160,17 +160,17 @@ namespace ZNsMain
}/* }/*
__for1(TypeLength, i, VL_PosListSize)*/ __for1(TypeLength, i, VL_PosListSize)*/
if(VL_DestStart<VL_MoveStart && VL_DestStart<VL_ThisSize) if(VL_ThisSize > VL_MoveStart)
{ {
::memmove /*::::::::::::::::::::::::::::::*/ ::memmove /*::::::::::::::::::::::::::::::*/
( (
VPC_ThisStart + VL_DestStart, VPC_ThisStart + VL_DestStart,
VPC_ThisStart + VL_MoveStart, VPC_ThisStart + VL_MoveStart,
VL_MoveStart - VL_DestStart VL_ThisSize - VL_MoveStart
); );
/*::::::::::::::::::::::::::::::::::::::::*/ /*::::::::::::::::::::::::::::::::::::::::*/
}/* }/*
if(VL_DestStart<VL_MoveStart && VL_DestStart<VL_ThisSize)*/ if(VL_ThisSize > VL_MoveStart)*/
this->resize(VL_NeedSize); return *this; this->resize(VL_NeedSize); return *this;
}/* }/*
@ -282,6 +282,20 @@ namespace ZNsMain
###########################################################################*/ ###########################################################################*/
ZCStringStd& Replace /*####################################################*/
(
TypeCPChar APC_Search, TypeCPChar APC_Replace, TypeLength AL_Offset=0
)
/*#########################################################################*/
{
return Replace(APC_Search, APC_Replace, ZftLength(APC_Search), ZftLength(APC_Replace), AL_Offset);
}/*
ZCStringStd& Replace /*######################################################
(
TypeCPChar APC_Search, TypeCPChar APC_Replace, TypeLength AL_Offset=0
)
###########################################################################*/
public: public:
};/* };/*
class ZCStringStd : public std::string*/ class ZCStringStd : public std::string*/

40
ZCppMain/ZtCStringEx.H
View File

@ -407,11 +407,11 @@ namespace ZNsMain
VPC_MoveStart = VPC_ThisStart + VL_MoveStart ; VPC_MoveStart = VPC_ThisStart + VL_MoveStart ;
VPC_DestStart = VPC_ThisStart + VL_DestStart ; VPC_DestStart = VPC_ThisStart + VL_DestStart ;
::memmove /*::::::::::::::::::::::::::::::::::::::*/ ::memmove /*:::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
( (
VPC_DestStart, VPC_MoveStart, VL_MemMoveSize VPC_DestStart, VPC_MoveStart, VL_MemMoveSize*sizeof(TypeChar)
); );
/*::::::::::::::::::::::::::::::::::::::::::::::::*/ /*:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
}/* }/*
if(VL_MoveStart>VL_DestStart)*/ if(VL_MoveStart>VL_DestStart)*/
@ -420,23 +420,27 @@ namespace ZNsMain
VL_DestStart = VL_SearchedPos+ AL_Searched - VL_DestStart = VL_SearchedPos+ AL_Searched -
( AL_Searched-AL_Replace ) * i ; ( AL_Searched-AL_Replace ) * i ;
::memcpy(VPC_RepalcePos, APC_Replace, AL_Replace); ::memcpy /*:::::::::::::::::::::::::::::::::::::::::::::::::::*/
(
VPC_RepalcePos, APC_Replace, AL_Replace*sizeof(TypeChar)
);
/*::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
AR_CPosList.ItNext(VH_IterEasyID); AR_CPosList.ItNext(VH_IterEasyID);
}/* }/*
__for1(TypeLength, i, VL_PosListSize)*/ __for1(TypeLength, i, VL_PosListSize)*/
if(VL_DestStart<VL_MoveStart && VL_DestStart<VL_ThisSize) if(VL_ThisSize > VL_MoveStart)
{ {
::memmove /*::::::::::::::::::::::::::::::*/ ::memmove /*::::::::::::::::::::::::::::::::::::::::*/
( (
VPC_ThisStart + VL_DestStart, VPC_ThisStart + VL_DestStart,
VPC_ThisStart + VL_MoveStart, VPC_ThisStart + VL_MoveStart,
VL_MoveStart - VL_DestStart (VL_ThisSize - VL_MoveStart)*sizeof(TypeChar)
); );
/*::::::::::::::::::::::::::::::::::::::::*/ /*::::::::::::::::::::::::::::::::::::::::::::::::::*/
}/* }/*
if(VL_DestStart<VL_MoveStart && VL_DestStart<VL_ThisSize)*/ if(VL_ThisSize > VL_MoveStart)*/
this->resize(VL_NeedSize); return *this; this->resize(VL_NeedSize); return *this;
}/* }/*
@ -467,11 +471,11 @@ namespace ZNsMain
VL_MemCopySize = VL_MemCopySize =
VL_SearchedPos - VL_SearchedPre ; VL_SearchedPos - VL_SearchedPre ;
::memcpy /*:::::::::::::::::::::::::::::::::::::::*/ ::memcpy /*::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
( (
VPC_DestStart, VPC_CopyStart, VL_MemCopySize VPC_DestStart, VPC_CopyStart, VL_MemCopySize*sizeof(TypeChar)
); );
/*::::::::::::::::::::::::::::::::::::::::::::::::*/ /*:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
}/* }/*
if(VL_SearchedPos>VL_SearchedPre)*/ if(VL_SearchedPos>VL_SearchedPre)*/
@ -480,7 +484,11 @@ namespace ZNsMain
( AL_Replace-AL_Searched ) * (i-1) ; ( AL_Replace-AL_Searched ) * (i-1) ;
VPC_RepalcePos = VPC_OutStart + VL_DestStart ; VPC_RepalcePos = VPC_OutStart + VL_DestStart ;
::memcpy(VPC_RepalcePos, APC_Replace, AL_Replace) ; ::memcpy /*:::::::::::::::::::::::::::::::::::::::::::::::::::*/
(
VPC_RepalcePos, APC_Replace, AL_Replace*sizeof(TypeChar)
) ;
/*::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
AR_CPosList.ItNext(VH_IterEasyID); AR_CPosList.ItNext(VH_IterEasyID);
}/* }/*
@ -494,11 +502,11 @@ namespace ZNsMain
VPC_CopyStart = VPC_ThisStart+ VL_SearchedPre; VPC_CopyStart = VPC_ThisStart+ VL_SearchedPre;
VL_MemCopySize = VL_ThisSize - VL_SearchedPre; VL_MemCopySize = VL_ThisSize - VL_SearchedPre;
::memcpy /*:::::::::::::::::::::::::::::::::::::::*/ ::memcpy /*::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
( (
VPC_DestStart, VPC_CopyStart, VL_MemCopySize VPC_DestStart, VPC_CopyStart, VL_MemCopySize*sizeof(TypeChar)
); );
/*::::::::::::::::::::::::::::::::::::::::::::::::*/ /*:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
}/* }/*
if(VL_SearchedPre<VL_ThisSize)*/ if(VL_SearchedPre<VL_ThisSize)*/