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

commit 2025-08-23 22:12 edit a bit ZCppMain/ZtCObjList.H

Browse Source
This commit is contained in:
sauron
2025-08-23 22:12:29 +09:00
parent afba553b08
commit ea01f2d0bf
2 changed files with 51 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ZCppMain/ZtCLoadXml.H
View File

@ -158,7 +158,7 @@ namespace ZNsMain
} }
/*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ /*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); mo_CAttriList.ItNext(RR(VI_IterEasyID));
}/* }/*
__for1(ZTypIntL, i, VL_ListSize)*/ __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)*/ __for1(ZTypIntL, i, VL_ListSize)*/
@ -208,7 +208,7 @@ namespace ZNsMain
if(CB_IsTrue) return if(CB_IsTrue) return
&mo_CAttriList.ItD(VI_IterEasyID).GetValue(); &mo_CAttriList.ItD(VI_IterEasyID).GetValue();
mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); mo_CAttriList.ItNext(RR(VI_IterEasyID));
}/* }/*
__for1(ZTypIntL, i, VL_ListSize)*/ __for1(ZTypIntL, i, VL_ListSize)*/
@ -237,7 +237,7 @@ namespace ZNsMain
#undef _COMPARE_ARG_ #undef _COMPARE_ARG_
mo_CAttriList.MoveNextIter(RR(VI_IterEasyID)); mo_CAttriList.ItNext(RR(VI_IterEasyID));
}/* }/*
__for1(ZTypIntL, i, VL_ListSize)*/ __for1(ZTypIntL, i, VL_ListSize)*/
@ -487,9 +487,7 @@ namespace ZNsMain
ZCStringData GetElementValueByID(const ZCStringData& AR_CStringID) const ZCStringData GetElementValueByID(const ZCStringData& AR_CStringID) const
{ {
ZCStringData VO_SaveCStr; GetElementValueByID(AR_CStringID, RR(VO_SaveCStr)); return VO_SaveCStr; 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 GetElementValueByID(const TypeChar* AP_CharID ) const
{ {
ZCStringData VO_SaveCStr; GetElementValueByID(AP_CharID , RR(VO_SaveCStr)); return VO_SaveCStr; ZCStringData VO_SaveCStr; GetElementValueByID(AP_CharID , RR(VO_SaveCStr)); return VO_SaveCStr;
@ -674,7 +672,7 @@ namespace ZNsMain
VP_AttriName<<"(\""<<VP_AttriValue<<"\")"<<endl; VP_AttriName<<"(\""<<VP_AttriValue<<"\")"<<endl;
AR_CElement.GetCAttriList(). AR_CElement.GetCAttriList().
MoveNextIter( RR(VP_AttriIterEasyID) ); ItNext( RR(VP_AttriIterEasyID) );
}/* }/*
for(int i=1; i<=VI_AttriListSize; ++i)*/ for(int i=1; i<=VI_AttriListSize; ++i)*/
}/* }/*
@ -720,7 +718,7 @@ namespace ZNsMain
VP_AttriName<<"(\""<<VP_AttriValue<<"\")"<<endl; VP_AttriName<<"(\""<<VP_AttriValue<<"\")"<<endl;
AR_CElement.GetCAttriList(). AR_CElement.GetCAttriList().
MoveNextIter( RR(VP_AttriIterEasyID) ); ItNext( RR(VP_AttriIterEasyID) );
}/* }/*
for(int i=1; i<=VI_AttriListSize; ++i)*/ for(int i=1; i<=VI_AttriListSize; ++i)*/
@ -781,7 +779,7 @@ namespace ZNsMain
(TypeChar('"')) (VO_CStringTemp) (TypeChar('"')) (VO_CStringTemp)
(TypeChar('"')) (TypeChar(' ') ); (TypeChar('"')) (TypeChar(' ') );
AR_CElement.GetCAttriList().MoveNextIter(RR(VP_AttriIterEasyID)); AR_CElement.GetCAttriList().ItNext(RR(VP_AttriIterEasyID));
}/* }/*
for(int i=1; i<=VI_AttriListSize; ++i)*/ for(int i=1; i<=VI_AttriListSize; ++i)*/
@ -830,7 +828,7 @@ namespace ZNsMain
(TypeChar('"')) (TypeChar(' ') ); (TypeChar('"')) (TypeChar(' ') );
AR_CElement.GetCAttriList(). AR_CElement.GetCAttriList().
MoveNextIter( RR(VP_AttriIterEasyID) ); ItNext( RR(VP_AttriIterEasyID) );
}/* }/*
for(int i=1; i<=VI_AttriListSize; ++i)*/ for(int i=1; i<=VI_AttriListSize; ++i)*/

90
ZCppMain/ZtCObjList.H
View File

@ -1964,33 +1964,23 @@ namespace ZNsMain
void MoveNextIter(ZCLink*& APR_CLink ) const void MoveNextIter(ZCLink*& APR_CLink ) const
{ {
APR_CLink=APR_CLink->GetNextPtr(); APR_CLink=APR_CLink->GetNextPtr();
}/* }
void MoveNextIter(ZCLink*& APR_CLink) const*/
void MoveNextIter(iterator& ARR_CIterator ) void MoveNextIter(iterator& ARR_CIterator )
{ {
++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)); 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(); 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; ++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)); MoveNextIter((const ZCLink*&)(ARRI_IterEasyID));
@ -1998,36 +1988,26 @@ namespace ZNsMain
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(); APR_CLink=APR_CLink->GetPrevPtr();
}/* }
void MovePrevIter(ZCLink*& APR_CLink)*/
void MovePrevIter(iterator& ARR_CIterator ) void MovePrevIter(iterator& ARR_CIterator )
{ {
--ARR_CIterator; --ARR_CIterator;
}/* }
void MovePrevIter(iterator& ARR_CIterator)*/ void MovePrevIter(IterEasyID& ARRI_IterEasyID) const
void MovePrevIter(IterEasyID& ARRI_IterEasyID)
{ {
MovePrevIter((ZCLink*&)(ARRI_IterEasyID)); 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(); 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; --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)); MovePrevIter((const ZCLink*&)(ARRI_IterEasyID));
@ -2035,24 +2015,10 @@ namespace ZNsMain
void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const*/ void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const*/
Type& GetDataInIter(ZCLink* AP_CLink) Type& GetDataInIter(ZCLink* AP_CLink ){return **AP_CLink ;}
{ Type& GetDataInIter(iterator& ARR_CIterator ){return *ARR_CIterator;}
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) Type& GetDataInIter(IterEasyID ARRI_IterEasyID)
{ { return GetDataInIter((ZCLink*)ARRI_IterEasyID); }
return GetDataInIter((ZCLink*)ARRI_IterEasyID);
}/*
Type& GetDataInIter(IterEasyID ARRI_IterEasyID)*/
Type& GetDataInIter(ZCLink* AP_CLink, TypeSize AI_FarNum) Type& GetDataInIter(ZCLink* AP_CLink, TypeSize AI_FarNum)
{ {
@ -2126,23 +2092,21 @@ namespace ZNsMain
const IterEasyID ItHID () const{return GetHeadIterEasyID ();} const IterEasyID ItHID () const{return GetHeadIterEasyID ();}
const IterEasyID ItTID () const{return GetTailIterEasyID ();} const IterEasyID ItTID () const{return GetTailIterEasyID ();}
void ItNext(IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_NextLink;} void ItNext(ZCLink*& APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;}
void ItNext(iterator& ARR_CIterator) const{++ARR_CIterator;} void ItNext(iterator& ARR_CIterator ) {++ARR_CIterator;}
void ItNext(IterEasyID& AI_IterEasyID) const void ItNext(IterEasyID& ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));}
{ ItNext((IterEasy&)AI_IterEasyID); } void ItNext(const ZCLink*& APR_CLink ) const {APR_CLink=APR_CLink->GetNextPtr() ;}
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 iterator& ARR_CIterator ) const{++ARR_CIterator;}
void ItNext(const IterEasyID& AI_IterEasyID) void ItNext(IterEasyIDc& ARRI_IterEasyID) const
const{ ItNext((const IterEasy&)AI_IterEasyID); } { ItNext((const ZCLink*&)(ARRI_IterEasyID)); }
void ItPrev(IterEasy& ARR_IterEasy ) const{ARR_IterEasy=ARR_IterEasy->mp_PrevLink;} void ItPrev(ZCLink*& APR_CLink ) const{APR_CLink=APR_CLink->GetPrevPtr() ;}
void ItPrev(iterator& ARR_CIterator) const{--ARR_CIterator;} void ItPrev(iterator& ARR_CIterator ){--ARR_CIterator;}
void ItPrev(IterEasyID& AI_IterEasyID) const void ItPrev(IterEasyID& ARRI_IterEasyID) const{ItPrev((ZCLink*&)(ARRI_IterEasyID));}
{ ItPrev((IterEasy&)AI_IterEasyID); } void ItPrev(const ZCLink*& APR_CLink ) const{APR_CLink=APR_CLink->GetPrevPtr() ;}
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 iterator& ARR_CIterator ) const{--ARR_CIterator;}
void ItPrev(const IterEasyID& AI_IterEasyID) void ItPrev(IterEasyIDc& ARRI_IterEasyID) const
const{ ItPrev((const Type*&)AI_IterEasyID); } { ItPrev((const ZCLink*&)(ARRI_IterEasyID)); }
Type& ItD(IterEasy AP_CLink ){return GetDataInIter(AP_CLink );} Type& ItD(IterEasy AP_CLink ){return GetDataInIter(AP_CLink );}
Type& ItD(iterator& ARR_CIterator ){return GetDataInIter(ARR_CIterator );} Type& ItD(iterator& ARR_CIterator ){return GetDataInIter(ARR_CIterator );}