From: Jeff Ober <jober@ziprecruiter.com>
Date: Fri, 10 Jan 2020 18:55:42 +0000 (-0500)
Subject: Integers apparently may not have double, leading, or trailing underscores
X-Git-Tag: nailing-cargo/1.0.0~234^2~52
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1dccd8a27844b77cef8d91e3041141065cf5103c;p=nailing-cargo.git

Integers apparently may not have double, leading, or trailing underscores
---

diff --git a/lib/TOML/Tiny/Grammar.pm b/lib/TOML/Tiny/Grammar.pm
index 784b53a..0471185 100644
--- a/lib/TOML/Tiny/Grammar.pm
+++ b/lib/TOML/Tiny/Grammar.pm
@@ -59,22 +59,16 @@ our $TOML = qr{
   (?<KeyValuePairDecl> (?&Key) (?&WS) = (?&WS) (?&Value) (?&WS) (?&NL))
 
   (?<KeyValuePairList>
-      (?&KeyValuePair) (?&WS) [,] (?&WS) (?&KeyValuePairList)?
+      (?&KeyValuePair) (?&WS) (?: [,] (?&WS) (?&KeyValuePairList) )?
     | (?&KeyValuePair)
   )
 
   (?<InlineTable>
-    (?s)
-
     {
-      (?&WS) (?&NLSeq)? (?&WS)
-
+      (?&WS)
       (?&KeyValuePairList)
-
-      (?&WS) (?&NLSeq)? (?&WS)
+      (?&WS)
     }
-
-    (?-s)
   )
 
   (?<TableDecl>
@@ -136,10 +130,16 @@ our $TOML = qr{
   #-----------------------------------------------------------------------------
   # Integer
   #-----------------------------------------------------------------------------
-  (?<Dec> [-+]? [_0-9]+)
-  (?<Hex> 0x[_0-9a-fA-F]+)
-  (?<Oct> 0o[_0-7]+)
-  (?<Bin> 0b[_01]+)
+  (?<DecChar> [0-9])
+  (?<HexChar> (?&DecChar) | [a-f A-F])
+  (?<OctChar> [0-7])
+  (?<BinChar> [01])
+
+  (?<Dec> [-+]? (?&DecChar) (?: (?&DecChar) | (?: _ (?&DecChar) ))*)
+  (?<Hex> 0x (?&HexChar) (?: (?&HexChar) | (?: [_] (?&HexChar) ))*)
+  (?<Oct> 0o (?&OctChar) (?: (?&OctChar) | (?: [_] (?&OctChar) ))*)
+  (?<Bin> 0b (?&BinChar) (?: (?&BinChar) | (?: [_] (?&BinChar) ))*)
+
   (?<Integer> (?&Hex) | (?&Oct) | (?&Bin) | (?&Dec))
 
   #-----------------------------------------------------------------------------