Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 258fbd6

Browse files
authored
Fix -Wuseless-escape warnings emitted by re2c (#19050)
re2c version 4 enabled some warnings by default. This fixes re2c code for the `-Wuseless-escape` warnings. There are two same issues reported. Issue: GH-17523 Closes: GH-17204 
1 parent 405be1c commit 258fbd6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

‎NEWS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PHP NEWS
1010
order). (Daniil Gentili)
1111
. Fix OSS-Fuzz #427814456. (nielsdos)
1212
. Fix OSS-Fuzz #428983568 and #428760800. (nielsdos)
13+
. Fixed bug GH-17204 -Wuseless-escape warnings emitted by re2c. (Peter Kokot)
1314

1415
- Curl:
1516
. Fix memory leaks when returning refcounted value from curl callback.

‎Zend/zend_ini_scanner.l‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,16 @@ restart:
352352
/*!re2c
353353
re2c:yyfill:check = 0;
354354
LNUM [0-9]+
355-
DNUM ([0-9]*[\.][0-9]+)|([0-9]+[\.][0-9]*)
355+
DNUM ([0-9]*[.][0-9]+)|([0-9]+[.][0-9]*)
356356
NUMBER [-]?{LNUM}|{DNUM}
357357
ANY_CHAR (.|[\n\t])
358358
NEWLINE ("\r"|"\n"|"\r\n")
359359
TABS_AND_SPACES [ \t]
360360
WHITESPACE [ \t]+
361361
CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
362-
LABEL_CHAR [^=\n\r\t;&|^$~(){}!"\[\]\x00]
362+
LABEL_CHAR [^=\n\r\t;&|^$~(){}!"[\]\x00]
363363
LABEL ({LABEL_CHAR}+)
364-
TOKENS [:,.\[\]"'()&|^+-/*=%$!~<>?@{}]
364+
TOKENS [:,.[\]"'()&|^+-/*=%$!~<>?@{}]
365365
OPERATORS [&|^~()!]
366366
DOLLAR_CURLY "${"
367367

‎Zend/zend_language_scanner.l‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,11 +1801,11 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
18011801
RETURN_TOKEN(T_MUL_EQUAL);
18021802
}
18031803

1804-
<ST_IN_SCRIPTING>"*\*" {
1804+
<ST_IN_SCRIPTING>"**" {
18051805
RETURN_TOKEN(T_POW);
18061806
}
18071807

1808-
<ST_IN_SCRIPTING>"*\*=" {
1808+
<ST_IN_SCRIPTING>"**=" {
18091809
RETURN_TOKEN(T_POW_EQUAL);
18101810
}
18111811

‎sapi/phpdbg/phpdbg_lexer.l‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ T_IF 'if'
7777
T_RUN 'run'
7878
T_RUN_SHORT "r"
7979
WS [ \r\t]+
80-
DIGITS [-]?[0-9\.]+
80+
DIGITS [-]?[0-9.]+
8181
ID [^ \r\n\t:#000円]+
8282
GENERIC_ID ([^ \r\n\t:#000円"']|":\\")+|["]([^\n000円"\\]|"\\\\"|"\\"["])+["]|[']([^\n000円'\\]|"\\\\"|"\\"['])+[']
8383
ADDR [0][x][a-fA-F0-9]+

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /