asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #57620 from Haydoggo/expression-exp-fix

Browse source 
Fix Expression's parsing of positive exponent literals
This commit is contained in:
Rémi Verschelde 2022-02-05 10:14:10 +01:00 committed by GitHub
commit a0c87d4c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/math/expression.cpp
View file

@ -361,6 +361,7 @@ Error Expression::_get_token(Token &r_token) {
is_float = true; is_float = true;
} else if (c == 'e') { } else if (c == 'e') {
reading = READING_EXP; reading = READING_EXP;
is_float = true;
} else { } else {
reading = READING_DONE; reading = READING_DONE;
} }
@ -397,9 +398,6 @@ Error Expression::_get_token(Token &r_token) {
exp_beg = true; exp_beg = true;
} else if ((c == '-' || c == '+') && !exp_sign && !exp_beg) { } else if ((c == '-' || c == '+') && !exp_sign && !exp_beg) {
if (c == '-') {
is_float = true;
}
exp_sign = true; exp_sign = true;
} else { } else {

2
tests/core/math/test_expression.h
View file

@ -137,7 +137,7 @@ TEST_CASE("[Expression] Scientific notation") {
expression.parse("2e5") == OK, expression.parse("2e5") == OK,
"The expression should parse successfully."); "The expression should parse successfully.");
CHECK_MESSAGE( CHECK_MESSAGE(
Math::is_equal_approx(double(expression.execute()), 25), Math::is_equal_approx(double(expression.execute()), 2e5),
"The expression should return the expected result."); "The expression should return the expected result.");
CHECK_MESSAGE( CHECK_MESSAGE(