diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature #34028 [ExpressionLanguage][Lexer] Exponential format for number (tigr1991)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[ExpressionLanguage][Lexer] Exponential format for number

Exponential format has been added for numbers.
Ex: 1.99E+3 === 1990,
Ex: expression (1 + 1.99E+3) = 1991

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | yes
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Exponential format has been added for numbers.
Ex: 1.99E+3 === 1990,
Expressions:
0.1e+2 = 10
1e-2 = 0.01
(1 + 1.99E+3) = 1991
and etc...

Commits
-------

430ec32992 [ExpressionLanguage][Lexer] Exponential format for number
This commit is contained in:
Fabien Potencier 2019-10-22 17:29:53 +02:00
commit 4f9d449885
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/ExpressionLanguage/Lexer.php
View File

@ -42,7 +42,7 @@ class Lexer
continue;
}
if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, 0, $cursor)) {
if (preg_match('/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A', $expression, $match, 0, $cursor)) {
// numbers
$number = (float) $match[0]; // floats
if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {

4
src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
View File

@ -97,8 +97,10 @@ class LexerTest extends TestCase
new Token('punctuation', '[', 25),
new Token('number', '4', 26),
new Token('punctuation', ']', 27),
new Token('operator', '-', 29),
new Token('number', '1990', 31),
],
'(3 + 5) ~ foo("bar").baz[4]',
'(3 + 5) ~ foo("bar").baz[4] - 1.99E+3',
],
[
[new Token('operator', '..', 1)],