merge revision(s) 4644e4f2fafe45e2c49f18bc9712d0f5fff3d341: [Backport #21986]

	[PATCH] [Bug #21986] Fix location of numeric literal

	When checking for suffixes, do not flush the numeric literal token
	even if no suffix is found.

2 files changed, 8 insertions, 1 deletions

diff --git a/parse.y b/parse.y
index 90c22122ae..5b5c197b49 100644
--- a/parse.y
+++ b/parse.y
@@ -8959,7 +8959,6 @@ number_literal_suffix(struct parser_params *p, int mask)
         }
         if (!ISASCII(c) || ISALPHA(c) || c == '_') {
             p->lex.pcur = lastp;
-            literal_flush(p, p->lex.pcur);
             return 0;
         }
         pushback(p, c);
diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index 8ab5c14eca..b54c8f3a10 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -1739,6 +1739,14 @@ dummy
       assert_locations(node.children.last.locations, [[1, 0, 1, 2]])
     end
 
+    def test_numeric_location_with_nonsuffix
+      node = ast_parse("1if true")
+      assert_locations(node.children.last.children[1].locations, [[1, 0, 1, 1]])
+
+      node = ast_parse("1q", error_tolerant: true)
+      assert_locations(node.children.last.locations, [[1, 0, 1, 1]])
+    end
+
     private
     def ast_parse(src, **options)
       begin