Some low-hanging -Wunreachable-code fruits.

[perl5.git] / numeric.c

diff --git a/numeric.c b/numeric.c
index b5144f4..e0ffafa 100644 (file)
--- a/numeric.c
+++ b/numeric.c
@@ -18,11 +18,11 @@
 /*
 =head1 Numeric functions
 
+=cut
+
 This file contains all the stuff needed by perl for manipulating numeric
 values, including such things as replacements for the OS's atof() function
 
-=cut
-
 */
 
 #include "EXTERN.h"
@@ -528,13 +528,18 @@ Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send)
 
     PERL_ARGS_ASSERT_GROK_NUMERIC_RADIX;
 
-    if (PL_numeric_radix_sv && IN_SOME_LOCALE_FORM) {
-        STRLEN len;
-        const char * const radix = SvPV(PL_numeric_radix_sv, len);
-        if (*sp + len <= send && memEQ(*sp, radix, len)) {
-            *sp += len;
-            return TRUE; 
+    if (IN_LC(LC_NUMERIC)) {
+        DECLARE_STORE_LC_NUMERIC_SET_TO_NEEDED();
+        if (PL_numeric_radix_sv) {
+            STRLEN len;
+            const char * const radix = SvPV(PL_numeric_radix_sv, len);
+            if (*sp + len <= send && memEQ(*sp, radix, len)) {
+                *sp += len;
+                RESTORE_LC_NUMERIC();
+                return TRUE;
+            }
         }
+        RESTORE_LC_NUMERIC();
     }
     /* always try "." if numeric radix didn't match because
      * we may have data from different locales mixed */
@@ -853,31 +858,36 @@ Perl_my_atof(pTHX_ const char* s)
 
     PERL_ARGS_ASSERT_MY_ATOF;
 
-    if (PL_numeric_local && PL_numeric_radix_sv && IN_SOME_LOCALE_FORM) {
-        const char *standard = NULL, *local = NULL;
-        bool use_standard_radix;
+    {
+        DECLARE_STORE_LC_NUMERIC_SET_TO_NEEDED();
+        if (PL_numeric_radix_sv && IN_LC(LC_NUMERIC)) {
+            const char *standard = NULL, *local = NULL;
+            bool use_standard_radix;
 
-        /* Look through the string for the first thing that looks like a
-         * decimal point: either the value in the current locale or the
-         * standard fallback of '.'. The one which appears earliest in the
-         * input string is the one that we should have atof look for. Note that
-         * we have to determine this beforehand because on some systems,
-         * Perl_atof2 is just a wrapper around the system's atof. */
-        standard = strchr(s, '.');
-        local = strstr(s, SvPV_nolen(PL_numeric_radix_sv));
+            /* Look through the string for the first thing that looks like a
+             * decimal point: either the value in the current locale or the
+             * standard fallback of '.'. The one which appears earliest in the
+             * input string is the one that we should have atof look for. Note
+             * that we have to determine this beforehand because on some
+             * systems, Perl_atof2 is just a wrapper around the system's atof.
+             * */
+            standard = strchr(s, '.');
+            local = strstr(s, SvPV_nolen(PL_numeric_radix_sv));
 
-        use_standard_radix = standard && (!local || standard < local);
+            use_standard_radix = standard && (!local || standard < local);
 
-        if (use_standard_radix)
-            SET_NUMERIC_STANDARD();
+            if (use_standard_radix)
+                SET_NUMERIC_STANDARD();
 
-        Perl_atof2(s, x);
+            Perl_atof2(s, x);
 
-        if (use_standard_radix)
-            SET_NUMERIC_LOCAL();
+            if (use_standard_radix)
+                SET_NUMERIC_LOCAL();
+        }
+        else
+            Perl_atof2(s, x);
+        RESTORE_LC_NUMERIC();
     }
-    else
-       Perl_atof2(s, x);
 #else
     Perl_atof2(s, x);
 #endif
@@ -942,7 +952,7 @@ Perl_my_atof2(pTHX_ const char* orig, NV* value)
     switch (*s) {
        case '-':
            negative = 1;
-           /* fall through */
+           /* FALLTHROUGH */
        case '+':
            ++s;
     }
@@ -1040,7 +1050,7 @@ Perl_my_atof2(pTHX_ const char* orig, NV* value)
        switch (*s) {
            case '-':
                expnegative = 1;
-               /* fall through */
+               /* FALLTHROUGH */
            case '+':
                ++s;
        }