diff --git a/ZCppMain/ZtCMainChars.H b/ZCppMain/ZtCMainChars.H index 868f97b..5f806d5 100644 --- a/ZCppMain/ZtCMainChars.H +++ b/ZCppMain/ZtCMainChars.H @@ -4837,9 +4837,8 @@ namespace ZNsMain if(VL_LengthNow<1) { if(VI_RepeatCnt>=AI_RepeatMin) - return VL_LengthAll; - else - return 0; + return VL_LengthAll; + else return 0; }/* if(VL_LengthNow<1)*/ @@ -5030,18 +5029,19 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = - ZtCMainChars::GetLength_FindSerial( //////////// - APC_Origin+VL_LengthAll , - AL_Length -VL_LengthAll , - ARA_SearchArray - /*/////////*/ ); /////////////////////////////// + ZtCMainChars::GetLength_FindSerial + ( + APC_Origin+VL_LengthAll , + AL_Length -VL_LengthAll , + ARA_SearchArray + ); + ////////////////////////////////// if(VL_LengthNow<1) { if(VI_RepeatCnt>=AI_RepeatMin) - return VL_LengthAll; - else - return 0; + return VL_LengthAll; + else return 0; }/* if(VL_LengthNow<1)*/ @@ -5055,11 +5055,13 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = - ZtCMainChars::GetLength_FindSerial( //////////// - APC_Origin+VL_LengthAll , - AL_Length -VL_LengthAll , - ARA_SearchArray - /*//////////*/ ); ////////////////////////////// + ZtCMainChars::GetLength_FindSerial + ( + APC_Origin+VL_LengthAll , + AL_Length -VL_LengthAll , + ARA_SearchArray + ); + ////////////////////////////////// // 현재 VI_RepeatCnt static TypeLength GetLength_Repeat_FindSerialChar - ( - int AI_RepeatMin, int AI_RepeatMax, - TypeCharC* APC_Origin , TypeLength AL_Length , - const TStringArray& ARA_SearchArray , - ZNsEnum::ZESearchMax AE_ESearchMax=ZNsEnum::ZESearchMax_Over - ) + template static + TypeLength GetLength_Repeat_FindSerialChar /*##############################*/ + ( + int AI_RepeatMin, int AI_RepeatMax, + TypeCharC* APC_Origin , TypeLength AL_Length , + const TStringArray& ARA_SearchArray , + ZNsEnum::ZESearchMax AE_ESearchMax=ZNsEnum::ZESearchMax_Over + ) /*#############################################################################*/ { int VI_RepeatCnt=0; @@ -5126,18 +5129,21 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_FindSerialChar2 + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_FindSerialChar2 ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); - ////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////// if(VL_LengthNow<1) { if(VI_RepeatCnt>=AI_RepeatMin) - return VL_LengthAll; - else - return 0; + return VL_LengthAll; + else return 0; }/* if(VL_LengthNow<1)*/ @@ -5149,11 +5155,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_FindSerialChar2 - ( - APC_Origin+VL_LengthAll, AL_Length -VL_LengthAll, ARA_SearchArray - ); - ////////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_FindSerialChar2 + ( + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray + ); + /////////////////////////////////////////// if(VL_LengthNow<1) { @@ -5166,14 +5176,8 @@ namespace ZNsMain if(VL_LengthNow<1)*/ if(AE_ESearchMax==ZNsEnum::ZESearchMax_Over) - { - if(++VI_RepeatCnt> AI_RepeatMax) return 0; - } - else // AE_ESearchMax==ZNsEnum::ZESearchMax_Stop - { - if(++VI_RepeatCnt>=AI_RepeatMax) return VL_LengthAll; - }/* - else // AE_ESearchMax==ZNsEnum::ZESearchMax_Stop*/ + { if(++VI_RepeatCnt> AI_RepeatMax) return 0 ; } + else { if(++VI_RepeatCnt>=AI_RepeatMax) return VL_LengthAll; } } while(true); }/* @@ -5181,13 +5185,14 @@ namespace ZNsMain return VL_LengthAll; }/* - template static TypeLength GetLength_Repeat_FindSerialChar - ( - int AI_RepeatMin, int AI_RepeatMax, - TypeCharC* APC_Origin , TypeLength AL_Length , - const TStringArray& ARA_SearchArray , - ZNsEnum::ZESearchMax AE_ESearchMax=ZNsEnum::ZESearchMax_Over - ) + template static + TypeLength GetLength_Repeat_FindSerialChar ################################## + ( + int AI_RepeatMin, int AI_RepeatMax, + TypeCharC* APC_Origin , TypeLength AL_Length , + const TStringArray& ARA_SearchArray , + ZNsEnum::ZESearchMax AE_ESearchMax=ZNsEnum::ZESearchMax_Over + ) ###############################################################################*/ template @@ -5221,18 +5226,19 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = - ZtCMainChars::GetLength_StartFind( //////////// - APC_Origin+VL_LengthAll , - AL_Length -VL_LengthAll , - ARA_SearchArray - /*/////////*/ ); ////////////////////////////// + ZtCMainChars::GetLength_StartFind + ( + APC_Origin+VL_LengthAll , + AL_Length -VL_LengthAll , + ARA_SearchArray + ); + ///////////////////////////////// if(VL_LengthNow<1) { if(VI_RepeatCnt>=AI_RepeatMin) - return VL_LengthAll; - else - return 0; + return VL_LengthAll; + else return 0; }/* if(VL_LengthNow<1)*/ @@ -5246,11 +5252,13 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = - ZtCMainChars::GetLength_StartFind( //////////// - APC_Origin+VL_LengthAll , - AL_Length -VL_LengthAll , - ARA_SearchArray - /*//////////*/ ); ///////////////////////////// + ZtCMainChars::GetLength_StartFind + ( + APC_Origin+VL_LengthAll , + AL_Length -VL_LengthAll , + ARA_SearchArray + ); + ///////////////////////////////// // 현재 VI_RepeatCnt=AI_RepeatMin) - return VL_LengthAll; - else - return 0; + return VL_LengthAll; + else return 0; }/* if(VL_LengthNow<1)*/ @@ -5617,11 +5636,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_PermitChar2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - ////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_PermitChar2 + ( + APC_Origin+ VL_LengthAll, + AL_Length - VL_LengthAll, + ARA_SearchArray + ); + /////////////////////////////////////// if(VL_LengthNow<1) { @@ -5687,11 +5710,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_PermitCharRange2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - /////////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_PermitCharRange2 + ( + APC_Origin+ VL_LengthAll, + AL_Length - VL_LengthAll, + ARA_SearchArray + ); + //////////////////////////////////////////// if(VL_LengthNow<1) { @@ -5709,11 +5736,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_PermitCharRange2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - /////////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_PermitCharRange2 + ( + APC_Origin+VL_LengthAll , + AL_Length-VL_LengthAll , + ARA_SearchArray + ); + //////////////////////////////////////////// if(VL_LengthNow<1) { @@ -5781,7 +5812,9 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermit ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); /////////////////////////////////////////////////////////////// @@ -5803,7 +5836,9 @@ namespace ZNsMain { VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermit ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); /////////////////////////////////////////////////////////////// @@ -5871,11 +5906,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitRange + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitRange ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); - //////////////////////////////////////////////////////////////////// + ///////////////////////////////////////// if(VL_LengthNow<1) { @@ -5893,11 +5932,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitRange + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitRange ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); - //////////////////////////////////////////////////////////////////// + ///////////////////////////////////////// if(VL_LengthNow<1) { @@ -5963,11 +6006,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitChar2 + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitChar2 ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray ); - //////////////////////////////////////////////////////////////////// + ///////////////////////////////////////// if(VL_LengthNow<1) { @@ -5985,11 +6032,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitChar2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - //////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitChar2 + ( + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray + ); + ///////////////////////////////////////// if(VL_LengthNow<1) { @@ -6055,11 +6106,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitCharRange2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - ///////////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitCharRange2 + ( + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray + ); + ////////////////////////////////////////////// if(VL_LengthNow<1) { @@ -6077,11 +6132,15 @@ namespace ZNsMain { do ////// { - VL_LengthAll += VL_LengthNow = ZtCMainChars::GetLength_NoPermitCharRange2 - ( - APC_Origin+VL_LengthAll, AL_Length-VL_LengthAll, ARA_SearchArray - ); - ///////////////////////////////////////////////////////////////////////// + VL_LengthAll += VL_LengthNow = + + ZtCMainChars::GetLength_NoPermitCharRange2 + ( + APC_Origin+ VL_LengthAll , + AL_Length - VL_LengthAll , + ARA_SearchArray + ); + ////////////////////////////////////////////// if(VL_LengthNow<1) {