summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-09-11 12:34:39 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-09-11 12:34:39 +0200
commitd1caac5e75e633b52471afd3d437aaa50ed3c5fd (patch)
treee141c0acdc251a891a97c4d284661ad315fb0216 /core
parentc1bc42b3f1eb08c3e8fcff3121ac8f6f3270a4c1 (diff)
parentee9cea521d97088eb368cb1820db71100da9837b (diff)
downloadredot-engine-d1caac5e75e633b52471afd3d437aaa50ed3c5fd.tar.gz
Merge pull request #93856 from timothyqiu/expression-period
Fix parsing of `4.` in Expression
Diffstat (limited to 'core')
-rw-r--r--core/math/expression.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp
index 636c2c16bf..0692ece1e6 100644
--- a/core/math/expression.cpp
+++ b/core/math/expression.cpp
@@ -30,12 +30,7 @@
#include "expression.h"
-#include "core/io/marshalls.h"
-#include "core/math/math_funcs.h"
#include "core/object/class_db.h"
-#include "core/object/ref_counted.h"
-#include "core/os/os.h"
-#include "core/variant/variant_parser.h"
Error Expression::_get_token(Token &r_token) {
while (true) {
@@ -392,7 +387,6 @@ Error Expression::_get_token(Token &r_token) {
if (is_digit(c)) {
} else if (c == 'e') {
reading = READING_EXP;
-
} else {
reading = READING_DONE;
}
@@ -419,7 +413,9 @@ Error Expression::_get_token(Token &r_token) {
is_first_char = false;
}
- str_ofs--;
+ if (c != 0) {
+ str_ofs--;
+ }
r_token.type = TK_CONSTANT;