NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit4597c12

committed

[Yaml] Allow using _ in some numeric notations

1 parent0b67fa3 commit4597c12Copy full SHA for 4597c12

File tree

2 files changed

+18

-3

lines changed

src/Symfony/Component/Yaml
- Inline.php
- Tests
  - InlineTest.php

2 files changed

+18

-3

lines changed

`‎src/Symfony/Component/Yaml/Inline.php‎`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@ public static function dump($value, $flags = 0)`
`206`	`206`	`case Escaper::requiresDoubleQuoting($value):`
`207`	`207`	`return Escaper::escapeWithDoubleQuotes($value);`
`208`	`208`	`case Escaper::requiresSingleQuoting($value):`
	`209`	`+casepreg_match('{^[0-9]+[_0-9]*$}',$value):`
`209`	`210`	`casepreg_match(self::getHexRegex(),$value):`
`210`	`211`	`casepreg_match(self::getTimestampRegex(),$value):`
`211`	`212`	`return Escaper::escapeWithSingleQuotes($value);`
`@@ -564,6 +565,8 @@ private static function evaluateScalar($scalar, $flags, $references = array())`
`564`	`565`	`return;`
`565`	`566`	`case0 ===strpos($scalar,'!!float'):`
`566`	`567`	`return (float)substr($scalar,8);`
	`568`	`+casepreg_match('{^[+-]?[0-9][0-9_]*$}',$scalar):`
	`569`	`+$scalar =str_replace('_','', (string)$scalar);`
`567`	`570`	`casectype_digit($scalar):`
`568`	`571`	`$raw =$scalar;`
`569`	`572`	`$cast = (int)$scalar;`
`@@ -576,6 +579,8 @@ private static function evaluateScalar($scalar, $flags, $references = array())`
`576`	`579`	`return'0' ==$scalar[1] ?octdec($scalar) : (((string)$raw === (string)$cast) ?$cast :$raw);`
`577`	`580`	`caseis_numeric($scalar):`
`578`	`581`	`casepreg_match(self::getHexRegex(),$scalar):`
	`582`	`+$scalar =str_replace('_','',$scalar);`
	`583`	`+`
`579`	`584`	`return'0x' ===$scalar[0].$scalar[1] ?hexdec($scalar) : (float)$scalar;`
`580`	`585`	`case'.inf' ===$scalarLower:`
`581`	`586`	`case'.nan' ===$scalarLower:`
`@@ -584,8 +589,8 @@ private static function evaluateScalar($scalar, $flags, $references = array())`
`584`	`589`	`returnlog(0);`
`585`	`590`	`case0 ===strpos($scalar,'!!binary'):`
`586`	`591`	`returnself::evaluateBinaryScalar(substr($scalar,9));`
`587`		`-casepreg_match('/^(-\|\+)?[0-9,]+(\.[0-9]+)?$/',$scalar):`
`588`		`-return (float)str_replace(',','',$scalar);`
	`592`	`+casepreg_match('/^(-\|\+)?[0-9][0-9,_]*(\.[0-9_]+)?$/',$scalar):`
	`593`	`+return (float)str_replace(array(',','_'),'',$scalar);`
`589`	`594`	`casepreg_match(self::getTimestampRegex(),$scalar):`
`590`	`595`	`if (Yaml::PARSE_DATETIME &$flags) {`
`591`	`596`	`returnnew \DateTime($scalar,new \DateTimeZone('UTC'));`
`@@ -662,6 +667,6 @@ private static function getTimestampRegex()`
`662`	`667`	`*/`
`663`	`668`	`privatestaticfunctiongetHexRegex()`
`664`	`669`	`{`
`665`		`-return'~^0x[0-9a-f]++$~i';`
	`670`	`+return'~^0x[0-9a-f_]++$~i';`
`666`	`671`	`}`
`667`	`672`	`}`

`‎src/Symfony/Component/Yaml/Tests/InlineTest.php‎`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,11 +286,16 @@ public function getTestsForParse()`
`286`	`286`	`array('true',true),`
`287`	`287`	`array('12',12),`
`288`	`288`	`array('-12', -12),`
	`289`	`+array('1_2',12),`
	`290`	`+array('_12','_12'),`
	`291`	`+array('12_',12),`
`289`	`292`	`array('"quoted string"','quoted string'),`
`290`	`293`	`array("'quoted string'",'quoted string'),`
`291`	`294`	`array('12.30e+02',12.30e+02),`
`292`	`295`	`array('0x4D2',0x4D2),`
	`296`	`+array('0x_4_D_2_',0x4D2),`
`293`	`297`	`array('02333',02333),`
	`298`	`+array('0_2_3_3_3',02333),`
`294`	`299`	`array('.Inf', -log(0)),`
`295`	`300`	`array('-.Inf',log(0)),`
`296`	`301`	`array("'686e444'",'686e444'),`
`@@ -438,10 +443,15 @@ public function getTestsForDump()`
`438`	`443`	`array('false',false),`
`439`	`444`	`array('true',true),`
`440`	`445`	`array('12',12),`
	`446`	`+array("'1_2'",'1_2'),`
	`447`	`+array('_12','_12'),`
	`448`	`+array("'12_'",'12_'),`
`441`	`449`	`array("'quoted string'",'quoted string'),`
`442`	`450`	`array('!!float 1230',12.30e+02),`
`443`	`451`	`array('1234',0x4D2),`
`444`	`452`	`array('1243',02333),`
	`453`	`+array("'0x_4_D_2_'",'0x_4_D_2_'),`
	`454`	`+array("'0_2_3_3_3'",'0_2_3_3_3'),`
`445`	`455`	`array('.Inf', -log(0)),`
`446`	`456`	`array('-.Inf',log(0)),`
`447`	`457`	`array("'686e444'",'686e444'),`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit4597c12

File tree

2 files changed

2 files changed

`‎src/Symfony/Component/Yaml/Inline.php‎`

`‎src/Symfony/Component/Yaml/Tests/InlineTest.php‎`

0 commit comments