diff options
36 files changed, 121 insertions, 119 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 58cd9d0..fcfc5f8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -124,6 +124,8 @@ * Use tagging for development versions; * Fix minval and maxval; +* Rename sz to siz; + # 0.0.2 * Migrate to CMake; @@ -78,7 +78,7 @@ static_assert(::zp::typequ<::zp::i04m, ::std::uint_least64_t>::val == true); static_assert(::zp::typequ<::zp::i04ms,::std::int_least64_t>::val == true); static_assert(::zp::typequ<::zp::intptr,::std::uintptr_t>::val == true); -static_assert(::zp::typequ<::zp::sz, ::std::size_t>::val == true); +static_assert(::zp::typequ<::zp::siz, ::std::size_t>::val == true); static_assert(::zp::isusgn<char>::val == ::std::is_unsigned<char>::value); static_assert(::zp::isusgn<char16_t>::val == ::std::is_unsigned<char16_t>::value); @@ -282,9 +282,9 @@ int main() { wchar_t wstr[] = L"Hello there!"; char32_t str02[] = U"Hello there!"; - ::zp::sz const len = ::zp_strlen( str); - ::zp::sz const wlen = ::zp_wstrlen( wstr); - ::zp::sz const len02 = ::zp_utf32len(str02); + ::zp::siz const len = ::zp_strlen( str); + ::zp::siz const wlen = ::zp_wstrlen( wstr); + ::zp::siz const len02 = ::zp_utf32len(str02); cmp(len, 0xCu); cmp(wlen, 0xCu); @@ -308,7 +308,7 @@ int main() { char32_t const src[] = U"\U0001F480"; - ::zp::sz const buf8len = ::zp_utf8enclen(src); + ::zp::siz const buf8len = ::zp_utf8enclen(src); cmp(buf8len,0x4u); ::zp::c8 * buf8 = new ::zp::c8[buf8len+0x1]; @@ -321,7 +321,7 @@ int main() { cmp(buf8[0x3],0x80u); cmp(buf8[0x4],0x00u); - ::zp::sz const buf02len = ::zp_utf8declen(buf8); + ::zp::siz const buf02len = ::zp_utf8declen(buf8); cmp(buf02len,0x1u); char32_t * buf02 = new char32_t[buf02len+0x1]; @@ -340,7 +340,7 @@ int main() { char32_t const src[] = U"\U0001F480\u00F0"; - ::zp::sz const buf01len = ::zp_utf16enclen(src); + ::zp::siz const buf01len = ::zp_utf16enclen(src); cmp(buf01len,0x3u); char16_t * buf01 = new char16_t[buf01len+0x1]; @@ -352,7 +352,7 @@ int main() { cmp(buf01[0x2],0x00F0u); cmp(buf01[0x3],0x0000u); - ::zp::sz const buf02len = ::zp_utf16declen(buf01); + ::zp::siz const buf02len = ::zp_utf16declen(buf01); cmp(buf02len,0x2u); char32_t * buf02 = new char32_t[buf02len+0x1]; diff --git a/zp/include-private/zp/prv b/zp/include-private/zp/prv index b5f0da8..02aa80e 100644 --- a/zp/include-private/zp/prv +++ b/zp/include-private/zp/prv @@ -12,10 +12,10 @@ namespace zp { namespace det { - template<typename typ> zp_nthrw ::zp::sz strcpy(typ * dst, typ const * src); + template<typename typ> zp_nthrw ::zp::siz strcpy(typ * dst, typ const * src); template<typename typ> zp_nthrw bool strequ(typ const * lstr,typ const * rsrc); - template<typename typ> zp_nthrw ::zp::sz strfil(typ * dst, typ chr); - template<typename typ> zp_nthrw ::zp::sz strlen(typ const * str); + template<typename typ> zp_nthrw ::zp::siz strfil(typ * dst, typ chr); + template<typename typ> zp_nthrw ::zp::siz strlen(typ const * str); template<typename typ> zp_nthrw typ * strsrh(typ const * str, typ chr); } } diff --git a/zp/include-private/zp/prv.d/strcpy.ii b/zp/include-private/zp/prv.d/strcpy.ii index f0b4ed2..c858359 100644 --- a/zp/include-private/zp/prv.d/strcpy.ii +++ b/zp/include-private/zp/prv.d/strcpy.ii @@ -4,12 +4,12 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename typ> zp_nthrw ::zp::sz zp::det::strcpy(typ * dst,typ const * src) { +template<typename typ> zp_nthrw ::zp::siz zp::det::strcpy(typ * dst,typ const * src) { //static_assert(::zp::ischr<typ>::val,"type must be a character type"); typ * const dstsrt = dst; while (*src != typ (0x0)) {*dst++ = *src++;} - return static_cast< ::zp::sz>(dst-dstsrt); /* Number of values copied. */ + return static_cast< ::zp::siz>(dst-dstsrt); /* Number of values copied. */ } diff --git a/zp/include-private/zp/prv.d/strfil.ii b/zp/include-private/zp/prv.d/strfil.ii index 229c8d7..1a1a725 100644 --- a/zp/include-private/zp/prv.d/strfil.ii +++ b/zp/include-private/zp/prv.d/strfil.ii @@ -4,12 +4,12 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename typ> zp_nthrw ::zp::sz zp::det::strfil(typ * str,typ const chr) { +template<typename typ> zp_nthrw ::zp::siz zp::det::strfil(typ * str,typ const chr) { //static_assert(::zp::ischr<typ>::val,"type must be a character type"); /* If the string format uses multiple values per character, the number of these values is returned (use utfXdeclen if the number of characters is needed). */ typ * const srt = str; while (*str != typ (0x0)) {*str++ = chr;} - return static_cast< ::zp::sz>(str-srt)-0x1u; + return static_cast< ::zp::siz>(str-srt)-0x1u; } diff --git a/zp/include-private/zp/prv.d/strlen.ii b/zp/include-private/zp/prv.d/strlen.ii index c63ad45..0bef5f3 100644 --- a/zp/include-private/zp/prv.d/strlen.ii +++ b/zp/include-private/zp/prv.d/strlen.ii @@ -4,12 +4,12 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename typ> zp_nthrw ::zp::sz zp::det::strlen(typ const * str) { +template<typename typ> zp_nthrw ::zp::siz zp::det::strlen(typ const * str) { //static_assert(::zp::ischr<typ>::val,"type must be a character type"); /* If the string format uses multiple values per character, the number of these values is returned (use utfXdeclen if the number of characters is needed). */ typ const * const srt = str; while (*str++ != typ (0x0)) {} - return static_cast< ::zp::sz>(str-srt)-0x1u; + return static_cast< ::zp::siz>(str-srt)-0x1u; } diff --git a/zp/include/zp/bs b/zp/include/zp/bs index 77b3352..05c421a 100644 --- a/zp/include/zp/bs +++ b/zp/include/zp/bs @@ -68,7 +68,7 @@ namespace zp { #endif typedef ::zp_intptr intptr; - typedef ::zp_sz sz; + typedef ::zp_siz siz; #if zp_fixflt01 typedef ::zp_f01 f01; @@ -326,9 +326,9 @@ namespace zp { zp_prv_ttval(::zp::i04m) ver = zp_ver; zp_prv_ttval(::zp::i04m) extver = zp_extver; - zp_prv_ttval(::zp::sz) bytelen = zp_bytelen; + zp_prv_ttval(::zp::siz) bytelen = zp_bytelen; - zp_prv_ttval(::zp::sz) nopos = zp_nopos; + zp_prv_ttval(::zp::siz) nopos = zp_nopos; zp_prv_ttval(::zp::c02) unimax = zp_unimax; diff --git a/zp/include/zp/bs.h b/zp/include/zp/bs.h index d04d12b..7782ef6 100644 --- a/zp/include/zp/bs.h +++ b/zp/include/zp/bs.h @@ -279,7 +279,7 @@ typedef decltype (nullptr) zp_nulptrtyp; #define zp_extver ((zp_i04m)+0x0u) /* The extension versions adds functionality without breaking the existing ones. */ /* The patch version is not public as it only changes implementation details. */ -#define zp_bytelen ((zp_sz)+0x8u) +#define zp_bytelen ((zp_siz)+0x8u) #define zp_nopos zp_maxvalz diff --git a/zp/include/zp/mem b/zp/include/zp/mem index bd6ea5f..dc80ecf 100644 --- a/zp/include/zp/mem +++ b/zp/include/zp/mem @@ -16,17 +16,17 @@ namespace zp { srctyp * src; }; - template<typename dsttyp,typename srctyp> zp_iln zp_nthrw inline ::zp::cpyres<dsttyp,srctyp> memcpy(dsttyp * dst, srctyp const * src, ::zp::sz const num); - template<typename ltyp, typename rtyp> zp_useres zp_iln zp_nthrw inline bool memequ(ltyp const * lbuf,rtyp const * rbuf,::zp::sz const num) {return ::zp_memequ(lbuf,rbuf,num);} - template<typename typ> zp_iln zp_nthrw inline typ * memfil(typ * dst, char unsigned val, ::zp::sz const num) {return static_cast<typ *>(::zp_memfil(dst,val,num));} - template<typename typ> zp_useres zp_nthrw zp_iln inline typ * memsrh(typ * buf, char unsigned val, ::zp::sz const num) {return static_cast<typ *>(::zp_memsrh(buf,val,num));} - template<typename typ> zp_useres zp_nthrw zp_iln inline typ const * memsrh(typ const * buf, char unsigned val, ::zp::sz const num) {return const_cast<typ const *>(static_cast<typ *>(::zp_memsrh(buf,val,num)));} + template<typename dsttyp,typename srctyp> zp_iln zp_nthrw inline ::zp::cpyres<dsttyp,srctyp> memcpy(dsttyp * dst, srctyp const * src, ::zp::siz const num); + template<typename ltyp, typename rtyp> zp_useres zp_iln zp_nthrw inline bool memequ(ltyp const * lbuf,rtyp const * rbuf,::zp::siz const num) {return ::zp_memequ(lbuf,rbuf,num);} + template<typename typ> zp_iln zp_nthrw inline typ * memfil(typ * dst, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memfil(dst,val,num));} + template<typename typ> zp_useres zp_nthrw zp_iln inline typ * memsrh(typ * buf, char unsigned val, ::zp::siz const num) {return static_cast<typ *>(::zp_memsrh(buf,val,num));} + template<typename typ> zp_useres zp_nthrw zp_iln inline typ const * memsrh(typ const * buf, char unsigned val, ::zp::siz const num) {return const_cast<typ const *>(static_cast<typ *>(::zp_memsrh(buf,val,num)));} #if zp_std_cxx14 - template<typename ltyp, typename rtyp> constexpr auto cpy(ltyp * dst, rtyp * src, ::zp::sz num) noexcept -> ::zp::cpyres<ltyp,rtyp>; - template<typename ltyp, typename rtyp> constexpr auto equ(ltyp * lbuf,rtyp * rbuf,::zp::sz num) noexcept -> bool; - template<typename buftyp,typename valtyp> constexpr auto fil(buftyp * buf, valtyp & val, ::zp::sz num) noexcept -> buftyp *; - template<typename buftyp,typename valtyp> constexpr auto srh(buftyp * buf, valtyp & val, ::zp::sz num) noexcept -> buftyp *; + template<typename ltyp, typename rtyp> constexpr auto cpy(ltyp * dst, rtyp * src, ::zp::siz num) noexcept -> ::zp::cpyres<ltyp,rtyp>; + template<typename ltyp, typename rtyp> constexpr auto equ(ltyp * lbuf,rtyp * rbuf,::zp::siz num) noexcept -> bool; + template<typename buftyp,typename valtyp> constexpr auto fil(buftyp * buf, valtyp & val, ::zp::siz num) noexcept -> buftyp *; + template<typename buftyp,typename valtyp> constexpr auto srh(buftyp * buf, valtyp & val, ::zp::siz num) noexcept -> buftyp *; #endif } diff --git a/zp/include/zp/mem.d/cpy.ii b/zp/include/zp/mem.d/cpy.ii index b192143..3e96910 100644 --- a/zp/include/zp/mem.d/cpy.ii +++ b/zp/include/zp/mem.d/cpy.ii @@ -4,7 +4,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename ltyp,typename rtyp> constexpr auto zp::cpy(ltyp * dst,rtyp * src,::zp::sz const num) noexcept -> ::zp::cpyres<ltyp,rtyp> { +template<typename ltyp,typename rtyp> constexpr auto zp::cpy(ltyp * dst,rtyp * src,::zp::siz const num) noexcept -> ::zp::cpyres<ltyp,rtyp> { ltyp * const stp = dst+num; while (dst != stp) {*dst++ = *src++;} diff --git a/zp/include/zp/mem.d/equ.ii b/zp/include/zp/mem.d/equ.ii index b3a0929..1bc0fbd 100644 --- a/zp/include/zp/mem.d/equ.ii +++ b/zp/include/zp/mem.d/equ.ii @@ -4,7 +4,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename ltyp,typename rtyp> constexpr auto zp::equ(ltyp * lbuf,rtyp * rbuf,::zp::sz const num) noexcept -> bool { +template<typename ltyp,typename rtyp> constexpr auto zp::equ(ltyp * lbuf,rtyp * rbuf,::zp::siz const num) noexcept -> bool { ltyp const * const stp = lbuf+num; while (lbuf != stp) { diff --git a/zp/include/zp/mem.d/fil.ii b/zp/include/zp/mem.d/fil.ii index be5d2d0..36ae1a0 100644 --- a/zp/include/zp/mem.d/fil.ii +++ b/zp/include/zp/mem.d/fil.ii @@ -4,7 +4,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename buftyp,typename valtyp> constexpr auto zp::fil(buftyp * buf,valtyp & val,::zp::sz const num) noexcept -> buftyp * { +template<typename buftyp,typename valtyp> constexpr auto zp::fil(buftyp * buf,valtyp & val,::zp::siz const num) noexcept -> buftyp * { buftyp * const stp = buf+num; while (buf != stp) {*buf++ = val;} diff --git a/zp/include/zp/mem.d/memcpy.ii b/zp/include/zp/mem.d/memcpy.ii index 6ec99bc..6e1f6cb 100644 --- a/zp/include/zp/mem.d/memcpy.ii +++ b/zp/include/zp/mem.d/memcpy.ii @@ -4,7 +4,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename dsttyp,typename srctyp> zp_nthrw inline ::zp::cpyres<dsttyp,srctyp> zp::memcpy(dsttyp * dst,srctyp const * src,::zp::sz const num) { +template<typename dsttyp,typename srctyp> zp_nthrw inline ::zp::cpyres<dsttyp,srctyp> zp::memcpy(dsttyp * dst,srctyp const * src,::zp::siz const num) { ::zp_cpyres const cpyres = ::zp_memcpy(dst,src,num); ::zp::cpyres<dsttyp,srctyp> res = { diff --git a/zp/include/zp/mem.d/srh.ii b/zp/include/zp/mem.d/srh.ii index acef311..8582dd7 100644 --- a/zp/include/zp/mem.d/srh.ii +++ b/zp/include/zp/mem.d/srh.ii @@ -4,7 +4,7 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename buftyp,typename valtyp> constexpr auto zp::srh(buftyp * buf,valtyp & val,::zp::sz const num) noexcept -> buftyp * { +template<typename buftyp,typename valtyp> constexpr auto zp::srh(buftyp * buf,valtyp & val,::zp::siz const num) noexcept -> buftyp * { buftyp * const stp = buf+num; while (buf != stp) { diff --git a/zp/include/zp/mem.h b/zp/include/zp/mem.h index fb5aaae..c51fd98 100644 --- a/zp/include/zp/mem.h +++ b/zp/include/zp/mem.h @@ -16,10 +16,10 @@ struct zp_cpyres { void * src; }; -zp_nthrw struct zp_cpyres zp_memcpy(void * dst, void const * src, zp_sz num); -zp_nthrw zp_useres bool zp_memequ(void const * lbuf,void const * rbuf,zp_sz num); -zp_nthrw void * zp_memfil(void * dst, char unsigned val, zp_sz num); -zp_nthrw zp_useres void * zp_memsrh(void const * buf, char unsigned val, zp_sz num); +zp_nthrw struct zp_cpyres zp_memcpy(void * dst, void const * src, zp_siz num); +zp_nthrw zp_useres bool zp_memequ(void const * lbuf,void const * rbuf,zp_siz num); +zp_nthrw void * zp_memfil(void * dst, char unsigned val, zp_siz num); +zp_nthrw zp_useres void * zp_memsrh(void const * buf, char unsigned val, zp_siz num); zp_prv_cdeclend diff --git a/zp/include/zp/prv/int.h b/zp/include/zp/prv/int.h index 1601dc4..87d7166 100644 --- a/zp/include/zp/prv/int.h +++ b/zp/include/zp/prv/int.h @@ -48,7 +48,7 @@ intptr uintptr_t ptrdif ptrdiff_t - sz size_t + siz size_t Unlike ISO C, we guarantee all of these generic types to be present. @@ -74,7 +74,7 @@ #define zp_maxvalll ((long long) +0x7FFFFFFFFFFFFFFFll) #define zp_minvalp ((zp_intptr)+0x0u) -#define zp_minvalz ((zp_sz) +0x0u) +#define zp_minvalz ((zp_siz) +0x0u) #define zp_fixint8 (0x1) #define zp_minvali8 zp_minvalcu @@ -233,8 +233,8 @@ zp_prv_ext typedef __int128 zp_i08s; #define zp_maxvalp ((zp_intptr)+0xFFFFFFFFFFFFFFFFu) typedef __int64 unsigned zp_intptr; -#define zp_maxvalz ((zp_sz)+0xFFFFFFFFFFFFFFFFu) -typedef __int64 unsigned zp_sz; +#define zp_maxvalz ((zp_siz)+0xFFFFFFFFFFFFFFFFu) +typedef __int64 unsigned zp_siz; #elif \ zp_std_c99 @@ -243,8 +243,8 @@ typedef __int64 unsigned zp_sz; #define zp_maxvalp ((zp_intptr)+zp_maxvalllu) typedef long long unsigned zp_intptr; -#define zp_maxvalz ((zp_sz)+zp_maxvalllu) -typedef long long unsigned zp_sz; +#define zp_maxvalz ((zp_siz)+zp_maxvalllu) +typedef long long unsigned zp_siz; #else #error unable to implement types: calling convention uses long long, but no equivalent is supported @@ -259,7 +259,7 @@ typedef long unsigned zp_intptr; typedef unsigned zp_intptrdif; #define zp_maxvalz zp_maxvallu -typedef long unsigned zp_sz; +typedef long unsigned zp_siz; #endif @@ -271,6 +271,6 @@ typedef long unsigned zp_sz; typedef int unsigned zp_intptr; #define zp_maxvalz zp_maxvaliu -typedef int unsigned zp_sz; +typedef int unsigned zp_siz; #endif diff --git a/zp/include/zp/str b/zp/include/zp/str index 2ca7b21..44953f6 100644 --- a/zp/include/zp/str +++ b/zp/include/zp/str @@ -12,34 +12,34 @@ namespace zp { namespace prv { - template<typename typ> zp_nthrw zp_useres ::zp::sz numdig(typ val,::zp::i8m bs); + template<typename typ> zp_nthrw zp_useres ::zp::siz numdig(typ val,::zp::i8m bs); } - zp_iln zp_nthrw inline ::zp::sz strcpy(char * dst, char const * src) {return ::zp_strcpy(dst,src);} + zp_iln zp_nthrw inline ::zp::siz strcpy(char * dst, char const * src) {return ::zp_strcpy(dst,src);} zp_iln zp_nthrw zp_useres inline bool strequ(char const * lstr,char const * rstr) {return ::zp_strequ(lstr,rstr);} - zp_iln zp_nthrw zp_useres inline ::zp::sz strfil(char * str,char chr) {return ::zp_strfil(str,chr);} - zp_iln zp_nthrw inline ::zp::sz strlen(char const * str) {return ::zp_strlen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz strfil(char * str,char chr) {return ::zp_strfil(str,chr);} + zp_iln zp_nthrw inline ::zp::siz strlen(char const * str) {return ::zp_strlen(str);} zp_iln zp_nthrw zp_useres inline char * strsrh(char * str, char chr) {return ::zp_strsrh(str,chr);} zp_iln zp_nthrw zp_useres inline char const * strsrh(char const * str, char chr) {return const_cast<char const *>(::zp_strsrh(str,chr));} - zp_iln zp_nthrw inline ::zp::sz wstrcpy(wchar_t * dst, wchar_t const * src) {return ::zp_wstrcpy(dst,src);} + zp_iln zp_nthrw inline ::zp::siz wstrcpy(wchar_t * dst, wchar_t const * src) {return ::zp_wstrcpy(dst,src);} zp_iln zp_nthrw zp_useres inline bool wstrequ(wchar_t const * lstr,wchar_t const * rstr) {return ::zp_wstrequ(lstr,rstr);} - zp_iln zp_nthrw zp_useres inline ::zp::sz wstrfil(wchar_t * str,wchar_t chr) {return ::zp_wstrfil(str,chr);} - zp_iln zp_nthrw inline ::zp::sz wstrlen(wchar_t const * str) {return ::zp_wstrlen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz wstrfil(wchar_t * str,wchar_t chr) {return ::zp_wstrfil(str,chr);} + zp_iln zp_nthrw inline ::zp::siz wstrlen(wchar_t const * str) {return ::zp_wstrlen(str);} zp_iln zp_nthrw zp_useres inline wchar_t * wstrsrh(wchar_t * str, wchar_t chr) {return ::zp_wstrsrh(str,chr);} zp_iln zp_nthrw zp_useres inline wchar_t const * wstrsrh(wchar_t const * str, wchar_t chr) {return const_cast<wchar_t const *>(::zp_wstrsrh(str,chr));} - zp_iln zp_nthrw inline ::zp::sz utf32cpy(::zp::c02 * dst, ::zp::c02 const * src) {return ::zp_utf32cpy(dst,src);} + zp_iln zp_nthrw inline ::zp::siz utf32cpy(::zp::c02 * dst, ::zp::c02 const * src) {return ::zp_utf32cpy(dst,src);} zp_iln zp_nthrw zp_useres inline bool utf32equ(::zp::c02 const * lstr,::zp::c02 const * rstr) {return ::zp_utf32equ(lstr,rstr);} - zp_iln zp_nthrw zp_useres inline ::zp::sz utf32fil(::zp::c02 * str, ::zp::c02 chr) {return ::zp_utf32fil(str,chr);} - zp_iln zp_nthrw inline ::zp::sz utf32len(::zp::c02 const * str) {return ::zp_utf32len(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz utf32fil(::zp::c02 * str, ::zp::c02 chr) {return ::zp_utf32fil(str,chr);} + zp_iln zp_nthrw inline ::zp::siz utf32len(::zp::c02 const * str) {return ::zp_utf32len(str);} zp_iln zp_nthrw zp_useres inline ::zp::c02 * utf32srh(::zp::c02 * str, ::zp::c02 chr) {return ::zp_utf32srh(str,chr);} zp_iln zp_nthrw zp_useres inline ::zp::c02 const * utf32srh(::zp::c02 const * str, ::zp::c02 chr) {return const_cast< ::zp::c02 const *>(::zp_utf32srh(str,chr));} - zp_iln zp_nthrw zp_useres inline ::zp::sz utf8enclen( ::zp::c02 const * str) {return ::zp_utf8enclen(str);} - zp_iln zp_nthrw zp_useres inline ::zp::sz utf8declen( ::zp::c8 const * str) {return ::zp_utf8declen(str);} - zp_iln zp_nthrw zp_useres inline ::zp::sz utf16enclen(::zp::c02 const * str) {return ::zp_utf16enclen(str);} - zp_iln zp_nthrw zp_useres inline ::zp::sz utf16declen(::zp::c01 const * str) {return ::zp_utf16declen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz utf8enclen( ::zp::c02 const * str) {return ::zp_utf8enclen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz utf8declen( ::zp::c8 const * str) {return ::zp_utf8declen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz utf16enclen(::zp::c02 const * str) {return ::zp_utf16enclen(str);} + zp_iln zp_nthrw zp_useres inline ::zp::siz utf16declen(::zp::c01 const * str) {return ::zp_utf16declen(str);} zp_iln zp_nthrw inline void utf8enc( ::zp::c8 * dst,::zp::c02 const * src) {return ::zp_utf8enc(dst,src);} zp_iln zp_nthrw inline void utf8dec( ::zp::c02 * dst,::zp::c8 const * src) {return ::zp_utf8dec(dst,src);} @@ -48,7 +48,7 @@ namespace zp { zp_iln zp_nthrw inline void win1252enc(::zp::c8 * dst,::zp::c02 const * src) {return ::zp_win1252enc(dst,src);} zp_iln zp_nthrw inline void win1252dec(::zp::c02 * dst,::zp::c8 const * src) {return ::zp_win1252dec(dst,src);} - //template<typename typ> zp_nthrw zp_useres ::zp::sz fmtlen(typ val,::zp::i8m bs); /* Including (potential) decorations. */ + //template<typename typ> zp_nthrw zp_useres ::zp::siz fmtlen(typ val,::zp::i8m bs); /* Including (potential) decorations. */ //template<typename typ> zp_nthrw void fmt(::zp::c02 * buf,typ val,::zp::i8m bs,bool rtl = false); } diff --git a/zp/include/zp/str.d/fmt.ii b/zp/include/zp/str.d/fmt.ii index 116d487..59d6191 100644 --- a/zp/include/zp/str.d/fmt.ii +++ b/zp/include/zp/str.d/fmt.ii @@ -20,10 +20,10 @@ template<typename sgntyp> constexpr auto zp::fmt(::zp::c02 * buf,sgntyp sgnval,: if (rtl) { buf += ::zp::prv::numdig(val,bs)-0x1u; - for (;val > 0x0u;val /= bs) *buf-- = digs[static_cast< ::zp::sz>(val % static_cast<typ>(bs))]; + for (;val > 0x0u;val /= bs) *buf-- = digs[static_cast< ::zp::siz>(val % static_cast<typ>(bs))]; return; } - for (;val > 0x0u;val /= bs) *buf++ = digs[static_cast< ::zp::sz>(val % static_cast<typ>(bs))]; + for (;val > 0x0u;val /= bs) *buf++ = digs[static_cast< ::zp::siz>(val % static_cast<typ>(bs))]; } diff --git a/zp/include/zp/str.d/fmtlen.ii b/zp/include/zp/str.d/fmtlen.ii index 3d47ce9..955b7ad 100644 --- a/zp/include/zp/str.d/fmtlen.ii +++ b/zp/include/zp/str.d/fmtlen.ii @@ -4,10 +4,10 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename typ> constexpr auto zp::fmtlen(typ val,::zp::i8m const bs) noexcept -> ::zp::sz { +template<typename typ> constexpr auto zp::fmtlen(typ val,::zp::i8m const bs) noexcept -> ::zp::siz { static_assert(::zp::isint<typ>::val,"type must be an integral type"); - ::zp::sz len = 0x0u; + ::zp::siz len = 0x0u; if (val < typ {0x0}) { val = typ {0x0}-val; diff --git a/zp/include/zp/str.d/numdig.ii b/zp/include/zp/str.d/numdig.ii index a90bb7a..c3d93da 100644 --- a/zp/include/zp/str.d/numdig.ii +++ b/zp/include/zp/str.d/numdig.ii @@ -4,12 +4,12 @@ If a copy of the MPL was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0>. */ -template<typename typ> zp_nthrw ::zp::sz zp::prv::numdig(typ fmtval,::zp::i8m const bs) { +template<typename typ> zp_nthrw ::zp::siz zp::prv::numdig(typ fmtval,::zp::i8m const bs) { //static_assert(::zp::isint<typ>::val,"type must be an integral type"); if (fmtval == typ (0x0)) return 0x1u; - ::zp::sz len = 0x0u; + ::zp::siz len = 0x0u; for (typ val = fmtval;val > typ (0x0);val /= static_cast<typ>(bs)) {++len;} diff --git a/zp/include/zp/str.h b/zp/include/zp/str.h index d48a882..68f84b5 100644 --- a/zp/include/zp/str.h +++ b/zp/include/zp/str.h @@ -11,28 +11,28 @@ zp_prv_cdecl -zp_nthrw zp_sz zp_strcpy(char * dst, char const * src); +zp_nthrw zp_siz zp_strcpy(char * dst, char const * src); zp_nthrw zp_useres bool zp_strequ(char const * lstr,char const * rstr); -zp_nthrw zp_sz zp_strfil(char * str, char chr); -zp_nthrw zp_sz zp_strlen(char const * str); +zp_nthrw zp_siz zp_strfil(char * str, char chr); +zp_nthrw zp_siz zp_strlen(char const * str); zp_nthrw char * zp_strsrh(char const * str, char chr); -zp_nthrw zp_sz zp_wstrcpy(zp_wchr * dst, zp_wchr const * src); +zp_nthrw zp_siz zp_wstrcpy(zp_wchr * dst, zp_wchr const * src); zp_nthrw zp_useres bool zp_wstrequ(zp_wchr const * lstr,zp_wchr const * rstr); -zp_nthrw zp_sz zp_wstrfil(zp_wchr * str, zp_wchr chr); -zp_nthrw zp_sz zp_wstrlen(zp_wchr const * str); +zp_nthrw zp_siz zp_wstrfil(zp_wchr * str, zp_wchr chr); +zp_nthrw zp_siz zp_wstrlen(zp_wchr const * str); zp_nthrw zp_wchr * zp_wstrsrh(zp_wchr const * str, zp_wchr chr); -zp_nthrw zp_sz zp_utf32cpy(zp_c02 * dst, zp_c02 const * src); +zp_nthrw zp_siz zp_utf32cpy(zp_c02 * dst, zp_c02 const * src); zp_nthrw zp_useres bool zp_utf32equ(zp_c02 const * lstr,zp_c02 const * rstr); -zp_nthrw zp_sz zp_utf32fil(zp_c02 * str, zp_c02 chr); -zp_nthrw zp_sz zp_utf32len(zp_c02 const * str); +zp_nthrw zp_siz zp_utf32fil(zp_c02 * str, zp_c02 chr); +zp_nthrw zp_siz zp_utf32len(zp_c02 const * str); zp_nthrw zp_c02 * zp_utf32srh(zp_c02 const * str, zp_c02 chr); -zp_nthrw zp_useres zp_sz zp_utf8enclen( zp_c02 const * str); -zp_nthrw zp_useres zp_sz zp_utf8declen( zp_c8 const * str); -zp_nthrw zp_useres zp_sz zp_utf16enclen(zp_c02 const * str); -zp_nthrw zp_useres zp_sz zp_utf16declen(zp_c01 const * str); +zp_nthrw zp_useres zp_siz zp_utf8enclen( zp_c02 const * str); +zp_nthrw zp_useres zp_siz zp_utf8declen( zp_c8 const * str); +zp_nthrw zp_useres zp_siz zp_utf16enclen(zp_c02 const * str); +zp_nthrw zp_useres zp_siz zp_utf16declen(zp_c01 const * str); zp_nthrw void zp_utf8enc( zp_c8 * dst,zp_c02 const * src); zp_nthrw void zp_utf8dec( zp_c02 * dst,zp_c8 const * src); @@ -41,17 +41,17 @@ zp_nthrw void zp_utf16dec( zp_c02 * dst,zp_c01 const * src); zp_nthrw void zp_win1252enc(zp_c8 * dst,zp_c02 const * src); zp_nthrw void zp_win1252dec(zp_c02 * dst,zp_c8 const * src); -zp_nthrw zp_useres zp_sz zp_fmtleni( int val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenl( long val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlens( short val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlensc( char signed val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenuc( char unsigned val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenui( int unsigned val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenul( long unsigned val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenus( short unsigned val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtleni( int val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenl( long val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlens( short val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlensc( char signed val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenuc( char unsigned val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenui( int unsigned val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenul( long unsigned val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenus( short unsigned val,zp_i8m bs); #if zp_std_c99 || zp_std_cxx11 -zp_nthrw zp_useres zp_sz zp_fmtlenll( long long val,zp_i8m bs); -zp_nthrw zp_useres zp_sz zp_fmtlenull(long long unsigned val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenll( long long val,zp_i8m bs); +zp_nthrw zp_useres zp_siz zp_fmtlenull(long long unsigned val,zp_i8m bs); #endif zp_nthrw void zp_fmti( zp_c02 * buf,int val,zp_i8m bs,bool rtl); diff --git a/zp/source/any/mem/memcpy.c b/zp/source/any/mem/memcpy.c index ea3895e..3a20ca1 100644 --- a/zp/source/any/mem/memcpy.c +++ b/zp/source/any/mem/memcpy.c @@ -6,7 +6,7 @@ #include <zp/mem.h> -zp_nthrw struct zp_cpyres zp_memcpy(void * const dstptr,void const * const srcptr,zp_sz const num) { +zp_nthrw struct zp_cpyres zp_memcpy(void * const dstptr,void const * const srcptr,zp_siz const num) { struct zp_cpyres res; char unsigned * dst = dstptr; diff --git a/zp/source/any/mem/memequ.c b/zp/source/any/mem/memequ.c index 52108c4..57d023c 100644 --- a/zp/source/any/mem/memequ.c +++ b/zp/source/any/mem/memequ.c @@ -6,7 +6,7 @@ #include <zp/mem.h> -bool zp_memequ(void const * const lbufptr,void const * const rbufptr,zp_sz const num) { +bool zp_memequ(void const * const lbufptr,void const * const rbufptr,zp_siz const num) { char unsigned const * lbuf = lbufptr; char unsigned const * rbuf = rbufptr; diff --git a/zp/source/any/mem/memfil.c b/zp/source/any/mem/memfil.c index fd53999..2deb660 100644 --- a/zp/source/any/mem/memfil.c +++ b/zp/source/any/mem/memfil.c @@ -6,7 +6,7 @@ #include <zp/mem.h> -void * zp_memfil(void * const bufptr,char unsigned const val,zp_sz const num) { +void * zp_memfil(void * const bufptr,char unsigned const val,zp_siz const num) { char unsigned * buf = bufptr; char unsigned * const stp = buf+num; diff --git a/zp/source/any/mem/memsrh.c b/zp/source/any/mem/memsrh.c index c3e6a3c..e85b229 100644 --- a/zp/source/any/mem/memsrh.c +++ b/zp/source/any/mem/memsrh.c @@ -6,7 +6,7 @@ #include <zp/mem.h> -void * zp_memsrh(void const * const bufptr,char unsigned const val,zp_sz const num) { +void * zp_memsrh(void const * const bufptr,char unsigned const val,zp_siz const num) { char unsigned const * buf = bufptr; char unsigned const * const stp = buf+num; diff --git a/zp/source/any/str/fmtlen.cc b/zp/source/any/str/fmtlen.cc index 3c85561..4306877 100644 --- a/zp/source/any/str/fmtlen.cc +++ b/zp/source/any/str/fmtlen.cc @@ -8,14 +8,14 @@ #include <zp/str> /* extern "C" { - zp_nthrw auto zp_fmtleni( int const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenl( long const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenll( long long const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlens( short const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlensc( char signed const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenuc( char unsigned const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenui( int unsigned const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenul( long unsigned const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenull(long long unsigned const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} - zp_nthrw auto zp_fmtlenus( short unsigned const val,::zp::i8m const bs) -> ::zp::sz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtleni( int const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenl( long const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenll( long long const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlens( short const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlensc( char signed const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenuc( char unsigned const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenui( int unsigned const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenul( long unsigned const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenull(long long unsigned const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} + zp_nthrw auto zp_fmtlenus( short unsigned const val,::zp::i8m const bs) -> ::zp::siz {return ::zp::fmtlen(val,bs);} } */ diff --git a/zp/source/any/str/strcpy.cc b/zp/source/any/str/strcpy.cc index 50bbee4..ca23353 100644 --- a/zp/source/any/str/strcpy.cc +++ b/zp/source/any/str/strcpy.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_strcpy(char * const dst,char const * const src) { +extern "C" zp_nthrw ::zp::siz zp_strcpy(char * const dst,char const * const src) { return ::zp::det::strcpy(dst,src); } diff --git a/zp/source/any/str/strlen.cc b/zp/source/any/str/strlen.cc index 33c2cdd..074cb4b 100644 --- a/zp/source/any/str/strlen.cc +++ b/zp/source/any/str/strlen.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_strlen(char const * const str) { +extern "C" zp_nthrw ::zp::siz zp_strlen(char const * const str) { return ::zp::det::strlen(str); } diff --git a/zp/source/any/str/utf16declen.c b/zp/source/any/str/utf16declen.c index 5260be7..f40aab0 100644 --- a/zp/source/any/str/utf16declen.c +++ b/zp/source/any/str/utf16declen.c @@ -6,8 +6,8 @@ #include <zp/str.h> -zp_sz zp_utf16declen(zp_c01 const * str) { - zp_sz len = 0x0u; +zp_siz zp_utf16declen(zp_c01 const * str) { + zp_siz len = 0x0u; for (;;++len) { zp_c01 const hex = *str; diff --git a/zp/source/any/str/utf16enclen.c b/zp/source/any/str/utf16enclen.c index 5e4ec64..3f50519 100644 --- a/zp/source/any/str/utf16enclen.c +++ b/zp/source/any/str/utf16enclen.c @@ -6,8 +6,8 @@ #include <zp/str.h> -zp_sz zp_utf16enclen(zp_c02 const * str) { - zp_sz len = 0x0u; +zp_siz zp_utf16enclen(zp_c02 const * str) { + zp_siz len = 0x0u; for (;;++str) { zp_c02 const chr = *str; diff --git a/zp/source/any/str/utf32cpy.cc b/zp/source/any/str/utf32cpy.cc index 3650550..57836cb 100644 --- a/zp/source/any/str/utf32cpy.cc +++ b/zp/source/any/str/utf32cpy.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_utf32cpy(::zp::c02 * const dst,::zp::c02 const * const src) { +extern "C" zp_nthrw ::zp::siz zp_utf32cpy(::zp::c02 * const dst,::zp::c02 const * const src) { return ::zp::det::strcpy(dst,src); } diff --git a/zp/source/any/str/utf32len.cc b/zp/source/any/str/utf32len.cc index 665f965..c79bb10 100644 --- a/zp/source/any/str/utf32len.cc +++ b/zp/source/any/str/utf32len.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_utf32len(::zp::c02 const * const str) { +extern "C" zp_nthrw ::zp::siz zp_utf32len(::zp::c02 const * const str) { return ::zp::det::strlen(str); } diff --git a/zp/source/any/str/utf8declen.c b/zp/source/any/str/utf8declen.c index 35b94d3..bde4a74 100644 --- a/zp/source/any/str/utf8declen.c +++ b/zp/source/any/str/utf8declen.c @@ -6,8 +6,8 @@ #include <zp/str.h> -zp_sz zp_utf8declen(zp_c8 const * str) { - zp_sz len = 0x0u; +zp_siz zp_utf8declen(zp_c8 const * str) { + zp_siz len = 0x0u; for (;;++len) { zp_c8 const oct = *str; diff --git a/zp/source/any/str/utf8enclen.c b/zp/source/any/str/utf8enclen.c index 5092efb..c580027 100644 --- a/zp/source/any/str/utf8enclen.c +++ b/zp/source/any/str/utf8enclen.c @@ -6,8 +6,8 @@ #include <zp/str.h> -zp_sz zp_utf8enclen(zp_c02 const * str) { - zp_sz len = 0x0u; +zp_siz zp_utf8enclen(zp_c02 const * str) { + zp_siz len = 0x0u; for (;;++str) { zp_c02 const chr = *str; diff --git a/zp/source/any/str/wstrcpy.cc b/zp/source/any/str/wstrcpy.cc index 64b51f0..8b5949d 100644 --- a/zp/source/any/str/wstrcpy.cc +++ b/zp/source/any/str/wstrcpy.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_wstrcpy(::zp::wchr * const dst,::zp::wchr const * const src) { +extern "C" zp_nthrw ::zp::siz zp_wstrcpy(::zp::wchr * const dst,::zp::wchr const * const src) { return ::zp::det::strcpy(dst,src); } diff --git a/zp/source/any/str/wstrlen.cc b/zp/source/any/str/wstrlen.cc index cf18fff..f2ef808 100644 --- a/zp/source/any/str/wstrlen.cc +++ b/zp/source/any/str/wstrlen.cc @@ -6,6 +6,6 @@ #include <zp/prv> -extern "C" zp_nthrw ::zp::sz zp_wstrlen(::zp::wchr const * const str) { +extern "C" zp_nthrw ::zp::siz zp_wstrlen(::zp::wchr const * const str) { return ::zp::det::strlen(str); } |