Literal cannot begin with a character - or : followed by =[{( (syntax…

… BC break)
nette · Dec 27, 2019 · 00f31ef · 00f31ef
1 parent 9cd8bcb
commit 00f31ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Neon/Decoder.php b/src/Neon/Decoder.php
@@ -27,7 +27,7 @@ final class Decoder
 
 		// literal / boolean / integer / float
 		'
-			(?: [^#"\',:=[\]{}()\x00-\x20`-] | [:-][^"\',\]})\s] )
+			(?: [^#"\',:=[\]{}()\x00-\x20`-] | [:-] [^"\',=[\]{}()\s] )
 			(?:
 				[^,:=\]})(\x00-\x20]++ |
 				:(?! [\s,\]})] | $ ) |

diff --git a/tests/Neon/Decoder.phpt b/tests/Neon/Decoder.phpt
@@ -126,19 +126,13 @@ $dataSet = [
 
 		['!hello', '!hello'],
 
-		[':[', ':['],
-		[':{', ':{'],
-		[':(', ':('],
 		['::', '::'],
 		[':0', ':0'],
 		[':-1', ':-1'],
 		[':true', ':true'],
 		[':false', ':false'],
 		[':null', ':null'],
 		[':NULL', ':NULL'],
-		['-[', '-['],
-		['-{', '-{'],
-		['-(', '-('],
 		['-:', '-:'],
 		['-0', -0],
 		['-true', '-true'],
@@ -211,6 +205,13 @@ $dataSet = [
 		['=abc'],
 		['{a :b}'],
 		['a :b'],
+
+		['-['],
+		['-{'],
+		['-('],
+		[':['],
+		[':{'],
+		[':('],
 	],
 
 	// RFC JSON with valid syntax which can not be encoded in UTF-8