[ExpressionLanguage] Support lexing numbers with underscores and decimals with no leading zero #44073
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Would love to have this in Twig as well. |
fancyweb
commented
Nov 16, 2021
| @@ -40,11 +40,11 @@ public function tokenize(string $expression) | |||
| continue; | |||
| } | |||
|
|
|||
| if (preg_match('/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A', $expression, $match, 0, $cursor)) { | |||
| if (preg_match('/((?:[0-9]+(?:_[0-9]+)*|(?:(?:[0-9]+(?:_[0-9]+)*)?\.[0-9]+(?:_[0-9]+)*|[0-9]+(?:_[0-9]+)*\.(?:[0-9]+(?:_[0-9]+)*)?))[eE][+-]?[0-9]+(?:_[0-9]+)*|(?:(?:[0-9]+(?:_[0-9]+)*)?\.[0-9]+(?:_[0-9]+)*|[0-9]+(?:_[0-9]+)*\.(?:[0-9]+(?:_[0-9]+)*)?)|[0-9]+(?:_[0-9]+)*)/A', $expression, $match, 0, $cursor)) { | |||
There was a problem hiding this comment.
BTW this regex was computed from this comment in the PHP source code: https://github.com/php/php-src/blob/172d469b7bc351efbcdf54052be3de289b2fdd62/Zend/zend_language_scanner.l#L1359 which is also in the PHP doc.
|
this misses tests using the |
stof
reviewed
Nov 16, 2021
fancyweb
commented
Nov 16, 2021
stof
reviewed
Nov 16, 2021
a7bf00d to
aa35fc6
Compare
fancyweb
commented
Nov 16, 2021
| @@ -40,11 +40,11 @@ public function tokenize(string $expression) | |||
| continue; | |||
| } | |||
|
|
|||
| if (preg_match('/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A', $expression, $match, 0, $cursor)) { | |||
| if (preg_match('/((?:[0-9]+(?:_[0-9]+)*|(?:(?:[0-9]+(?:_[0-9]+)*)?\.[0-9]+(?:_[0-9]+)*|[0-9]+(?:_[0-9]+)*\.(?!\.)(?:[0-9]+(?:_[0-9]+)*)?))[eE][+-]?[0-9]+(?:_[0-9]+)*|(?:(?:[0-9]+(?:_[0-9]+)*)?\.[0-9]+(?:_[0-9]+)*|[0-9]+(?:_[0-9]+)*\.(?!\.)(?:[0-9]+(?:_[0-9]+)*)?)|[0-9]+(?:_[0-9]+)*)/A', $expression, $match, 0, $cursor)) { | |||
There was a problem hiding this comment.
I had to add to a negative lookahead ((?!\.)) because the base pattern from the PHP source code matches decimals finishing at the point (eg: 8.) and it collides with the range operator (eg: 0..9 would be interpreted as number 0 + number 0.9 instead of number 0 + operator .. + number 9)
fabpot
added a commit
that referenced
this pull request
Nov 17, 2021
This PR was merged into the 4.4 branch. Discussion ---------- [ExpressionLanguage] Fix LexerTest number types | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | #44073 (comment) | License | MIT | Doc PR | - Very minor but it's better like this. Commits ------- bdf9adc [ExpressionLanguage] Fix LexerTest number types
OskarStark
reviewed
Nov 20, 2021
…mals with no leading zero
7ce3d61 to
bb56b2e
Compare
nicolas-grekas
approved these changes
Feb 24, 2022
|
Thank you @fancyweb. |
This was referenced Feb 24, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggesti
314C
on to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I understand that the supported Expression Language syntax is, and can be different than the PHP syntax, however, like @epixian, I would have expected
.123to work since it's a common notation.Supporting the numeric literal separator
_looks good to me for the readability (the expression language is still code IMO). As most of us are PHP devs, we know this syntax.Supporting those new syntaxes doesn't really bring more complexity in the code and it allows us to realign with the PHP behavior (thus having a guide) which is not something mandatory but something a random user would expect I think, that's why it improves the DX IMHO.
We could make the change in Twig too for the same reasons.
We could also support the hexadecimal, binary and octal syntaxes but let's wait for someone that actually needs it 😃