From 278eeaefcf58905a5aa4d3f5143fae4545b82586 Mon Sep 17 00:00:00 2001 From: sauron Date: Fri, 10 Oct 2025 06:18:09 +0900 Subject: [PATCH] commit 2025-10-10 06:18 add ZftMakeStr(ARR_SaveCStr, ZTypIntUL AUL_Int) etc : ZCppMain/ZMainHead.H etc --- ZCppMain/ZMainHead.H | 92 ++++++++++++++++++++++++++++++++++++-- ZCppMain/ZtCStringEx.H | 32 ++++++++----- ZCppMain/ZtCStringStd.H | 36 ++++++++++----- ZCppMainTest/ZtCStringBase_000.cpp | 4 +- 4 files changed, 136 insertions(+), 28 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 4b3de65..70c3f83 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -5476,10 +5476,10 @@ namespace ZNsMain #ifdef _WIN ZTypInt VI_ResultSize = - ( ::sprintf(VCA_BuffParam, "%I64u", ALL_Long) ); + ( ::sprintf(VCA_BuffParam, "%I64d", ALL_Long) ); #else ZTypInt VI_ResultSize = - ( ::sprintf(VCA_BuffParam, "%llu" , ALL_Long) ); + ( ::sprintf(VCA_BuffParam, "%lld" , ALL_Long) ); #endif return ARR_SaveCStr.append (VCA_BuffParam, VI_ResultSize); @@ -5492,16 +5492,100 @@ namespace ZNsMain #ifdef _WIN ZTypInt VI_ResultSize = ::swprintf - (VCA_BuffParam, CI_BuffSize, L"%I64u", ALL_Long) ; + (VCA_BuffParam, CI_BuffSize, L"%I64d", ALL_Long) ; #else ZTypInt VI_ResultSize = ::swprintf - (VCA_BuffParam, CI_BuffSize, L"%llu" , ALL_Long) ; + (VCA_BuffParam, CI_BuffSize, L"%lld" , ALL_Long) ; #endif return ARR_SaveCStr.append (VCA_BuffParam, VI_ResultSize); }/* template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypLLong ALL_Long)*/ + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntUI AUI_Int) + { + ZTycInt CI_BuffSize = 31 ; + ZTypChar VCA_BuffParam[CI_BuffSize] ; + + ZTypInt VI_ResultSize = + ( ::sprintf(VCA_BuffParam, "%u" , AUI_Int) ); + + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntUI AUI_Int)*/ + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntUI AUI_Int) + { + ZTycInt CI_BuffSize = 31 ; + ZTypCharW VCA_BuffParam[CI_BuffSize] ; + + ZTypInt VI_ResultSize = ::swprintf + (VCA_BuffParam, CI_BuffSize, L"%u" , AUI_Int) ; + + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntUI AUI_Int)*/ + + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntUL AUL_Int) + { + ZTycInt CI_BuffSize = 41 ; + ZTypChar VCA_BuffParam[CI_BuffSize] ; + + ZTypInt VI_ResultSize = + ( ::sprintf(VCA_BuffParam, "%lu" , AUL_Int) ); + + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntUL AUL_Int)*/ + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntUL AUL_Int) + { + ZTycInt CI_BuffSize = 41 ; + ZTypCharW VCA_BuffParam[CI_BuffSize] ; + + ZTypInt VI_ResultSize = ::swprintf + (VCA_BuffParam, CI_BuffSize, L"%lu" , AUL_Int) ; + + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntUL AUL_Int)*/ + + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntULL AULL_Int) + { + ZTycInt CI_BuffSize = 41 ; + ZTypChar VCA_BuffParam[CI_BuffSize] ; + + #ifdef _WIN + ZTypInt VI_ResultSize = + ( ::sprintf(VCA_BuffParam, "%I64u", AULL_Int) ); + #else + ZTypInt VI_ResultSize = + ( ::sprintf(VCA_BuffParam, "%llu" , AULL_Int) ); + #endif + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> string& ZftMakeStr(string& ARR_SaveCStr, ZTypIntULL AULL_Int)*/ + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntULL AULL_Int) + { + ZTycInt CI_BuffSize = 41 ; + ZTypCharW VCA_BuffParam[CI_BuffSize] ; + + #ifdef _WIN + ZTypInt VI_ResultSize = ::swprintf + (VCA_BuffParam, CI_BuffSize, L"%I64u", AULL_Int) ; + #else + ZTypInt VI_ResultSize = ::swprintf + (VCA_BuffParam, CI_BuffSize, L"%llu" , AULL_Int) ; + #endif + return ARR_SaveCStr.append + (VCA_BuffParam, VI_ResultSize); + }/* + template<> wstring& ZftMakeStr(wstring& ARR_SaveCStr, ZTypIntULL AULL_Int)*/ + + template<> string& ZftMakeStr(string& ARR_SaveCStr, double AD_Double) { ZTycInt CI_BuffSize=51 ; diff --git a/ZCppMain/ZtCStringEx.H b/ZCppMain/ZtCStringEx.H index 1396af2..8b35862 100644 --- a/ZCppMain/ZtCStringEx.H +++ b/ZCppMain/ZtCStringEx.H @@ -7534,28 +7534,40 @@ namespace ZNsMain _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr ( _ZCSTRINGBASE_& ARR_SaveCStr, const typename - _ZCSTRINGBASE_::ZCChars& AR_DataCStr ) + _ZCSTRINGBASE_::ZCChars& AR_DataCStr ) { return ARR_SaveCStr(AR_DataCStr); } _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr ( _ZCSTRINGBASE_& ARR_SaveCStr, typename - _ZCSTRINGBASE_::TypeChar AC_Char ) - { return ARR_SaveCStr(AC_Char ); } + _ZCSTRINGBASE_::TypeChar AC_Char ) + { return ARR_SaveCStr(AC_Char ); } _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr - ( _ZCSTRINGBASE_& ARR_SaveCStr, int AI_IntI ) - { return ARR_SaveCStr(AI_IntI ); } + ( _ZCSTRINGBASE_& ARR_SaveCStr, ZTypIntI AI_IntI ) + { return ARR_SaveCStr(AI_IntI ); } _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr - ( _ZCSTRINGBASE_& ARR_SaveCStr, long AL_Long ) - { return ARR_SaveCStr(AL_Long ); } + ( _ZCSTRINGBASE_& ARR_SaveCStr, ZTypIntL AL_Long ) + { return ARR_SaveCStr(AL_Long ); } _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr - ( _ZCSTRINGBASE_& ARR_SaveCStr, double AD_Double ) - { return ARR_SaveCStr(AD_Double ); } + ( _ZCSTRINGBASE_& ARR_SaveCStr, ZTypIntUI AUI_Int ) + { return ARR_SaveCStr(AUI_Int ); } _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr - ( _ZCSTRINGBASE_& ARR_SaveCStr, bool AB_Bool ) + ( _ZCSTRINGBASE_& ARR_SaveCStr, ZTypIntUL AUL_Int ) + { return ARR_SaveCStr(AUL_Int ); } + + _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr + ( _ZCSTRINGBASE_& ARR_SaveCStr, ZTypIntULL AULL_Int ) + { return ARR_SaveCStr(AULL_Int ); } + + _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr + ( _ZCSTRINGBASE_& ARR_SaveCStr, double AD_Double ) + { return ARR_SaveCStr(AD_Double ); } + + _ZCSTRINGBASE_ARG_ _ZCSTRINGBASE_& ZftMakeStr + ( _ZCSTRINGBASE_& ARR_SaveCStr, bool AB_Bool ) { typedef typename _ZCSTRINGBASE_::TypeChar TypeChar; typedef typename _ZCSTRINGBASE_::TypeSize TypeSize; diff --git a/ZCppMain/ZtCStringStd.H b/ZCppMain/ZtCStringStd.H index cf07871..fd2aaaf 100644 --- a/ZCppMain/ZtCStringStd.H +++ b/ZCppMain/ZtCStringStd.H @@ -552,32 +552,44 @@ namespace ZNsMain _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr ( _ZCSTRINGSTD_& ARR_SaveCStr, const _ZCSTRINGSTD_& AR_DataCStr) - { return ARR_SaveCStr(AR_DataCStr); } + { return ARR_SaveCStr(AR_DataCStr ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr ( _ZCSTRINGSTD_& ARR_SaveCStr, const typename - _ZCSTRINGSTD_::ZCChars& AR_DataCStr ) - { return ARR_SaveCStr(AR_DataCStr); } + _ZCSTRINGSTD_::ZCChars& AR_DataCStr ) + { return ARR_SaveCStr(AR_DataCStr ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr ( _ZCSTRINGSTD_& ARR_SaveCStr, typename - _ZCSTRINGSTD_::TypeChar AC_Char ) - { return ARR_SaveCStr(AC_Char ); } + _ZCSTRINGSTD_::TypeChar AC_Char ) + { return ARR_SaveCStr(AC_Char ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr - ( _ZCSTRINGSTD_& ARR_SaveCStr, int AI_IntI ) - { return ARR_SaveCStr(AI_IntI ); } + ( _ZCSTRINGSTD_& ARR_SaveCStr, ZTypInt AI_IntI ) + { return ARR_SaveCStr(AI_IntI ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr - ( _ZCSTRINGSTD_& ARR_SaveCStr, long AL_Long ) - { return ARR_SaveCStr(AL_Long ); } + ( _ZCSTRINGSTD_& ARR_SaveCStr, ZTypIntL AL_Long ) + { return ARR_SaveCStr(AL_Long ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr - ( _ZCSTRINGSTD_& ARR_SaveCStr, double AD_Double ) - { return ARR_SaveCStr(AD_Double ); } + ( _ZCSTRINGSTD_& ARR_SaveCStr, ZTypIntUI AUI_Int ) + { return ARR_SaveCStr(AUI_Int ); } _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr - ( _ZCSTRINGSTD_& ARR_SaveCStr, bool AB_Bool ) + ( _ZCSTRINGSTD_& ARR_SaveCStr, ZTypIntUL AUL_Long ) + { return ARR_SaveCStr(AUL_Long ); } + + _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr + ( _ZCSTRINGSTD_& ARR_SaveCStr, ZTypIntULL AULL_Long ) + { return ARR_SaveCStr(AULL_Long ); } + + _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr + ( _ZCSTRINGSTD_& ARR_SaveCStr, double AD_Double ) + { return ARR_SaveCStr(AD_Double ); } + + _ZCSTRINGSTD_ARG_ _ZCSTRINGSTD_& ZftMakeStr + ( _ZCSTRINGSTD_& ARR_SaveCStr, bool AB_Bool ) { typedef typename _ZCSTRINGSTD_::TypeChar TypeChar; typedef typename _ZCSTRINGSTD_::TypeSize TypeSize; diff --git a/ZCppMainTest/ZtCStringBase_000.cpp b/ZCppMainTest/ZtCStringBase_000.cpp index d8cfbae..2289676 100644 --- a/ZCppMainTest/ZtCStringBase_000.cpp +++ b/ZCppMainTest/ZtCStringBase_000.cpp @@ -156,14 +156,14 @@ namespace ZNsMain cout<<"*****************************************************"<