From 485dba74f335cfef5432c8c8346088fc2c1f44b4 Mon Sep 17 00:00:00 2001
From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Sun, 15 May 2022 06:35:38 -0700
Subject: [PATCH] move number parsing code to sub do_DIGITS

---
 lib/Perl/Tidy/Tokenizer.pm | 46 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 56fa540d..50ccebb2 100644
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -2449,7 +2449,7 @@ EOM
         $type                    = 'Q';
         $allowed_quote_modifiers = EMPTY_STRING;
         return;
-    }
+    } ## end sub do_QUOTATION_MARK
 
     sub do_APOSTROPHE {
 
@@ -2460,7 +2460,7 @@ EOM
         $type                    = 'Q';
         $allowed_quote_modifiers = EMPTY_STRING;
         return;
-    }
+    } ## end sub do_APOSTROPHE
 
     sub do_BACKTICK {
 
@@ -2471,7 +2471,7 @@ EOM
         $type                    = 'Q';
         $allowed_quote_modifiers = EMPTY_STRING;
         return;
-    }
+    } ## end sub do_BACKTICK
 
     sub do_SLASH {
 
@@ -3288,6 +3288,28 @@ EOM
         return;
     }
 
+    sub do_DIGITS {
+
+        # 'd' = string of digits
+        error_if_expecting_OPERATOR("Number")
+          if ( $expecting == OPERATOR );
+
+        my $number = scan_number_fast();
+        if ( !defined($number) ) {
+
+            # shouldn't happen - we should always get a number
+            if (DEVEL_MODE) {
+                Fault(<<EOM);
+non-number beginning with digit--program bug
+EOM
+            }
+            warning(
+                "Unexpected error condition: non-number beginning with digit\n"
+            );
+            report_definite_bug();
+        }
+    } ## end sub do_DIGITS
+
     # ------------------------------------------------------------
     # begin hash of code for handling most token types
     # ------------------------------------------------------------
@@ -4698,23 +4720,7 @@ EOM
             elsif ( $pre_type eq 'd' ) {
                 $expecting =
                   operator_expected( [ $prev_type, $tok, $next_type ] );
-                error_if_expecting_OPERATOR("Number")
-                  if ( $expecting == OPERATOR );
-
-                my $number = scan_number_fast();
-                if ( !defined($number) ) {
-
-                    # shouldn't happen - we should always get a number
-                    if (DEVEL_MODE) {
-                        Fault(<<EOM);
-non-number beginning with digit--program bug
-EOM
-                    }
-                    warning(
-"Unexpected error condition: non-number beginning with digit\n"
-                    );
-                    report_definite_bug();
-                }
+                do_DIGITS();
             }
 
             ###############################################################
-- 
2.39.5