Commit83052dd

committed

drop comments while lexing unquoted strings

1 parent0266d3c commit83052ddCopy full SHA for 83052dd

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,18 @@ private function lexInlineQuotedString(int &$cursor = 0): string`
`1158`	`1158`	`privatefunctionlexUnquotedString(int &$cursor):string`
`1159`	`1159`	`{`
`1160`	`1160`	`$offset =$cursor;`
`1161`		`-$cursor +=strcspn($this->currentLine,'[]{},:',$cursor);`
	`1161`	`+`
	`1162`	`+while ($cursor <strlen($this->currentLine)) {`
	`1163`	`+if (in_array($this->currentLine[$cursor], ['[',']','{','}',',',':'],true)) {`
	`1164`	`+break;`
	`1165`	`+ }`
	`1166`	`+`
	`1167`	`+if ('' ===$this->currentLine[$cursor] &&'#' === ($this->currentLine[$cursor +1] ??'')) {`
	`1168`	`+break;`
	`1169`	`+ }`
	`1170`	`+`
	`1171`	`+ ++$cursor;`
	`1172`	`+ }`
`1162`	`1173`
`1163`	`1174`	`if ($cursor ===$offset) {`
`1164`	`1175`	`thrownewParseException('Malformed unquoted YAML string.');`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1751,6 +1751,19 @@ public function testParseMultiLineUnquotedString()`
`1751`	`1751`	`$this->assertSame(['foo' =>'bar baz foobar foo','bar' =>'baz'],$this->parser->parse($yaml));`
`1752`	`1752`	`}`
`1753`	`1753`
	`1754`	`+publicfunctiontestParseMultiLineUnquotedStringWithTrailingComment()`
	`1755`	`+ {`
	`1756`	`+$yaml =<<<YAML`
	`1757`	`+{`
	`1758`	`+ foo: 3, # comment`
	`1759`	`+ bar: example.com/#about,`
	`1760`	`+ baz: 30 # comment`
	`1761`	`+}`
	`1762`	`+YAML;`
	`1763`	`+`
	`1764`	`+$this->assertSame(['foo' =>3,'bar' =>'example.com/#about','baz' =>30],$this->parser->parse($yaml));`
	`1765`	`+ }`
	`1766`	`+`
`1754`	`1767`	`/**`
`1755`	`1768`	`* @dataProvider escapedQuotationCharactersInQuotedStrings`
`1756`	`1769`	`*/`

Comments

(0)