1 files changed, 60 insertions, 60 deletions
diff --git a/test.cc b/test.cc
index 7d4799e..baf0c5e 100644
--- a/test.cc
+++ b/test.cc
@@ -13,54 +13,54 @@ int main(void) {
 ::std::fprintf(stderr,"fast: %s\n",::zap_fastimpl ? "yes" : "no");
 ::std::fprintf(stderr,"\n");
 {
- constexpr auto arrsz {zap_typlit_usz(0x8)};
- ::std::uint_least64_t arr0[arrsz] {zap_typlit_u40(0x0)};
- ::zap_memfill(arr0,arrsz * sizeof (::std::uint_least64_t),zap_typlit_u8(0x0));
- ::std::fprintf(stderr,"arr0[0]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x0)]);
- ::std::fprintf(stderr,"arr0[1]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x1)]);
- ::std::fprintf(stderr,"arr0[2]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x2)]);
- ::std::fprintf(stderr,"arr0[3]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x3)]);
- ::std::fprintf(stderr,"arr0[4]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x4)]);
- ::std::fprintf(stderr,"arr0[5]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x5)]);
- ::std::fprintf(stderr,"arr0[6]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x6)]);
- assert(arr0[zap_typlit_usz(0x0)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x1)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x2)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x3)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x4)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x5)] == zap_typlit_u40(0x0));
- assert(arr0[zap_typlit_usz(0x6)] == zap_typlit_u40(0x0));
- ::zap_memfill(arr0,arrsz * sizeof (::std::uint_least64_t),zap_typlit_u8(0x7F));
- ::std::fprintf(stderr,"arr0[0]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x0)]);
- ::std::fprintf(stderr,"arr0[1]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x1)]);
- ::std::fprintf(stderr,"arr0[2]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x2)]);
- ::std::fprintf(stderr,"arr0[3]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x3)]);
- ::std::fprintf(stderr,"arr0[4]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x4)]);
- ::std::fprintf(stderr,"arr0[5]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x5)]);
- ::std::fprintf(stderr,"arr0[6]: %" PRIX64 "\n",arr0[zap_typlit_usz(0x6)]);
- assert(arr0[zap_typlit_usz(0x0)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x1)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x2)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x3)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x4)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x5)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- assert(arr0[zap_typlit_usz(0x6)] == zap_typlit_u40(0x7F7F7F7F7F7F7F7F));
- ::std::uint_least64_t arr1[arrsz] {zap_typlit_u40(0x0)};
+ constexpr ::std::size_t arrsz {0x8u};
+ ::std::uint_least64_t arr0[arrsz] {0x0u};
+ ::zap_memfill(arr0,arrsz * sizeof (::std::uint_least64_t),0x0u);
+ ::std::fprintf(stderr,"arr0[0]: %" PRIX64 "\n",arr0[0x0u]);
+ ::std::fprintf(stderr,"arr0[1]: %" PRIX64 "\n",arr0[0x1u]);
+ ::std::fprintf(stderr,"arr0[2]: %" PRIX64 "\n",arr0[0x2u]);
+ ::std::fprintf(stderr,"arr0[3]: %" PRIX64 "\n",arr0[0x3u]);
+ ::std::fprintf(stderr,"arr0[4]: %" PRIX64 "\n",arr0[0x4u]);
+ ::std::fprintf(stderr,"arr0[5]: %" PRIX64 "\n",arr0[0x5u]);
+ ::std::fprintf(stderr,"arr0[6]: %" PRIX64 "\n",arr0[0x6u]);
+ assert(arr0[0x0u] == 0x0u);
+ assert(arr0[0x1u] == 0x0u);
+ assert(arr0[0x2u] == 0x0u);
+ assert(arr0[0x3u] == 0x0u);
+ assert(arr0[0x4u] == 0x0u);
+ assert(arr0[0x5u] == 0x0u);
+ assert(arr0[0x6u] == 0x0u);
+ ::zap_memfill(arr0,arrsz * sizeof (::std::uint_least64_t),0x7Fu);
+ ::std::fprintf(stderr,"arr0[0]: %" PRIX64 "\n",arr0[0x0u]);
+ ::std::fprintf(stderr,"arr0[1]: %" PRIX64 "\n",arr0[0x1u]);
+ ::std::fprintf(stderr,"arr0[2]: %" PRIX64 "\n",arr0[0x2u]);
+ ::std::fprintf(stderr,"arr0[3]: %" PRIX64 "\n",arr0[0x3u]);
+ ::std::fprintf(stderr,"arr0[4]: %" PRIX64 "\n",arr0[0x4u]);
+ ::std::fprintf(stderr,"arr0[5]: %" PRIX64 "\n",arr0[0x5u]);
+ ::std::fprintf(stderr,"arr0[6]: %" PRIX64 "\n",arr0[0x6u]);
+ assert(arr0[0x0u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x1u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x2u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x3u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x4u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x5u] == 0x7F7F7F7F7F7F7F7Fu);
+ assert(arr0[0x6u] == 0x7F7F7F7F7F7F7F7Fu);
+ ::std::uint_least64_t arr1[arrsz] {0x0u};
 ::zap_memcpy(arr0,arrsz * sizeof (::std::uint_least64_t),arr1);
- ::std::fprintf(stderr,"arr1[0]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x0)]);
- ::std::fprintf(stderr,"arr1[1]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x1)]);
- ::std::fprintf(stderr,"arr1[2]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x2)]);
- ::std::fprintf(stderr,"arr1[3]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x3)]);
- ::std::fprintf(stderr,"arr1[4]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x4)]);
- ::std::fprintf(stderr,"arr1[5]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x5)]);
- ::std::fprintf(stderr,"arr1[6]: %" PRIX64 "\n",arr1[zap_typlit_usz(0x6)]);
- assert(arr1[zap_typlit_usz(0x0)] == arr0[zap_typlit_usz(0x0)]);
- assert(arr1[zap_typlit_usz(0x1)] == arr0[zap_typlit_usz(0x1)]);
- assert(arr1[zap_typlit_usz(0x2)] == arr0[zap_typlit_usz(0x2)]);
- assert(arr1[zap_typlit_usz(0x3)] == arr0[zap_typlit_usz(0x3)]);
- assert(arr1[zap_typlit_usz(0x4)] == arr0[zap_typlit_usz(0x4)]);
- assert(arr1[zap_typlit_usz(0x5)] == arr0[zap_typlit_usz(0x5)]);
- assert(arr1[zap_typlit_usz(0x6)] == arr0[zap_typlit_usz(0x6)]);
+ ::std::fprintf(stderr,"arr1[0]: %" PRIX64 "\n",arr1[0x0u]);
+ ::std::fprintf(stderr,"arr1[1]: %" PRIX64 "\n",arr1[0x1u]);
+ ::std::fprintf(stderr,"arr1[2]: %" PRIX64 "\n",arr1[0x2u]);
+ ::std::fprintf(stderr,"arr1[3]: %" PRIX64 "\n",arr1[0x3u]);
+ ::std::fprintf(stderr,"arr1[4]: %" PRIX64 "\n",arr1[0x4u]);
+ ::std::fprintf(stderr,"arr1[5]: %" PRIX64 "\n",arr1[0x5u]);
+ ::std::fprintf(stderr,"arr1[6]: %" PRIX64 "\n",arr1[0x6u]);
+ assert(arr1[0x0u] == arr0[0x0u]);
+ assert(arr1[0x1u] == arr0[0x1u]);
+ assert(arr1[0x2u] == arr0[0x2u]);
+ assert(arr1[0x3u] == arr0[0x3u]);
+ assert(arr1[0x4u] == arr0[0x4u]);
+ assert(arr1[0x5u] == arr0[0x5u]);
+ assert(arr1[0x6u] == arr0[0x6u]);
 auto const eq {::zap_memeq(arr1,arrsz,arr0)};
 ::std::fprintf(stderr,"eq: %u\n",eq);
 assert(eq);
@@ -71,7 +71,7 @@ int main(void) {
 ::std::fprintf(stderr,"str: \"%s\"\n",str);
 auto const strsz {::zap_strlen(str)};
 ::std::fprintf(stderr,"strsz: %zX\n",strsz);
- assert(strsz == zap_typlit_usz(0x1C));
+ assert(strsz == 0x1Cu);
 }
 ::std::fprintf(stderr,"\n");
 {
@@ -83,23 +83,23 @@ int main(void) {
 ::std::size_t pos1 = ::zap_fndbyte(str,len,(::std::uint_least8_t)' ');
 ::std::fprintf(stderr,"pos0: %zX\n",pos0);
 ::std::fprintf(stderr,"pos1: %zX\n",pos1);
- assert(pos0 == zap_typlit_usz(0x2));
+ assert(pos0 == 0x2u);
 assert(pos1 == pos0);
- str += pos0 + zap_typlit_usz(0x1);
+ str += pos0 + 0x1u;
 len = ::zap_strlen(str);
 pos0 = ::zap_fndchr(str,' ');
 pos1 = ::zap_fndbyte(str,len,(::std::uint_least8_t)' ');
 ::std::fprintf(stderr,"pos0: %zX\n",pos0);
 ::std::fprintf(stderr,"pos1: %zX\n",pos1);
- assert(pos0 == zap_typlit_usz(0x2));
+ assert(pos0 == 0x2u);
 assert(pos1 == pos0);
- str += pos0 + zap_typlit_usz(0x1);
+ str += pos0 + 0x1u;
 len = ::zap_strlen(str);
 pos0 = ::zap_fndchr(str,' ');
 pos1 = ::zap_fndbyte(str,len,(::std::uint_least8_t)' ');
 ::std::fprintf(stderr,"pos0: %zX\n",pos0);
 ::std::fprintf(stderr,"pos1: %zX\n",pos1);
- assert(pos0 == (::std::size_t)-0x1);
+ assert(pos0 == -0x1u);
 assert(pos1 == pos0);
 }
 ::std::fprintf(stderr,"\n");
@@ -125,7 +125,7 @@ int main(void) {
 char const str0[] = "What in the world are you doing?";
 ::std::fprintf(stderr,"str0: \"%s\"\n",str0);
 char str1[sizeof (str0)];
- assert(::zap_strcpy(str0,str1) == zap_typlit_usz(0x20));
+ assert(::zap_strcpy(str0,str1) == 0x20u);
 ::std::fprintf(stderr,"str1: \"%s\"\n",str1);
 assert(::zap_streq(str0,str1));
 }
@@ -148,12 +148,12 @@ int main(void) {
 ::std::fprintf(stderr,"cmp3: %i\n",cmp3);
 ::std::fprintf(stderr,"cmp4: %i\n",cmp4);
 ::std::fprintf(stderr,"cmp5: %i\n",cmp5);
- assert(cmp0 > zap_typlit_s8(0x0));
- assert(cmp1 == zap_typlit_s8(0x0));
- assert(cmp2 < zap_typlit_s8(0x0));
- assert(cmp3 > zap_typlit_s8(0x0));
- assert(cmp4 == zap_typlit_s8(0x0));
- assert(cmp5 < zap_typlit_s8(0x0));
+ assert(cmp0 > 0x0);
+ assert(cmp1 == 0x0);
+ assert(cmp2 < 0x0);
+ assert(cmp3 > 0x0);
+ assert(cmp4 == 0x0);
+ assert(cmp5 < 0x0);
 }
 ::std::fprintf(stderr,"\n");
 ::std::fprintf(stderr,"All tests have passed!\n");