Skip to content

Commit 3b45b9d

committed

Merge branch 'PHP-8.4'

* PHP-8.4: Fix -Wuseless-escape warnings emitted by re2c (#19050)

2 parents c2af281 + ab6e730 commit 3b45b9dCopy full SHA for 3b45b9d

File tree

3 files changed

+6

-6

lines changed

Zend
- zend_ini_scanner.l
- zend_language_scanner.l
sapi/phpdbg
- phpdbg_lexer.l

3 files changed

+6

-6

lines changed

`‎Zend/zend_ini_scanner.l‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -352,16 +352,16 @@ restart:`
`352`	`352`	`/*!re2c`
`353`	`353`	`re2c:yyfill:check = 0;`
`354`	`354`	`LNUM [0-9]+`
`355`		`-DNUM ([0-9][\.][0-9]+)\|([0-9]+[\.][0-9])`
	`355`	`+DNUM ([0-9][.][0-9]+)\|([0-9]+[.][0-9])`
`356`	`356`	`NUMBER [-]?{LNUM}\|{DNUM}`
`357`	`357`	`ANY_CHAR (.\|[\n\t])`
`358`	`358`	`NEWLINE ("\r"\|"\n"\|"\r\n")`
`359`	`359`	`TABS_AND_SPACES [ \t]`
`360`	`360`	`WHITESPACE [ \t]+`
`361`	`361`	`CONSTANT [a-zA-Z_][a-zA-Z0-9_]*`
`362`		`-LABEL_CHAR [^=\n\r\t;&\|^$~(){}!"\[\]\x00]`
	`362`	`+LABEL_CHAR [^=\n\r\t;&\|^$~(){}!"[\]\x00]`
`363`	`363`	`LABEL ({LABEL_CHAR}+)`
`364`		`-TOKENS [:,.\[\]"'()&\|^+-/*=%$!~<>?@{}]`
	`364`	`+TOKENS [:,.[\]"'()&\|^+-/*=%$!~<>?@{}]`
`365`	`365`	`OPERATORS [&\|^~()!]`
`366`	`366`	`DOLLAR_CURLY "${"`
`367`	`367`

`‎Zend/zend_language_scanner.l‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1817,11 +1817,11 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}\|{MULTI_LINE_COMMENT}\|{SINGLE_LINE_`
`1817`	`1817`	`RETURN_TOKEN(T_MUL_EQUAL);`
`1818`	`1818`	`}`
`1819`	`1819`
`1820`		`-<ST_IN_SCRIPTING>"\" {`
	`1820`	`+<ST_IN_SCRIPTING>"**" {`
`1821`	`1821`	`RETURN_TOKEN(T_POW);`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`		`-<ST_IN_SCRIPTING>"\=" {`
	`1824`	`+<ST_IN_SCRIPTING>"**=" {`
`1825`	`1825`	`RETURN_TOKEN(T_POW_EQUAL);`
`1826`	`1826`	`}`
`1827`	`1827`

`‎sapi/phpdbg/phpdbg_lexer.l‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ T_IF 'if'`
`77`	`77`	`T_RUN 'run'`
`78`	`78`	`T_RUN_SHORT "r"`
`79`	`79`	`WS [ \r\t]+`
`80`		`-DIGITS [-]?[0-9\.]+`
	`80`	`+DIGITS [-]?[0-9.]+`
`81`	`81`	`ID [^ \r\n\t:#000円]+`
`82`	`82`	`GENERIC_ID ([^ \r\n\t:#000円"']\|":\\")+\|["]([^\n000円"\\]\|"\\\\"\|"\\"["])+["]\|[']([^\n000円'\\]\|"\\\\"\|"\\"['])+[']`
`83`	`83`	`ADDR [0][x][a-fA-F0-9]+`

0 commit comments

Comments

(0)