From ea01f2d0bfeb5bfdd5af94d69993e18a41b4a8d4 Mon Sep 17 00:00:00 2001 From: sauron Date: Sat, 23 Aug 2025 22:12:29 +0900 Subject: [PATCH] commit 2025-08-23 22:12 edit a bit ZCppMain/ZtCObjList.H --- ZCppMain/ZtCLoadXml.H | 20 ++++----- ZCppMain/ZtCObjList.H | 120 ++++++++++++++++++-------------------------------- 2 files changed, 51 insertions(+), 89 deletions(-) diff --git a/ZCppMain/ZtCLoadXml.H b/ZCppMain/ZtCLoadXml.H index 2ce064c..145b064 100644 --- a/ZCppMain/ZtCLoadXml.H +++ b/ZCppMain/ZtCLoadXml.H @@ -158,7 +158,7 @@ namespace ZNsMain } /*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); + mo_CAttriList.ItNext(RR(VI_IterEasyID)); }/* __for1(ZTypIntL, i, VL_ListSize)*/ @@ -179,7 +179,7 @@ namespace ZNsMain } /*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); + mo_CAttriList.ItNext(RR(VI_IterEasyID)); }/* __for1(ZTypIntL, i, VL_ListSize)*/ @@ -208,7 +208,7 @@ namespace ZNsMain if(CB_IsTrue) return &mo_CAttriList.ItD(VI_IterEasyID).GetValue(); - mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); + mo_CAttriList.ItNext(RR(VI_IterEasyID)); }/* __for1(ZTypIntL, i, VL_ListSize)*/ @@ -237,7 +237,7 @@ namespace ZNsMain #undef _COMPARE_ARG_ - mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); + mo_CAttriList.ItNext(RR(VI_IterEasyID)); }/* __for1(ZTypIntL, i, VL_ListSize)*/ @@ -487,9 +487,7 @@ namespace ZNsMain ZCStringData GetElementValueByID(const ZCStringData& AR_CStringID) const { ZCStringData VO_SaveCStr; GetElementValueByID(AR_CStringID, RR(VO_SaveCStr)); return VO_SaveCStr; - }/* - ZCStringData GetElementValueByID(const ZCStringData& AR_CStringID) const*/ - + } ZCStringData GetElementValueByID(const TypeChar* AP_CharID ) const { ZCStringData VO_SaveCStr; GetElementValueByID(AP_CharID , RR(VO_SaveCStr)); return VO_SaveCStr; @@ -674,7 +672,7 @@ namespace ZNsMain VP_AttriName<<"(\""<GetNextPtr(); - }/* - void MoveNextIter(ZCLink*& APR_CLink) const*/ - - void MoveNextIter(iterator& ARR_CIterator) + } + void MoveNextIter(iterator& ARR_CIterator ) { ++ARR_CIterator; - }/* - void MoveNextIter(iterator& ARR_CIterator)*/ - - void MoveNextIter(IterEasyID& ARRI_IterEasyID) const + } + void MoveNextIter(IterEasyID& ARRI_IterEasyID) const { MoveNextIter((ZCLink*&)(ARRI_IterEasyID)); - }/* - void MoveNextIter(IterEasyID& ARRI_IterEasyID) const*/ - - void MoveNextIter(const ZCLink*& APR_CLink) const + } + void MoveNextIter(const ZCLink*& APR_CLink ) const { APR_CLink=APR_CLink->GetNextPtr(); - }/* - void MoveNextIter(const ZCLink*& APR_CLink) const*/ - - void MoveNextIter(const iterator& ARR_CIterator) const + } + void MoveNextIter(const iterator& ARR_CIterator ) const { ++ARR_CIterator; - }/* - void MoveNextIter(const iterator& ARR_CIterator) const*/ - - void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const + } + void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const { MoveNextIter((const ZCLink*&)(ARRI_IterEasyID)); }/* - void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const*/ + void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const*/ - void MovePrevIter(ZCLink*& APR_CLink) + void MovePrevIter(ZCLink*& APR_CLink ) const { APR_CLink=APR_CLink->GetPrevPtr(); - }/* - void MovePrevIter(ZCLink*& APR_CLink)*/ - - void MovePrevIter(iterator& ARR_CIterator) + } + void MovePrevIter(iterator& ARR_CIterator ) { --ARR_CIterator; - }/* - void MovePrevIter(iterator& ARR_CIterator)*/ - - void MovePrevIter(IterEasyID& ARRI_IterEasyID) + } + void MovePrevIter(IterEasyID& ARRI_IterEasyID) const { MovePrevIter((ZCLink*&)(ARRI_IterEasyID)); - }/* - void MovePrevIter(IterEasyID& ARRI_IterEasyID)*/ - - void MovePrevIter(const ZCLink*& APR_CLink) const + } + void MovePrevIter(const ZCLink*& APR_CLink ) const { APR_CLink=APR_CLink->GetPrevPtr(); - }/* - void MovePrevIter(const ZCLink*& APR_CLink) const*/ - - void MovePrevIter(const iterator& ARR_CIterator) const + } + void MovePrevIter(const iterator& ARR_CIterator ) const { --ARR_CIterator; - }/* - void MovePrevIter(const iterator& ARR_CIterator) const*/ - - void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const + } + void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const { MovePrevIter((const ZCLink*&)(ARRI_IterEasyID)); }/* - void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const*/ + void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const*/ - Type& GetDataInIter(ZCLink* AP_CLink) - { - return **AP_CLink; - }/* - Type& GetDataInIter(ZCLink* AP_CLink)*/ - - Type& GetDataInIter(iterator& ARR_CIterator) - { - return *ARR_CIterator; - }/* - Type& GetDataInIter(iterator& ARR_CIterator)*/ - - Type& GetDataInIter(IterEasyID ARRI_IterEasyID) - { - return GetDataInIter((ZCLink*)ARRI_IterEasyID); - }/* - Type& GetDataInIter(IterEasyID ARRI_IterEasyID)*/ - + Type& GetDataInIter(ZCLink* AP_CLink ){return **AP_CLink ;} + Type& GetDataInIter(iterator& ARR_CIterator ){return *ARR_CIterator;} + Type& GetDataInIter(IterEasyID ARRI_IterEasyID) + { return GetDataInIter((ZCLink*)ARRI_IterEasyID); } Type& GetDataInIter(ZCLink* AP_CLink, TypeSize AI_FarNum) { @@ -2126,23 +2092,21 @@ namespace ZNsMain const IterEasyID ItHID () const{return GetHeadIterEasyID ();} const IterEasyID ItTID () const{return GetTailIterEasyID ();} - void ItNext(IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_NextLink;} - void ItNext(iterator& ARR_CIterator) const{++ARR_CIterator;} - void ItNext(IterEasyID& AI_IterEasyID) const - { ItNext((IterEasy&)AI_IterEasyID); } - void ItNext(const IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_NextLink;} - void ItNext(const iterator& ARR_CIterator) const{++ARR_CIterator;} - void ItNext(const IterEasyID& AI_IterEasyID) - const{ ItNext((const IterEasy&)AI_IterEasyID); } + void ItNext(ZCLink*& APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} + void ItNext(iterator& ARR_CIterator ) {++ARR_CIterator;} + void ItNext(IterEasyID& ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));} + void ItNext(const ZCLink*& APR_CLink ) const {APR_CLink=APR_CLink->GetNextPtr() ;} + void ItNext(const iterator& ARR_CIterator ) const{++ARR_CIterator;} + void ItNext(IterEasyIDc& ARRI_IterEasyID) const + { ItNext((const ZCLink*&)(ARRI_IterEasyID)); } - void ItPrev(IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_PrevLink;} - void ItPrev(iterator& ARR_CIterator) const{--ARR_CIterator;} - void ItPrev(IterEasyID& AI_IterEasyID) const - { ItPrev((IterEasy&)AI_IterEasyID); } - void ItPrev(const IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_PrevLink;} - void ItPrev(const iterator& ARR_CIterator) const{--ARR_CIterator;} - void ItPrev(const IterEasyID& AI_IterEasyID) - const{ ItPrev((const Type*&)AI_IterEasyID); } + void ItPrev(ZCLink*& APR_CLink ) const{APR_CLink=APR_CLink->GetPrevPtr() ;} + void ItPrev(iterator& ARR_CIterator ){--ARR_CIterator;} + void ItPrev(IterEasyID& ARRI_IterEasyID) const{ItPrev((ZCLink*&)(ARRI_IterEasyID));} + void ItPrev(const ZCLink*& APR_CLink ) const{APR_CLink=APR_CLink->GetPrevPtr() ;} + void ItPrev(const iterator& ARR_CIterator ) const{--ARR_CIterator;} + void ItPrev(IterEasyIDc& ARRI_IterEasyID) const + { ItPrev((const ZCLink*&)(ARRI_IterEasyID)); } Type& ItD(IterEasy AP_CLink ){return GetDataInIter(AP_CLink );} Type& ItD(iterator& ARR_CIterator ){return GetDataInIter(ARR_CIterator );}