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

commit 2025-10-15 06:46 edit a bit ZCppMain/ZMainHead.H

Browse Source
This commit is contained in:
sauron
2025-10-15 06:47:03 +09:00
parent ef441cca37
commit 6a873ea2c9
4 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ZCppMain/ZMainHead.H
View File

@ -8626,31 +8626,31 @@ namespace ZNsMain
TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;}
TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID ) TypeData & GetDataInIter(IterEasyID AH_IterEasyID )
{ return GetDataInIter((ZCLink*)ARRI_IterEasyID ) ;} { return GetDataInIter((TypeLink* )AH_IterEasyID);}
TypeData & GetDataInIter(iterator & ARR_Iterator ){return *ARR_Iterator;} TypeData & GetDataInIter(iterator & ARR_Iterator ){return *ARR_Iterator;}
TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const
{ return **AP_CLink ;} { return **AP_CLink ;}
TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID ) const TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const
{ return GetDataInIter((TypeLinkC*)ARRI_IterEasyID) ;} { return GetDataInIter((TypeLinkC*)AH_IterEasyID);}
TypeDataC& GetDataInIter(iteratorN & ARR_Iterator ) TypeDataC& GetDataInIter(iteratorN & ARR_Iterator )
{ return *ARR_Iterator ;} { return *ARR_Iterator ;}
TypeData & GetDataInIter( TypeLink * AP_CLink , TypeSize AI_FarNum) TypeData & GetDataInIter( TypeLink * AP_CLink , TypeSize AI_FarNum)
{return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; }
TypeData & GetDataInIter( IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) TypeData & GetDataInIter( IterEasyID AH_IterEasyID, TypeSize AI_FarNum)
{ return GetDataInIter((ZCLink*)ARRI_IterEasyID , AI_FarNum); } { return GetDataInIter((ZCLink*)AH_IterEasyID , AI_FarNum); }
TypeData & GetDataInIter( iterator & ARR_Iterator , TypeSize AI_FarNum) TypeData & GetDataInIter( iterator & ARR_Iterator , TypeSize AI_FarNum)
{ return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); } { return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); }
TypeDataC& GetDataInIter( TypeLinkC * AP_CLink , TypeSize AI_FarNum) const TypeDataC& GetDataInIter( TypeLinkC * AP_CLink , TypeSize AI_FarNum) const
{return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; }
TypeDataC& GetDataInIter( IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const TypeDataC& GetDataInIter( IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const
{ return GetDataInIter((ZCLinkC*)ARRI_IterEasyID , AI_FarNum); } { return GetDataInIter((ZCLinkC*)AH_IterEasyID , AI_FarNum); }
TypeDataC& GetDataInIter( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const TypeDataC& GetDataInIter( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const
{ return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); }
iterator begin () { return ZCNodePoint (*this); } iterator begin () { return ZCNodePoint (*this); }
@ -8667,13 +8667,13 @@ namespace ZNsMain
IterEasyID ItHID () {return GetHeadIterEasyID ();} IterEasyID ItHID () {return GetHeadIterEasyID ();}
IterEasyID ItTID () {return GetTailIterEasyID ();} IterEasyID ItTID () {return GetTailIterEasyID ();}
IterEasyIDc ItHIDc () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTIDc () const{return GetTailIterEasyIDc();}
IterEasyC ItHEasy() const{return GetHeadIterEasy ();} IterEasyC ItHEasy() const{return GetHeadIterEasy ();}
IterEasyC ItTEasy() const{return GetTailIterEasy ();} IterEasyC ItTEasy() const{return GetTailIterEasy ();}
IterEasyIDc ItHID () const{return GetHeadIterEasyID ();} IterEasyIDc ItHID () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTID () const{return GetTailIterEasyID ();} IterEasyIDc ItTID () const{return GetTailIterEasyIDc();}
IterEasyIDc ItHIDc () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTIDc () const{return GetTailIterEasyIDc();}
void ItNext(ZCLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} void ItNext(ZCLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;}
void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));} void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));}

22
ZCppMain/ZtCArray.H
View File

@ -807,23 +807,23 @@ namespace ZNsMain
{ return GetDataInIter((TypeDataC*)ARRI_IterEasyID, AI_FarNum); } { return GetDataInIter((TypeDataC*)ARRI_IterEasyID, AI_FarNum); }
TypeData * ItHEasy() {return mp_TypeArr ;} TypeData * ItHEasy() {return mp_TypeArr ;}
TypeData * ItTEasy() {return mp_TypeArr+ml_UseSize-1 ;} TypeData * ItTEasy() {return mp_TypeArr+ml_UseSize-1 ;}
IterEasyID ItHID () {return (IterEasyID) mp_TypeArr ;} IterEasyID ItHID () {return (IterEasyID ) mp_TypeArr ;}
IterEasyID ItTID () {return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} IterEasyID ItTID () {return (IterEasyID )(mp_TypeArr+ml_UseSize-1);}
TypeDataC* ItHEasy() const{return mp_TypeArr ;} TypeDataC* ItHEasy() const{return mp_TypeArr ;}
TypeDataC* ItTEasy() const{return mp_TypeArr+ml_UseSize-1 ;} TypeDataC* ItTEasy() const{return mp_TypeArr+ml_UseSize-1 ;}
IterEasyIDc ItHID () const{return (IterEasyID) mp_TypeArr ;} IterEasyIDc ItHID () const{return (IterEasyIDc) mp_TypeArr ;}
IterEasyIDc ItTID () const{return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} IterEasyIDc ItTID () const{return (IterEasyIDc)(mp_TypeArr+ml_UseSize-1);}
IterEasyIDc ItHIDc () const{return (IterEasyID) mp_TypeArr ;} IterEasyIDc ItHIDc () const{return (IterEasyIDc) mp_TypeArr ;}
IterEasyIDc ItTIDc () const{return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} IterEasyIDc ItTIDc () const{return (IterEasyIDc)(mp_TypeArr+ml_UseSize-1);}
void ItNext(TypeData* & APR_CType ) const{++APR_CType ;} void ItNext(TypeData* & APR_CType ) const{++APR_CType ;}
void ItNext(iterator & ARR_CIterator) const{++ARR_CIterator;} void ItNext(iterator & ARR_CIterator) const{++ARR_CIterator;}
void ItNext(IterEasyID & AI_IterEasyID) const void ItNext(IterEasyID & AI_IterEasyID) const
{ ItNext((TypeData*&)AI_IterEasyID); } { ItNext((TypeData *&)AI_IterEasyID); }
void ItNext(TypeDataC* & APR_CType ) const{++APR_CType ;} void ItNext(TypeDataC* & APR_CType ) const{++APR_CType ;}
void ItNext(iteratorC & ARR_CIterator) const{++ARR_CIterator;} void ItNext(iteratorC & ARR_CIterator) const{++ARR_CIterator;}
void ItNext(IterEasyIDc& AI_IterEasyID) const void ItNext(IterEasyIDc& AI_IterEasyID) const

50
ZCppMain/ZtCObjList.H
View File

@ -3099,30 +3099,30 @@ namespace ZNsMain
void MovePrevIter(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} void MovePrevIter(iteratorN & ARR_Iterator ) const{--ARR_Iterator;}
TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;}
TypeData & GetDataInIter(iterator & AR_Iterator ){return *AR_Iterator;} TypeData & GetDataInIter(iterator & AR_Iterator ){return *AR_Iterator;}
TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID) TypeData & GetDataInIter(IterEasyID AH_IterEasyID)
{ return GetDataInIter((ZCLink*) ARRI_IterEasyID); } { return GetDataInIter((TypeLink *)AH_IterEasyID); }
TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{return **AP_CLink ;} TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{return **AP_CLink ;}
TypeDataC& GetDataInIter(iteratorN & AR_Iterator ) const{return *AR_Iterator;} TypeDataC& GetDataInIter(iteratorN & AR_Iterator ) const{return *AR_Iterator;}
TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID) const TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const
{ return GetDataInIter((TypeLinkC*)ARRI_IterEasyID); } { return GetDataInIter((TypeLinkC*)AH_IterEasyID); }
TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum) TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum)
{return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; }
TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) TypeData & GetDataInIter(IterEasyID AH_IterEasyID, TypeSize AI_FarNum)
{ return GetDataInIter((ZCLink*)ARRI_IterEasyID , AI_FarNum); } { return GetDataInIter((ZCLink*)AH_IterEasyID , AI_FarNum); }
TypeData & GetDataInIter(iterator & ARR_Iterator , TypeSize AI_FarNum) TypeData & GetDataInIter(iterator & ARR_Iterator , TypeSize AI_FarNum)
{ return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); } { return GetDataInIter((ZCLink* )ARR_Iterator , AI_FarNum); }
TypeDataC& GetDataInIter(TypeLinkC * AP_CLink , TypeSize AI_FarNum) const TypeDataC& GetDataInIter(TypeLinkC * AP_CLink , TypeSize AI_FarNum) const
{return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; }
TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const
{ return GetDataInIter((ZCLinkC*)ARRI_IterEasyID, AI_FarNum); } { return GetDataInIter((ZCLinkC*)AH_IterEasyID , AI_FarNum); }
TypeDataC& GetDataInIter(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const TypeDataC& GetDataInIter(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const
{ return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); }
iterator begin () { return ZCNodePoint (*this); } iterator begin () { return ZCNodePoint (*this); }
@ -3134,19 +3134,19 @@ namespace ZNsMain
iteratorN cend () const{ return ZCNodePointN::MakeTailPoint(*this); } iteratorN cend () const{ return ZCNodePointN::MakeTailPoint(*this); }
IterEasy ItHEasy() {return GetHeadIterEasy (); } IterEasy ItHEasy() {return GetHeadIterEasy (); }
IterEasy ItTEasy() {return GetTailIterEasy (); } IterEasy ItTEasy() {return GetTailIterEasy (); }
IterEasyID ItHID () {return GetHeadIterEasyID(); } IterEasyID ItHID () {return GetHeadIterEasyID (); }
IterEasyID ItTID () {return GetTailIterEasyID(); } IterEasyID ItTID () {return GetTailIterEasyID (); }
IterEasyIDc ItHIDc () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTIDc () const{return GetTailIterEasyIDc();}
IterEasyC ItHEasy() const{return GetHeadIterEasy ();} IterEasyC ItHEasy() const{return GetHeadIterEasy ();}
IterEasyC ItTEasy() const{return GetTailIterEasy ();} IterEasyC ItTEasy() const{return GetTailIterEasy ();}
IterEasyIDc ItHID () const{return GetHeadIterEasyIDc();} IterEasyIDc ItHID () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTID () const{return GetTailIterEasyIDc();} IterEasyIDc ItTID () const{return GetTailIterEasyIDc();}
IterEasyIDc ItHIDc () const{return GetHeadIterEasyIDc();}
IterEasyIDc ItTIDc () const{return GetTailIterEasyIDc();}
void ItNext(TypeLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} void ItNext(TypeLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;}
void ItNext(iterator & ARR_Iterator ) const{++ARR_Iterator;} void ItNext(iterator & ARR_Iterator ) const{++ARR_Iterator;}
void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));} void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));}

39
ZCppMain/ZtCSimList.H
View File

@ -2307,8 +2307,8 @@ namespace ZNsMain
///////////////////////////////////////////////////////////////////////////*/ ///////////////////////////////////////////////////////////////////////////*/
void MoveNextIter(ZCLink* & APR_CLink ){ APR_CLink=APR_CLink->GetNextPtr() ; } void MoveNextIter(ZCLink* & APR_CLink ) { APR_CLink=APR_CLink->GetNextPtr() ; }
void MoveNextIter(iterator & ARR_iterator ){ ++ARR_iterator ; } void MoveNextIter(iterator & ARR_iterator ) { ++ARR_iterator ; }
void MoveNextIter(IterEasyID & APPI_IterEasyID) void MoveNextIter(IterEasyID & APPI_IterEasyID)
{ MoveNextIter((ZCLink* &)APPI_IterEasyID); } { MoveNextIter((ZCLink* &)APPI_IterEasyID); }
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
@ -2318,27 +2318,28 @@ namespace ZNsMain
{ MoveNextIter((ZCLinkC*&)APPI_IterEasyID); } { MoveNextIter((ZCLinkC*&)APPI_IterEasyID); }
TypeData & GetDataInIter(ZCLink * AP_CLink ){ return **AP_CLink ; } TypeData & GetDataInIter(ZCLink * AP_CLink ) { return **AP_CLink ; }
TypeData & GetDataInIter(IterEasyID AH_IterEasyID ){ return GetDataInIter((ZCLink*)AH_IterEasyID) ; } TypeData & GetDataInIter(IterEasyID AH_IterEasyID ) { return GetDataInIter((ZCLink*)AH_IterEasyID) ; }
TypeData & GetDataInIter(iterator & ARR_iterator ){ return *ARR_iterator ; } TypeData & GetDataInIter(iterator & ARR_iterator ) { return *ARR_iterator ; }
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
TypeDataC& GetDataInIter(ZCLinkC * AP_CLink ) const{ return **AP_CLink ; } TypeDataC& GetDataInIter(ZCLinkC * AP_CLink ) const{ return **AP_CLink ; }
TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const{ return GetDataInIter((ZCLinkC*)AH_IterEasyID); } TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const{ return GetDataInIter((ZCLinkC*)AH_IterEasyID); }
TypeDataC& GetDataInIter(iteratorN & ARR_iterator ) const{ return *ARR_iterator ; } TypeDataC& GetDataInIter(iteratorN & ARR_iterator ) const{ return *ARR_iterator ; }
ZCLink * ItHEasy() {return mp_HeadLink;} ZCLink * ItHEasy() {return mp_HeadLink;}
IterEasyID ItHID () {return (IterEasyID)mp_HeadLink;} ZCLink * ItTEasy() {return mp_TailLink;}
IterEasyID ItHID () {return (IterEasyID )mp_HeadLink;}
ZCLink * ItTEasy() {return mp_TailLink;} IterEasyID ItTID () {return (IterEasyID )mp_TailLink;}
IterEasyID ItTID () {return (IterEasyID)mp_TailLink;}
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
ZCLinkC* ItHEasy() const{return mp_HeadLink;} ZCLinkC* ItHEasy() const{return mp_HeadLink;}
IterEasyIDc ItHID () const{return (IterEasyIDc)mp_HeadLink;}
ZCLinkC* ItTEasy() const{return mp_TailLink;} ZCLinkC* ItTEasy() const{return mp_TailLink;}
IterEasyIDc ItHID () const{return (IterEasyIDc)mp_HeadLink;}
IterEasyIDc ItTID () const{return (IterEasyIDc)mp_TailLink;} IterEasyIDc ItTID () const{return (IterEasyIDc)mp_TailLink;}
IterEasyIDc ItHIDc () const{return (IterEasyIDc)mp_HeadLink;}
IterEasyIDc ItTIDc () const{return (IterEasyIDc)mp_TailLink;}
void ItNext(ZCLink* & APR_CLink ) { MoveNextIter(APR_CLink) ; } void ItNext(ZCLink* & APR_CLink ) { MoveNextIter(APR_CLink) ; }
void ItNext(IterEasyID & APPI_IterEasyID) { MoveNextIter(APPI_IterEasyID) ; } void ItNext(IterEasyID & APPI_IterEasyID) { MoveNextIter(APPI_IterEasyID) ; }
@ -2346,16 +2347,16 @@ namespace ZNsMain
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
void ItNext(ZCLinkC* & APR_CLink ) const{ MoveNextIter(APR_CLink) ; } void ItNext(ZCLinkC* & APR_CLink ) const{ MoveNextIter(APR_CLink) ; }
void ItNext(IterEasyIDc& APPI_IterEasyID) const{ MoveNextIter(APPI_IterEasyID) ; } void ItNext(IterEasyIDc& APPI_IterEasyID) const{ MoveNextIter(APPI_IterEasyID) ; }
void ItNext(iteratorN & ARR_Iterator ) const{ ++ARR_Iterator ; } void ItNext(iteratorN & ARR_Iterator ) const{ ++ARR_Iterator ; }
TypeData & ItD(ZCLink* AP_CLink ) { return **AP_CLink; } TypeData & ItD(ZCLink* AP_CLink ) { return **AP_CLink; }
TypeData & ItD(IterEasyID APPI_IterEasyID ) { return ItD((ZCLink*)APPI_IterEasyID); } TypeData & ItD(IterEasyID AH_IterEasyID ) { return ItD((ZCLink *)AH_IterEasyID); }
TypeData & ItD(iterator & ARR_Iterator ) { return *ARR_Iterator; } TypeData & ItD(iterator & ARR_Iterator ) { return *ARR_Iterator; }
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
TypeDataC& ItD(ZCLinkC* AP_CLink ) const{ return **AP_CLink; } TypeDataC& ItD(ZCLinkC* AP_CLink ) const{ return **AP_CLink; }
TypeDataC& ItD(IterEasyIDc APPI_IterEasyID ) const{ return ItD((ZCLinkC*)APPI_IterEasyID); } TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const{ return ItD((ZCLinkC*)AH_IterEasyID); }
TypeDataC& ItD(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator; } TypeDataC& ItD(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator; }
iterator begin () { return ZCNodePoint (*this); } iterator begin () { return ZCNodePoint (*this); }