Unicode data updated to be the latest beta of the Unicode 3.0.

[p5sagit/p5-mst-13.2.git] / util.c

diff --git a/util.c b/util.c
index 5cdedef..132ec5e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1405,11 +1405,12 @@ Perl_mess(pTHX_ const char *pat, va_list *args)
     sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));
     if (!SvCUR(sv) || *(SvEND(sv) - 1) != '\n') {
        dTHR;
-       if (PL_curcop->cop_line)
 #ifdef IV_IS_QUAD
+       if (PL_curcop->cop_line)
            Perl_sv_catpvf(aTHX_ sv, " at %_ line %" PERL_PRId64,
                      GvSV(PL_curcop->cop_filegv), (IV)PL_curcop->cop_line);
 #else
+       if (PL_curcop->cop_line)
            Perl_sv_catpvf(aTHX_ sv, " at %_ line %ld",
                      GvSV(PL_curcop->cop_filegv), (long)PL_curcop->cop_line);
 #endif
@@ -2970,29 +2971,6 @@ Perl_scan_hex(pTHX_ char *start, I32 len, I32 *retlen)
             * right amount of 16-tuples. */
            rnv += (NV)((hexdigit - PL_hexdigit) & 15);
        }
-       if (!overflowed) {
-           register UV xuv = ruv << 4;
-
-           if ((xuv >> 4) != ruv) {
-               dTHR;
-               overflowed = TRUE;
-               rnv = (NV) ruv;
-               if (ckWARN_d(WARN_UNSAFE))
-                   Perl_warner(aTHX_ WARN_UNSAFE,
-                               "Integer overflow in hexadecimal number");
-           } else
-               ruv = xuv | ((hexdigit - PL_hexdigit) & 15);
-       }
-       if (overflowed) {
-           rnv *= 16.0;
-           /* If an NV has not enough bits in its mantissa to
-            * represent an UV this summing of small low-order numbers
-            * is a waste of time (because the NV cannot preserve
-            * the low-order bits anyway): we could just remember when
-            * did we overflow and in the end just multiply rnv by the
-            * right amount of 16-tuples. */
-           rnv += (NV)((hexdigit - PL_hexdigit) & 15);
-       }
     }
     if (!overflowed)
        rnv = (NV) ruv;
@@ -3430,6 +3408,7 @@ Perl_new_struct_thread(pTHX_ struct perl_thread *t)
     PL_screamnext = 0;
     PL_reg_start_tmp = 0;
     PL_reg_start_tmpl = 0;
+    PL_reg_poscache = Nullch;
 
     /* parent thread's data needs to be locked while we make copy */
     MUTEX_LOCK(&t->mutex);