Move static tables to namespace scope

vitaut · vitaut · commit b35b64a2ba63 · 2026-02-08T15:33:38.000-08:00
diff --git a/zmij.cc b/zmij.cc
@@ -341,6 +341,49 @@ constexpr auto floor_log2_pow10(int e) noexcept -> int {
   return e * 1741647 >> 19;
 }
 
+constexpr uint64_t pow10s[] = {
+    0x8000000000000000, 0xa000000000000000, 0xc800000000000000,
+    0xfa00000000000000, 0x9c40000000000000, 0xc350000000000000,
+    0xf424000000000000, 0x9896800000000000, 0xbebc200000000000,
+    0xee6b280000000000, 0x9502f90000000000, 0xba43b74000000000,
+    0xe8d4a51000000000, 0x9184e72a00000000, 0xb5e620f480000000,
+    0xe35fa931a0000000, 0x8e1bc9bf04000000, 0xb1a2bc2ec5000000,
+    0xde0b6b3a76400000, 0x8ac7230489e80000, 0xad78ebc5ac620000,
+    0xd8d726b7177a8000, 0x878678326eac9000, 0xa968163f0a57b400,
+    0xd3c21bcecceda100, 0x84595161401484a0, 0xa56fa5b99019a5c8,
+    0xcecb8f27f4200f3a,
+};
+constexpr uint128 high_parts[] = {
+    {0xaf8e5410288e1b6f, 0x07ecf0ae5ee44dda},
+    {0xb1442798f49ffb4a, 0x99cd11cfdf41779d},
+    {0xb2fe3f0b8599ef07, 0x861fa7e6dcb4aa15},
+    {0xb4bca50b065abe63, 0x0fed077a756b53aa},
+    {0xb67f6455292cbf08, 0x1a3bc84c17b1d543},
+    {0xb84687c269ef3bfb, 0x3d5d514f40eea742},
+    {0xba121a4650e4ddeb, 0x92f34d62616ce413},
+    {0xbbe226efb628afea, 0x890489f70a55368c},
+    {0xbdb6b8e905cb600f, 0x5400e987bbc1c921},
+    {0xbf8fdb78849a5f96, 0xde98520472bdd034},
+    {0xc16d9a0095928a27, 0x75b7053c0f178294},
+    {0xc350000000000000, 0x0000000000000000},
+    {0xc5371912364ce305, 0x6c28000000000000},
+    {0xc722f0ef9d80aad6, 0x424d3ad2b7b97ef6},
+    {0xc913936dd571c84c, 0x03bc3a19cd1e38ea},
+    {0xcb090c8001ab551c, 0x5cadf5bfd3072cc6},
+    {0xcd036837130890a1, 0x36dba887c37a8c10},
+    {0xcf02b2c21207ef2e, 0x94f967e45e03f4bc},
+    {0xd106f86e69d785c7, 0xe13336d701beba52},
+    {0xd31045a8341ca07c, 0x1ede48111209a051},
+    {0xd51ea6fa85785631, 0x552a74227f3ea566},
+    {0xd732290fbacaf133, 0xa97c177947ad4096},
+    {0xd94ad8b1c7380874, 0x18375281ae7822bc},
+};
+constexpr uint32_t fixups[] = {0x05271b1f, 0x00000c20, 0x00003200, 0x12100020,
+                               0x00000000, 0x06000000, 0xc16409c0, 0xaf26700f,
+                               0xeb987b07, 0x0000000d, 0x00000000, 0x66fbfffe,
+                               0xb74100ec, 0xa0669fe8, 0xedb21280, 0x00000686,
+                               0x0a021200, 0x29b89c20, 0x08bc0eda, 0x00000000};
+
 // 128-bit significands of powers of 10 rounded down.
 struct pow10_significands_table {
   static constexpr bool compress = ZMIJ_OPTIMIZE_SIZE != 0;
@@ -350,51 +393,6 @@ struct pow10_significands_table {
 
   // Computes the 128-bit significand of 10**i using method by Dougall Johnson.
   static constexpr auto compute(unsigned i) noexcept -> uint128 {
-    constexpr uint64_t pow10s[28] = {
-        0x8000000000000000, 0xa000000000000000, 0xc800000000000000,
-        0xfa00000000000000, 0x9c40000000000000, 0xc350000000000000,
-        0xf424000000000000, 0x9896800000000000, 0xbebc200000000000,
-        0xee6b280000000000, 0x9502f90000000000, 0xba43b74000000000,
-        0xe8d4a51000000000, 0x9184e72a00000000, 0xb5e620f480000000,
-        0xe35fa931a0000000, 0x8e1bc9bf04000000, 0xb1a2bc2ec5000000,
-        0xde0b6b3a76400000, 0x8ac7230489e80000, 0xad78ebc5ac620000,
-        0xd8d726b7177a8000, 0x878678326eac9000, 0xa968163f0a57b400,
-        0xd3c21bcecceda100, 0x84595161401484a0, 0xa56fa5b99019a5c8,
-        0xcecb8f27f4200f3a,
-    };
-
-    constexpr uint128 high_parts[23] = {
-        {0xaf8e5410288e1b6f, 0x07ecf0ae5ee44dda},
-        {0xb1442798f49ffb4a, 0x99cd11cfdf41779d},
-        {0xb2fe3f0b8599ef07, 0x861fa7e6dcb4aa15},
-        {0xb4bca50b065abe63, 0x0fed077a756b53aa},
-        {0xb67f6455292cbf08, 0x1a3bc84c17b1d543},
-        {0xb84687c269ef3bfb, 0x3d5d514f40eea742},
-        {0xba121a4650e4ddeb, 0x92f34d62616ce413},
-        {0xbbe226efb628afea, 0x890489f70a55368c},
-        {0xbdb6b8e905cb600f, 0x5400e987bbc1c921},
-        {0xbf8fdb78849a5f96, 0xde98520472bdd034},
-        {0xc16d9a0095928a27, 0x75b7053c0f178294},
-        {0xc350000000000000, 0x0000000000000000},
-        {0xc5371912364ce305, 0x6c28000000000000},
-        {0xc722f0ef9d80aad6, 0x424d3ad2b7b97ef6},
-        {0xc913936dd571c84c, 0x03bc3a19cd1e38ea},
-        {0xcb090c8001ab551c, 0x5cadf5bfd3072cc6},
-        {0xcd036837130890a1, 0x36dba887c37a8c10},
-        {0xcf02b2c21207ef2e, 0x94f967e45e03f4bc},
-        {0xd106f86e69d785c7, 0xe13336d701beba52},
-        {0xd31045a8341ca07c, 0x1ede48111209a051},
-        {0xd51ea6fa85785631, 0x552a74227f3ea566},
-        {0xd732290fbacaf133, 0xa97c177947ad4096},
-        {0xd94ad8b1c7380874, 0x18375281ae7822bc},
-    };
-
-    constexpr uint32_t fixups[20] = {
-        0x05271b1f, 0x00000c20, 0x00003200, 0x12100020, 0x00000000,
-        0x06000000, 0xc16409c0, 0xaf26700f, 0xeb987b07, 0x0000000d,
-        0x00000000, 0x66fbfffe, 0xb74100ec, 0xa0669fe8, 0xedb21280,
-        0x00000686, 0x0a021200, 0x29b89c20, 0x08bc0eda, 0x00000000};
-
     uint64_t m = pow10s[(i + 11) % 28];
     uint128 h = high_parts[(i + 11) / 28];
 
