This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Perl_sv_vcatpvfn_flags: rename 'is_simple' var
authorDavid Mitchell <davem@iabyn.com>
Thu, 18 May 2017 10:17:32 +0000 (11:17 +0100)
committerDavid Mitchell <davem@iabyn.com>
Wed, 7 Jun 2017 08:11:02 +0000 (09:11 +0100)
the definition of 'simple' required the format to have a precision.

sv.c

diff --git a/sv.c b/sv.c
index b374456..5562a24 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -12618,7 +12618,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
        case 'a': case 'A':
 
         {
        case 'a': case 'A':
 
         {
-            bool   is_simple;  /* no fancy qualifiers */
+            bool   can_be_special; /* candidate for special-case-handling */
             STRLEN radix_len;  /* SvCUR(PL_numeric_radix_sv) */
             STRLEN float_need; /* what PL_efloatsize needs to become */
 
             STRLEN radix_len;  /* SvCUR(PL_numeric_radix_sv) */
             STRLEN float_need; /* what PL_efloatsize needs to become */
 
@@ -12715,13 +12715,14 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
                 break;
             }
 
                 break;
             }
 
-            /* special-case "%.0f" */
-            is_simple = ( !(width || left || plus || alt)
-                        && fill != '0'
-                        && has_precis
-                        && intsize != 'q');
+            /* a candidate for special-casing: %.0f and %.NNNg */
+            can_be_special = ( !(width || left || plus || alt)
+                              && fill != '0'
+                              && has_precis
+                              && intsize != 'q');
 
 
-            if (is_simple && c == 'f' && !precis) {
+            /* special-case "%.0f" */
+            if (can_be_special && c == 'f' && !precis) {
                 if ((eptr = F0convert(nv, ebuf + sizeof ebuf, &elen)))
                     break;
             }
                 if ((eptr = F0convert(nv, ebuf + sizeof ebuf, &elen)))
                     break;
             }
@@ -12867,7 +12868,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
            }
 
             /* special-case "%.<number>g" */
            }
 
             /* special-case "%.<number>g" */
-            if (is_simple) {
+            if (can_be_special) {
                /* See earlier comment about buggy Gconvert when digits,
                   aka precis is 0  */
                if ( c == 'g' && precis ) {
                /* See earlier comment about buggy Gconvert when digits,
                   aka precis is 0  */
                if ( c == 'g' && precis ) {