From d812f6c40e44c6eba58b1d03cf94c49663f0eba9 Mon Sep 17 00:00:00 2001 From: sauron Date: Sat, 20 Sep 2025 08:29:43 +0900 Subject: [PATCH] commit 2025-09-20 08:29 mv ZtCList to ZtCBaseList in ZCppMain/ZMainHead.H --- ZCppMain/ZCStringStd.H | 8 +-- ZCppMain/ZMainHead.H | 58 +++++++++++----------- ZCppMain/ZtCStringEx.H | 12 ++--- .../{ZtCList_000.cpp => ZtCBaseList_000.cpp} | 30 +++++------ 4 files changed, 54 insertions(+), 54 deletions(-) rename ZCppMainTest/{ZtCList_000.cpp => ZtCBaseList_000.cpp} (88%) diff --git a/ZCppMain/ZCStringStd.H b/ZCppMain/ZCStringStd.H index ee2faa5..5907b17 100644 --- a/ZCppMain/ZCStringStd.H +++ b/ZCppMain/ZCStringStd.H @@ -55,7 +55,7 @@ namespace ZNsMain ) /*########################################################*/ { - // TPosList : ZNsMain::ZtCList etc + // TPosList : ZNsMain::ZtCBaseList etc if(0 > AL_Offset) AL_Offset=0 ; if(this->size() <= AL_Offset) return ; @@ -100,7 +100,7 @@ namespace ZNsMain ) /*##########################################################*/ { - // TPosList : ZNsMain::ZtCList etc + // TPosList : ZNsMain::ZtCBaseList etc // AL_Replace : APC_Replace 의 길이 // AL_Searched : 이전에 찾은 길이 // ARR_SaveOut : AL_Replace>AL_Searched 인 경우에 여기에 저장한다. @@ -245,11 +245,11 @@ namespace ZNsMain if(this->size() <= AL_Offset) return *this; if(this->size() < 1 ) return *this; - ZtCList VO_CPosCList; FindPosToList + ZtCBaseList VO_CPosCList; FindPosToList ( RR(VO_CPosCList), APC_Search, AL_Search, AL_Offset ); - /*////////////////////////////////////////////*/ + /*////////////////////////////////////////////////*/ return ReplaceByPosList /*::::::::::::::::::::::::::::*/ ( diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index ecae701..30a3201 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -4995,7 +4995,7 @@ namespace ZNsMain - // class ZtCList : simple circular double linked list + // class ZtCBaseList : circular double linked list template /////////////////////////////////////////////// < @@ -5006,7 +5006,7 @@ namespace ZNsMain typename TMoveObj = ZNsMain:: ZtCMoveObj > - class ZtCList /*######################################*/ + class ZtCBaseList /*##################################*/ { public: class ZCLink; @@ -5023,8 +5023,8 @@ namespace ZNsMain class ZCLink : public TypeAlloc { - public: - friend class ZtCList; + public : + friend class ZtCBaseList; private: TypeData mo_Data ; ZCLink* mp_NextLink ; @@ -5166,15 +5166,15 @@ namespace ZNsMain private :*/ public : - ZtCList() + ZtCBaseList() { mp_HeadLink = 0 ; mp_TailLink = 0 ; ml_LinkCnt = 0 ; }/* - ZtCList()*/ + ZtCBaseList()*/ - ZtCList(const ZtCList& rhs) + ZtCBaseList(const ZtCBaseList& rhs) { mp_HeadLink = 0 ; mp_TailLink = 0 ; @@ -5182,35 +5182,30 @@ namespace ZNsMain *this = (rhs); }/* - ZtCList(const ZtCList& rhs)*/ + ZtCBaseList(const ZtCBaseList& rhs)*/ - ~ZtCList() + ~ZtCBaseList() { DeleteAll(); }/* - ~ZtCList()*/ + ~ZtCBaseList()*/ - ZtCList& operator=(const ZtCList& rhs) + ZtCBaseList& operator=(const ZtCBaseList& rhs) { - if(this==&rhs) return *this; + if(this==&rhs) return *this; this->DeleteAll(); + ZCLink* VP_NowLink = rhs.mp_HeadLink ; - this->DeleteAll(); + __for0(TypeSize, i, rhs.size()) { - ZCLink* VP_NowLink = rhs.mp_HeadLink ; + this->AddHead(VP_NowLink->mo_Data) ; - __for0(TypeSize, i, rhs.size()) - { - this->AddHead(VP_NowLink->mo_Data) ; - - VP_NowLink = VP_NowLink->mp_NextLink; - }/* - __for0(TypeSize, i, rhs.size())*/ - } - rhs. DeleteAll(); + VP_NowLink = VP_NowLink->mp_NextLink; + }/* + __for0(TypeSize, i, rhs.size())*/ }/* - ZtCList& operator=(const ZtCList& rhs)*/ + ZtCBaseList& operator=(const ZtCBaseList& rhs)*/ void DeleteAll() @@ -5551,7 +5546,7 @@ namespace ZNsMain typename TMoveObj = ZNsMain:: ZtCMoveObj > - class ZtCList /*######################################*/ + class ZtCBaseList /*##################################*/ @@ -5663,12 +5658,17 @@ namespace ZNsMain TypeCharC* VP_Right=rhs.mp_TypeChar; #if(_CODE_OLD_) - TypeChar VC_Minus=0; + TypeChar VC_Minus = 0; #else - int VI_Minus=0; // 페이지 하단의 'char 의 int 확장에 따른 문제의 코드' 참고. + int VI_Minus = 0; // 페이지 하단의 'char 의 int 확장에 따른 문제의 코드' 참고. #endif - TypeLength VL_Index=0; - TypeLength VL_Loop =(ml_TypeLength<=rhs.ml_TypeLength ? ml_TypeLength : rhs.ml_TypeLength) ; + TypeLength VL_Index = 0; + TypeLength VL_Loop = /*::::::::::::::::::::::::::*/ + ( ml_TypeLength <= rhs.ml_TypeLength ? + this->ml_TypeLength : + rhs. ml_TypeLength + ) ; + /*::::::::::::::::::::::::::::::::::::::::::::::::*/ while(VL_Index class ZtCHelpBase { public: - typedef ZNsMain::ZtCList< ///////////////////// + typedef ZNsMain::ZtCBaseList< ///////////////// TDeriveString , const TDeriveString&, TAlloc @@ -204,7 +204,7 @@ namespace ZNsMain class ZCSearchInfo*/ - typedef ZNsMain::ZtCList //////////////////////// + typedef ZNsMain::ZtCBaseList //////////////////// < ZCSearchInfo, const ZCSearchInfo&, TAlloc > @@ -321,7 +321,7 @@ namespace ZNsMain ) /*########################################################*/ { - // TPosList : ZNsMain::ZtCList etc + // TPosList : ZNsMain::ZtCBaseList etc if(0 > AL_Offset) AL_Offset=0 ; if(this->size() <= AL_Offset) return ; @@ -457,7 +457,7 @@ namespace ZNsMain ) /*#######################################################################*/ { - // TPosList : ZNsMain::ZtCList etc + // TPosList : ZNsMain::ZtCBaseList etc // AL_Replace : APC_Replace 의 길이 // AL_Searched : 이전에 찾은 길이 @@ -1833,11 +1833,11 @@ namespace ZNsMain if(this->size() <= AL_Offset) return *this; if(this->size() < 1 ) return *this; - ZtCList VO_CPosCList; FindPosToList + ZtCBaseList VO_CPosCList; FindPosToList ( RR(VO_CPosCList), APC_Search, AL_Search, AL_Offset ); - /*////////////////////////////////////////////*/ + /*////////////////////////////////////////////////*/ return ReplaceByPosList /*::::::::::::::::::::::::::::*/ ( diff --git a/ZCppMainTest/ZtCList_000.cpp b/ZCppMainTest/ZtCBaseList_000.cpp similarity index 88% rename from ZCppMainTest/ZtCList_000.cpp rename to ZCppMainTest/ZtCBaseList_000.cpp index 79f69cc..53b1d33 100644 --- a/ZCppMainTest/ZtCList_000.cpp +++ b/ZCppMainTest/ZtCBaseList_000.cpp @@ -75,13 +75,13 @@ namespace ZNsMain /* 아래 자료형에 대해, CStringBase::Fetch() 호출 여부 실험. - ZtCList - ZtCList + ZtCBaseList + ZtCBaseList */ - typedef ZtCList + typedef ZtCBaseList CStringList1 ; - typedef ZtCList + typedef ZtCBaseList CStringList2 ; @@ -130,7 +130,7 @@ namespace ZNsMain /*///////////////////////////////////*/ - typedef ZtCList CIntList; + typedef ZtCBaseList CIntList; CHelpObj VO_CHelpObj; CIntList VO_CIntList; @@ -178,16 +178,16 @@ int main(int AI_ArgCnt, char* APP_ArgVal[])*/ ■ cygwin 컴파일 - // g++ -mno-cygwin -o ZtCList_000.exe ZtCList_000.cpp -I../../my_CPP/CPP_Main/ -I../../my_CPP/CPP_Std/ -D__CYGWIN32__ -D__VISUAL_CPP_VER__=200300 - // g++ -mno-cygwin -o ZtCList_000_D.exe ZtCList_000.cpp -I../../my_CPP/CPP_Main/ -I../../my_CPP/CPP_Std/ -D__CYGWIN32__ -D__VISUAL_CPP_VER__=200300 -D_DEBUG + // g++ -mno-cygwin -o ZtCBaseList_000.exe ZtCBaseList_000.cpp -I../../my_CPP/CPP_Main/ -I../../my_CPP/CPP_Std/ -D__CYGWIN32__ -D__VISUAL_CPP_VER__=200300 + // g++ -mno-cygwin -o ZtCBaseList_000_D.exe ZtCBaseList_000.cpp -I../../my_CPP/CPP_Main/ -I../../my_CPP/CPP_Std/ -D__CYGWIN32__ -D__VISUAL_CPP_VER__=200300 -D_DEBUG ■ mingw 컴파일 - g++.exe -o ZtCList_000_mw.exe ZtCList_000.cpp -I../ -lWs2_32 - g++.exe -o ZtCList_000_mw_D.exe ZtCList_000.cpp -I../ -lWs2_32 -D_DEBUG + g++.exe -o ZtCBaseList_000_mw.exe ZtCBaseList_000.cpp -I../ -lWs2_32 + g++.exe -o ZtCBaseList_000_mw_D.exe ZtCBaseList_000.cpp -I../ -lWs2_32 -D_DEBUG - ./ZtCList_000_mw.exe - ./ZtCList_000_mw_D.exe + ./ZtCBaseList_000_mw.exe + ./ZtCBaseList_000_mw_D.exe Administrator@q381-2673 UCRT64 /e/my_CPP/ZCpp/ZCppMainTest @@ -204,8 +204,8 @@ int main(int AI_ArgCnt, char* APP_ArgVal[])*/ ■ Linux 컴파일 - g++ -std=c++98 -o ZtCList_000.exe ZtCList_000.cpp -I../ - g++ -std=c++98 -o ZtCList_000_D.exe ZtCList_000.cpp -I../ -D_DEBUG + g++ -std=c++98 -o ZtCBaseList_000.exe ZtCBaseList_000.cpp -I../ + g++ -std=c++98 -o ZtCBaseList_000_D.exe ZtCBaseList_000.cpp -I../ -D_DEBUG sauron@q381-2673:/mnt/e/my_CPP/ZCpp/ZCppMainTest$ gcc --version gcc (Ubuntu 9.4.0-1ubuntu1~20.04.2) 9.4.0 @@ -242,7 +242,7 @@ int main(int AI_ArgCnt, char* APP_ArgVal[])*/ ■ 실행 - ./ZtCList_000.exe - ./ZtCList_000_D.exe + ./ZtCBaseList_000.exe + ./ZtCBaseList_000_D.exe ////////////////////////////////////////////////////////////////////////////////////////*/