diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index c54e4ef..2221adb 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -5718,6 +5718,7 @@ namespace ZNsMain typedef ZCLinkPoint iterator ; // 다양한 기능을 가진 반복자. typedef ZCLinkPointC const_iterator; + typedef const TypeThis TypeThisC ; typedef const TypeList TypeListC ; typedef const TypeData TypeDataC ; typedef const ZCLink TypeLinkC ; @@ -5901,11 +5902,11 @@ namespace ZNsMain public : - TypeList & GetList() {return mr_CurrList;} - TypeLink & GetLink() {return *mp_CurrLink;} + TypeThis & GetMain() {return mr_CurrList;} + TypeLink & GetNode() {return *mp_CurrLink;} - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeThisC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ @@ -6031,8 +6032,8 @@ namespace ZNsMain ml_CurrPos = 1 ; } ZCLinkPointC(const ZCLinkPoint & rhs) : - mr_CurrList( rhs.GetList()), - mp_CurrLink(&rhs.GetLink()), + mr_CurrList( rhs.GetMain()), + mp_CurrLink(&rhs.GetNode()), ml_CurrPos ( rhs.GetPos ()) {} ZCLinkPointC(const ZCLinkPointC& rhs) : @@ -6075,8 +6076,8 @@ namespace ZNsMain public : - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeListC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ @@ -8384,8 +8385,8 @@ namespace ZNsMain ZCLinkC& GetTailLink(TypeSize AI_Distance) const{return (*mp_TailLink)-AI_Distance;} - ZCLink & GetLink(TypeSize AI_Index) {return (*mp_HeadLink)+(AI_Index-1);} - ZCLinkC& GetLink(TypeSize AI_Index) const{return (*mp_HeadLink)+(AI_Index-1);} + ZCLink & GetNode(TypeSize AI_Index) {return (*mp_HeadLink)+(AI_Index-1);} + ZCLinkC& GetNode(TypeSize AI_Index) const{return (*mp_HeadLink)+(AI_Index-1);} ZCLink * HeadPtr() {return mp_HeadLink;} diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 11e6eda..9d2a7af 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -17,19 +17,21 @@ namespace ZNsMain class ZtCArray ////////////////////////// { public: - typedef TType Type ; - typedef TType TypeData; - typedef TTypArg TypeArg ; - typedef TSize TypeSize; + typedef TType Type ; + typedef TType TypeData ; + typedef TTypArg TypeArg ; + typedef TSize TypeSize ; public: - class ZCDataPoint; class ZCDataPointC; + class ZCDataPoint; class ZCDataPointC ; public: - typedef Type* IterEasy; - typedef ZCDataPoint TypeIter; - /**********************************************/ + typedef Type* IterEasy ; + typedef ZCDataPoint TypeIter ; + typedef ZtCArray TypeThis ; + + typedef const TypeThis TypeThisC ; typedef const TypeData TypeDataC ; typedef const IterEasy IterEasyC ; - /**********************************************/ + typedef ZCDataPointC iteratorC ; /**********************************************/ typedef ZCDataPoint iterator ; @@ -69,8 +71,15 @@ namespace ZNsMain }/* ZCDataPoint(const ZCDataPoint& rhs)*/ - TypeSize size () const{return mr_CArray.size();} - TypeSize GetPos() const{return ml_ElePos ;} + + TypeThis & GetMain() {return mr_CArray ;} + TypeData * GetNode() {return mp_Data ;} + + TypeThisC& GetMain() const{return mr_CArray ;} + TypeDataC* GetNode() const{return mp_Data ;} + + TypeSize GetPos () const{return ml_ElePos ;} + TypeSize size () const{return mr_CArray.size();} TypeData & operator* () {return *mp_Data;} TypeData * operator->() {return mp_Data;} diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 0a85413..aa45e75 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -823,6 +823,7 @@ namespace ZNsMain typedef ZCLinkPointC const_iterator; /*********************************************************************/ + typedef const TypeThis TypeThisC ; typedef const TypeList TypeListC ; typedef const TypeData TypeDataC ; typedef const TypeLink TypeLinkC ; @@ -1088,11 +1089,11 @@ namespace ZNsMain public : - TypeList & GetList() {return mr_CurrList;} - TypeLink & GetLink() {return *mp_CurrLink;} + TypeThis & GetMain() {return mr_CurrList;} + TypeLink & GetNode() {return *mp_CurrLink;} - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeThisC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ @@ -1218,8 +1219,8 @@ namespace ZNsMain ml_CurrPos = 1 ; } ZCLinkPointC(const ZCLinkPoint & rhs) : - mr_CurrList( rhs.GetList()), - mp_CurrLink(&rhs.GetLink()), + mr_CurrList( rhs.GetMain()), + mp_CurrLink(&rhs.GetNode()), ml_CurrPos ( rhs.GetPos ()) {} ZCLinkPointC(const ZCLinkPointC& rhs) : @@ -1262,8 +1263,8 @@ namespace ZNsMain public : - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeListC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ @@ -2956,8 +2957,8 @@ namespace ZNsMain const ZCLink& GetTailLink(TypeSize AI_Distance) const{return (*mp_TailLink)-AI_Distance;} - ZCLink& GetLink(TypeSize AI_Index) {return (*mp_HeadLink)+(AI_Index-1);} - const ZCLink& GetLink(TypeSize AI_Index) const{return (*mp_HeadLink)+(AI_Index-1);} + ZCLink& GetNode(TypeSize AI_Index) {return (*mp_HeadLink)+(AI_Index-1);} + const ZCLink& GetNode(TypeSize AI_Index) const{return (*mp_HeadLink)+(AI_Index-1);} ZCLink* HeadPtr(){return mp_HeadLink;} diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index e511fc0..89c6e3b 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -781,10 +781,12 @@ namespace ZNsMain typedef ZCLink TypeLink ; typedef ZtCSimList TypeList ; + typedef ZtCSimList TypeThis ; typedef ZCLinkPoint TypeIter ; /**************************************************/ typedef const ZCLink ZCLinkC ; + typedef const TypeThis TypeThisC ; typedef const TypeData TypeDataC ; typedef const TypeList TypeListC ; typedef const TypeLink TypeLinkC ; @@ -1014,11 +1016,11 @@ namespace ZNsMain public : - TypeList & GetList() {return mr_CurrList;} - TypeLink & GetLink() {return *mp_CurrLink;} + TypeThis & GetMain() {return mr_CurrList;} + TypeLink & GetNode() {return *mp_CurrLink;} - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeThisC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ @@ -1117,8 +1119,8 @@ namespace ZNsMain ml_CurrPos = 1 ; } ZCLinkPointC(const ZCLinkPoint & rhs) : - mr_CurrList( rhs.GetList()), - mp_CurrLink(&rhs.GetLink()), + mr_CurrList( rhs.GetMain()), + mp_CurrLink(&rhs.GetNode()), ml_CurrPos ( rhs.GetPos ()) {} ZCLinkPointC(const ZCLinkPointC& rhs) : @@ -1161,8 +1163,8 @@ namespace ZNsMain public : - TypeListC& GetList() const{return mr_CurrList;} - TypeLinkC& GetLink() const{return *mp_CurrLink;} + TypeListC& GetMain() const{return mr_CurrList;} + TypeLinkC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/