Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5535

diff --cc toke.c
index 5b2fc98,a7be0a4..194766c
--- 1/toke.c
--- 2/toke.c
+++ b/toke.c
@@@ -6684,12 -6683,7 +6683,13 @@@ Perl_scan_num(pTHX_ char *start
      register char *s = start;         /* current position in buffer */
      register char *d;                 /* destination in temp buffer */
      register char *e;                 /* end of temp buffer */
++    IV tryiv;                         /* used to see if it can be an IV */
+     UV tryuv;                         /* used to see if it can be an UV */
 +#if ( defined(USE_64_BIT_INT) && \
 +      (!defined(HAS_STRTOLL)|| !defined(HAS_STRTOULL))) || \
 +    (!defined(USE_64_BIT_INT) && \
 +        (!defined(HAS_STRTOL) || !defined(HAS_STRTOUL)))
-     IV tryiv;                         /* used to see if it can be an IV */
 +#endif
      NV value;                         /* number read, as a double */
      SV *sv = Nullsv;                  /* place to put the converted number */
      bool floatit;                     /* boolean: int or float? */
@@@ -6969,55 -6953,15 +6969,59 @@@
           Note: if floatit is true, then we don't need to do the
           conversion at all.
        */
-       tryiv = I_V(value);
-       if (!floatit && (NV)tryiv == value)
-           sv_setiv(sv, tryiv);
+       tryuv = U_V(value);
+       if (!floatit && (NV)tryuv == value) {
+           if (tryuv <= IV_MAX)
+               sv_setiv(sv, (IV)tryuv);
+           else
+               sv_setuv(sv, tryuv);
+       }
        else
            sv_setnv(sv, value);
 +#else
 +      /*
 +         strtol/strtoll sets errno to ERANGE if the number is too big
 +         for an integer. We try to do an integer conversion first
 +         if no characters indicating "float" have been found.
 +       */
 +
 +      if (!floatit) {
 +          char *tp;
 +          IV iv;
 +          UV uv;
 +          errno = 0;
 +#ifdef USE_64_BIT_INT
 +          if (*PL_tokenbuf == '-')
 +              iv = strtoll(PL_tokenbuf,&tp,10);
 +          else
 +              uv = strtoull(PL_tokenbuf,&tp,10);
 +#else
 +          if (*PL_tokenbuf == '-')
 +              iv = strtol(PL_tokenbuf,&tp,10);
 +          else
 +              uv = strtoul(PL_tokenbuf,&tp,10);
 +#endif
 +          if (*tp || errno)
 +              floatit = TRUE; /* probably just too large */
 +          else if (*PL_tokenbuf == '-')
 +              sv_setiv(sv, iv);
 +          else
 +              sv_setuv(sv, uv);
 +      }
 +      if (floatit) {
 +          char *tp;
 +          errno = 0;
 +#ifdef USE_LONG_DOUBLE
 +          value = strtold(PL_tokenbuf,&tp);
 +#else
 +          value = strtod(PL_tokenbuf,&tp);
 +#endif
 +          if (*tp || errno)
 +              Perl_die(aTHX_ "unparseable float");
 +          else
 +              sv_setnv(sv, value);
 +      } 
 +#endif
        if ( floatit ? (PL_hints & HINT_NEW_FLOAT) :
                       (PL_hints & HINT_NEW_INTEGER) )
            sv = new_constant(PL_tokenbuf, d - PL_tokenbuf,