Cpanel-JSON-XS: Update to 3.0237

rurban · rurban · commit 7412b39b2936 · 2017-07-28T12:14:23.000+02:00
Relax inf/nan detection for msvcrt.dll vs ucrt.dll runtime versions
(it's now almost ANSI).
We don't probe for the exact inf/nan stringifications in Makefile.PL,
so we try now all variants.
Hardcoding the compiler variant doesn't do it in some cases.
diff --git a/.git-rr-cache b/.git-rr-cache
@@ -1 +1 @@
-Subproject commit 43d4416acfaf4e195cad05d5c41799c674e20b68
+Subproject commit 8f9e0393a458b4df410b0f0dbbdbc9d1618cebe7
diff --git a/META.json b/META.json
@@ -142,5 +142,5 @@
       }
    },
    "version" : "5.027001c",
-   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0236"
+   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0237"
 }
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -437,7 +437,7 @@ package Maintainers;
     },
 
     'Cpanel::JSON::XS' => {
-        'DISTRIBUTION' => 'RURBAN/Cpanel-JSON-XS-3.0236.tar.gz',
+        'DISTRIBUTION' => 'RURBAN/Cpanel-JSON-XS-3.0237.tar.gz',
         'FILES'        => q[cpan/Cpanel-JSON-XS],
         'EXCLUDED'     => [
             '.appveyor.yml',
diff --git a/cpan/Cpanel-JSON-XS/XS.pm b/cpan/Cpanel-JSON-XS/XS.pm
@@ -1,5 +1,5 @@
 package Cpanel::JSON::XS;
-our $VERSION = '3.0236';
+our $VERSION = '3.0237';
 our $XS_VERSION = $VERSION;
 # $VERSION = eval $VERSION;
 
diff --git a/cpan/Cpanel-JSON-XS/XS.xs b/cpan/Cpanel-JSON-XS/XS.xs
@@ -36,24 +36,20 @@
 #define UTF32BOM    "\377\376\000\000"  /* FF FE 00 00 or +UFEFF */
 #define UTF32BOM_BE "\000\000\376\377"  /* 00 00 FE FF */
 
-/* strawberry 5.22 with USE_MINGW_ANSI_STDIO and USE_LONG_DOUBLE has now 
-   a proper inf/nan. */
+/* mingw with USE_LONG_DOUBLE (and implied USE_MINGW_ANSI_STDIO) do use the
+   non-msvcrt inf/nan stringification in sprintf(). */
 #if defined(WIN32) && !defined(__USE_MINGW_ANSI_STDIO) && !defined(USE_LONG_DOUBLE)
-/* TODO: we really need the msvcrt version, not the MSVC version.
-   strawberry 5.26 uses it also now. */
-# if (_MSC_VER > 1800) || (!defined(_MSC_VER) && PERL_VERSION >= 26)
-#  define STR_INF "inf"
-#  define STR_INF2 "inf.0"
-#  define STR_NAN "nan"
-#  define STR_QNAN "nan(ind)"
-#  define HAVE_QNAN
-# else
-#  define STR_INF "1.#INF"
-#  define STR_INF2 "1.#INF.0"
-#  define STR_NAN "1.#IND"
-#  define STR_QNAN "1.#QNAN"
-#  define HAVE_QNAN
-# endif
+/* new ucrtd.dll runtime? We do not probe the runtime or variants in the Makefile.PL yet. */
+#define STR_INF "inf"
+#define STR_INF2 "inf.0"
+#define STR_NAN "nan"
+#define STR_QNAN "nan(ind)"
+/* old standard msvcrt.dll */
+#define STR_INF3 "1.#INF"
+#define STR_INF4 "1.#INF.0"
+#define STR_NAN2 "1.#IND"
+#define STR_QNAN2 "1.#QNAN"
+#define HAVE_QNAN
 #elif defined(sun) || defined(__sun)
 #define STR_INF "Infinity"
 #define STR_NAN "NaN"
@@ -1405,9 +1401,9 @@ encode_sv (pTHX_ enc_t *enc, SV *sv)
 # else
         if (UNLIKELY(isinf(nv) || isnan(nv)))
 # endif
-          {
-            goto is_inf_or_nan;
-          }
+        {
+          goto is_inf_or_nan;
+        }
       }
 #endif
 #ifdef USE_QUADMATH
@@ -1416,12 +1412,18 @@ encode_sv (pTHX_ enc_t *enc, SV *sv)
       (void)Gconvert (nv, NV_DIG, 0, enc->cur);
 #endif
 
+#ifdef STR_INF4
+      if (UNLIKELY(strEQc(enc->cur, STR_INF)
+                   || strEQc(enc->cur, STR_INF2)
+                   || strEQc(enc->cur, STR_INF3)
+                   || strEQc(enc->cur, STR_INF4)))
+#elif STR_INF2
+      if (UNLIKELY(strEQc(enc->cur, STR_INF)
+                   || strEQc(enc->cur, STR_INF2)))
+#else
       if (UNLIKELY(strEQc(enc->cur, STR_INF)))
-        inf_or_nan = 1;
-#ifdef STR_INF2
-      else if (UNLIKELY(strEQc(enc->cur, STR_INF2)))
-        inf_or_nan = 1;
 #endif
+        inf_or_nan = 1;
 #if defined(__hpux)
       else if (UNLIKELY(strEQc(enc->cur, STR_NEG_INF)))
         inf_or_nan = 2;
@@ -1430,23 +1432,43 @@ encode_sv (pTHX_ enc_t *enc, SV *sv)
 #endif
       else if
 #ifdef HAVE_QNAN
+# ifdef STR_QNAN2
+        (UNLIKELY(strEQc(enc->cur, STR_NAN)
+                  || strEQc(enc->cur, STR_QNAN)
+                  || strEQc(enc->cur, STR_NAN2)
+                  || strEQc(enc->cur, STR_QNAN2)))
+# else
         (UNLIKELY(strEQc(enc->cur, STR_NAN)
                   || strEQc(enc->cur, STR_QNAN)))
+# endif
 #else
         (UNLIKELY(strEQc(enc->cur, STR_NAN)))
 #endif
         inf_or_nan = 3;
       else if (*enc->cur == '-') {
+#ifdef STR_INF4
+        if (UNLIKELY(strEQc(enc->cur+1, STR_INF)
+                     || strEQc(enc->cur+1, STR_INF2)
+                     || strEQc(enc->cur+1, STR_INF3)
+                     || strEQc(enc->cur+1, STR_INF4)))
+#elif STR_INF2
+        if (UNLIKELY(strEQc(enc->cur+1, STR_INF)
+                   || strEQc(enc->cur+1, STR_INF2)))
+#else
         if (UNLIKELY(strEQc(enc->cur+1, STR_INF)))
-          inf_or_nan = 2;
-#ifdef STR_INF2
-        else if (UNLIKELY(strEQc(enc->cur+1, STR_INF2)))
-          inf_or_nan = 2;
 #endif
+          inf_or_nan = 2;
         else if
 #ifdef HAVE_QNAN
+# ifdef STR_QNAN2
+          (UNLIKELY(strEQc(enc->cur+1, STR_NAN)
+                    || strEQc(enc->cur+1, STR_QNAN)
+                    || strEQc(enc->cur+1, STR_NAN2)
+                    || strEQc(enc->cur+1, STR_QNAN2)))
+# else
           (UNLIKELY(strEQc(enc->cur+1, STR_NAN)
                     || strEQc(enc->cur+1, STR_QNAN)))
+# endif
 #else
           (UNLIKELY(strEQc(enc->cur+1, STR_NAN)))
 #endif
@@ -1475,7 +1497,8 @@ encode_sv (pTHX_ enc_t *enc, SV *sv)
             strncpy(enc->cur, "\"nan\"\0", 6);
         }
         else if (enc->json.infnan_mode != 2) {
-          croak ("invalid stringify_infnan mode %c. Must be 0, 1, 2 or 3", enc->json.infnan_mode);
+          croak ("invalid stringify_infnan mode %c. Must be 0, 1, 2 or 3",
+                 enc->json.infnan_mode);
         }
       }
       if (SvPOKp (sv) && !strEQ(enc->cur, SvPVX (sv))) {
diff --git a/cpan/Cpanel-JSON-XS/t/117_numbers.t b/cpan/Cpanel-JSON-XS/t/117_numbers.t
@@ -16,6 +16,8 @@ is encode_json([9**9**9/9**9**9]), '[null]', "-nan -> null";
 my $json = Cpanel::JSON::XS->new->stringify_infnan;
 my $have_qnan = ($^O eq 'MSWin32' || $^O eq 'aix') ? 1 : 0;
 # TODO dec_osf
+# variants as in t/op/infnan.t
+my (@inf, @neg_inf, @nan, @neg_nan);
 my ($inf, $nan) =
   ($^O eq 'MSWin32') ? ('1.#INF','1.#QNAN') :
   ($^O eq 'solaris') ? ('Infinity','NaN') :
@@ -30,57 +32,71 @@ my $neg_inf =
   ($^O eq 'hpux') ? "---" :
                     "-".$inf;
 
-if ($^O eq 'MSWin32'
-    and $Config{ccflags} =~ /-D__USE_MINGW_ANSI_STDIO/
-    and $Config{uselongdouble})
-{
+if ($^O eq 'MSWin32' and $Config{ccflags} =~ /-D__USE_MINGW_ANSI_STDIO/) {
   $have_qnan = 0;
   ($inf, $neg_inf, $nan, $neg_nan) = ('inf','-inf','nan','-nan');
+  @inf     = ($inf);
+  @neg_inf = ($neg_inf);
+  @nan     = ($nan);
+  @neg_nan = ($neg_nan);
 }
-if ($^O eq 'MSWin32'
-    and $Config{cc} eq 'gcc'
-    and $] >= 5.026) # updated strawberry
-{
-  $have_qnan = 0;
+elsif ($^O eq 'MSWin32') { # new ucrtd.dll
   ($inf, $neg_inf, $nan, $neg_nan) = ('inf','-inf','nan','-nan');
-}
-# Windows changed it with MSVC 14.0 and the ucrtd.dll runtime
-diag "ccversion = $Config{ccversion}" if $^O eq 'MSWin32' and $Config{ccversion};
-if ($^O eq 'MSWin32' and $Config{ccversion}) {
-  my $mscver = $Config{ccversion}; # "19.00.24215.1" for 14.0 (VC++ 2015)
-  $mscver =~ s/^(\d+\.\d\+).(\d+)\.(\d+)/$1$2$3/;
-  if ($mscver >= 19.0) {
-    $have_qnan = 0;
-    ($inf, $neg_inf, $nan, $neg_nan) = ('inf','-inf','nan','-nan(ind)');
-  }
+  @inf     = ('1.#INF', 'inf');
+  @neg_inf = ('-1.#INF', '-inf');
+  @nan     = ('1.#QNAN', 'nan');
+  @neg_nan = ('-1.#IND', '-nan', '-nan(ind)');
+} else {
+  @inf     = ($inf);
+  @neg_inf = ($neg_inf);
+  @nan     = ($nan);
+  @neg_nan = ($neg_nan);
 }
 # newlib and glibc 2.5 have no -nan support, just nan. The BSD's neither, but they might
 # come up with it lateron, as darwin did.
 #if ($^O eq 'cygwin' or ($Config{glibc_version} && $Config{glibc_version} < 2.6)) {
 #  $neg_nan = $nan;
 #}
 
+sub match {
+  my ($r, $tmpl, $desc, @list) = @_;
+  my $match = shift @list;
+  my $m = $tmpl;
+  $m =~ s/__XX__/$match/;
+  $match = $m;
+  for my $m1 (@list) { # at least one must match
+    $m = $tmpl;
+    $m =~ s/__XX__/$m1/;
+    diag "try $m eq $r" if $ENV{TEST_VERBOSE};
+    $match = $m if $r eq $m;
+  }
+  is $r, $match, $desc;
+}
+
 my $r = $json->encode([9**9**9]);
 $r =~ s/\.0$// if $^O eq 'MSWin32';
-is $r,         "[\"$inf\"]",  "inf -> \"inf\" stringify_infnan(1)";
+match($r, "[\"__XX__\"]", "inf -> \"inf\" stringify_infnan(1)", @inf);
+
 $r = $json->encode([-9**9**9]);
 $r =~ s/\.0$// if $^O eq 'MSWin32';
-is $r,        "[\"$neg_inf\"]", "-inf -> \"-inf\"";
+match($r, "[\"__XX__\"]", "-inf -> \"-inf\"", @neg_inf);
+
 # The concept of negative nan is not portable and varies too much.
 # Windows even emits neg_nan for the first test sometimes. HP-UX has all tests reverse.
-like $json->encode([-sin(9**9**9)]),   qr/\[\"(\Q$neg_nan\E|\Q$nan\E)\"\]/,  "nan -> \"nan\"";
-like $json->encode([sin(9**9**9)]),    qr/\[\"(\Q$neg_nan\E|\Q$nan\E)\"\]/, "-nan -> \"-nan\"";
-like $json->encode([9**9**9/9**9**9]), qr/\[\"(\Q$neg_nan\E|\Q$nan\E)\"\]/, "-nan -> \"-nan\"";
+match($json->encode([-sin(9**9**9)]),   "[\"__XX__\"]", "nan -> \"nan\"", @nan, @neg_nan);
+match($json->encode([sin(9**9**9)]),    "[\"__XX__\"]", "-nan -> \"-nan\"", @nan, @neg_nan);
+match($json->encode([9**9**9/9**9**9]), "[\"__XX__\"]", "-nan -> \"-nan\"", @nan, @neg_nan);
 
 # infnan_mode = 2: # inf/nan values, as in JSON::XS and older releases.
 $json = Cpanel::JSON::XS->new->stringify_infnan(2);
-is $json->encode([9**9**9]),         "[$inf]",  "inf stringify_infnan(2)";
-is $json->encode([-9**9**9]),        "[$neg_inf]", "-inf";
-like $json->encode([-sin(9**9**9)]),   qr/\[(\Q$neg_nan\E|\Q$nan\E)\]/,  "nan";
-like $json->encode([sin(9**9**9)]),    qr/\[(\Q$neg_nan\E|\Q$nan\E)\]/, "-nan";
-like $json->encode([9**9**9/9**9**9]), qr/\[(\Q$neg_nan\E|\Q$nan\E)\]/, "-nan";
+match($json->encode([9**9**9]), "[__XX__]", "inf stringify_infnan(2)", @inf);
+match($json->encode([-9**9**9]), "[__XX__]", "-inf", @neg_inf);
+match($json->encode([-sin(9**9**9)]),   "[__XX__]", "nan", @nan, @neg_nan);
+match($json->encode([sin(9**9**9)]),    "[__XX__]", "-nan", @nan, @neg_nan);
+match($json->encode([9**9**9/9**9**9]), "[__XX__]", "-nan", @nan, @neg_nan);
 
-# infnan_mode = 3: # inf/nan values unified to inf/-inf/nan strings. no qnan/snan/negative nan
+# infnan_mode = 3:
+# inf/nan values unified to inf/-inf/nan strings. no qnan/snan/negative nan
 $json = Cpanel::JSON::XS->new->stringify_infnan(3);
 is $json->encode([9**9**9]),         '["inf"]',  "inf stringify_infnan(3)";
 is $json->encode([-9**9**9]),        '["-inf"]', "-inf";
diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm
@@ -15013,14 +15013,14 @@ our %delta = (
         delta_from => '5.027000c',
         changed => {
             'Config'                => '5.027001',
-            'Module::CoreList'      => '5.20170518c',
-            'Module::CoreList::Utils'=> '5.20170518c',
+            'Module::CoreList'      => '5.20170714c',
+            'Module::CoreList::Utils'=> '5.20170714c',
             'attributes'            => '1.12c',
             'B'                     => '1.68_08',
             'B::C'                  => '1.55_04',
             'B::Debug'              => '1.25',
             'base'                  => '2.26c',
-            'Cpanel::JSON::XS'      => '3.0236',
+            'Cpanel::JSON::XS'      => '3.0237',
             'deprecate'             => '0.03_01',
             'Devel::Peek'           => '1.26_02',
             'Devel::PPPort'         => '3.36_02',
diff --git a/pod/perlcdelta.pod b/pod/perlcdelta.pod
@@ -236,15 +236,16 @@ The problem is the new sub as :method warning with classes, which
 would cause all Test::Simple methods to be declared as :method, as they
 derive from base.
 
-=item L<Cpanel::JSON::XS> 3.0236
+=item L<Cpanel::JSON::XS> 3.0237
 
 Stringify true again as "1".
 Disallow duplicate keys by default, only allow them in relaxed mode.
 De-fragilize t/96_mojo.t false test to "". It mostly is.
 Fix and unify utf8 handling with 5.6.2 and improve many utf8 tests.
 Add tests for boolean sv_yes and sv_no.
 Check for correct module in %INC.
-Fix inf/nan for strawberry 5.26.
+Relax inf/nan detection for newer msvcrt.dll runtime versions
+(it's now almost ANSI).
 
 =item L<Devel::Peek> 1.26_02
 
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
@@ -100,7 +100,7 @@ Math::BigInt cpan/Math-BigInt/t/upgrade.t 7c15cac7f321ca396648ec45da6389a1283e15
 Math::BigInt cpan/Math-BigInt/t/upgradef.t 06610e9883ce805bcd6543ab959a9826f598eb40
 Math::BigInt cpan/Math-BigInt/t/with_sub.t c040328e223df6f56250f5d67dcb2c9a2f23c110
 Memoize cpan/Memoize/t/expmod_t.t 9386100cd9c95a0e8a4e001bba3aa52eec114d21
-Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm b8efb510da582db003521b06f02005760b7b951d
+Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm 66b1c65cc3b6818c7f9022d61599159f4f10659c
 Module::CoreList dist/Module-CoreList/lib/Module/CoreList/Utils.pm d013ed514d49e14ac007743cb5b05fc2a624a321
 Module::Metadata cpan/Module-Metadata/t/lib/GeneratePackage.pm 502ffbe2609947430e6aa1a3df8064b3fef3e086
 Net::Domain cpan/libnet/lib/Net/Cmd.pm 70a007c38833667ad47ea8059c37c1b7d1c77b6c

Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,5 @@`
`142`	`142`	`}`
`143`	`143`	`},`
`144`	`144`	`"version" : "5.027001c",`
`145`		`- "x_serialization_backend" : "Cpanel::JSON::XS version 3.0236"`
	`145`	`+ "x_serialization_backend" : "Cpanel::JSON::XS version 3.0237"`
`146`	`146`	`}`