Skip to content

Commit 39efbcf

Browse files
committed
Allow using any-case constants in Expression
1 parent dec5a37 commit 39efbcf

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

core/math/expression.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -441,36 +441,37 @@ Error Expression::_get_token(Token &r_token) {
441441

442442
str_ofs--; //go back one
443443

444-
if (id == "in") {
444+
const String lowercase_id = id.to_lower();
445+
if (lowercase_id == "in") {
445446
r_token.type = TK_OP_IN;
446-
} else if (id == "null") {
447+
} else if (lowercase_id == "null") {
447448
r_token.type = TK_CONSTANT;
448449
r_token.value = Variant();
449-
} else if (id == "true") {
450+
} else if (lowercase_id == "true") {
450451
r_token.type = TK_CONSTANT;
451452
r_token.value = true;
452-
} else if (id == "false") {
453+
} else if (lowercase_id == "false") {
453454
r_token.type = TK_CONSTANT;
454455
r_token.value = false;
455-
} else if (id == "PI") {
456+
} else if (lowercase_id == "pi") {
456457
r_token.type = TK_CONSTANT;
457458
r_token.value = Math::PI;
458-
} else if (id == "TAU") {
459+
} else if (lowercase_id == "tau") {
459460
r_token.type = TK_CONSTANT;
460461
r_token.value = Math::TAU;
461-
} else if (id == "INF") {
462+
} else if (lowercase_id == "inf") {
462463
r_token.type = TK_CONSTANT;
463464
r_token.value = Math::INF;
464-
} else if (id == "NAN") {
465+
} else if (lowercase_id == "nan") {
465466
r_token.type = TK_CONSTANT;
466467
r_token.value = Math::NaN;
467-
} else if (id == "not") {
468+
} else if (lowercase_id == "not") {
468469
r_token.type = TK_OP_NOT;
469-
} else if (id == "or") {
470+
} else if (lowercase_id == "or") {
470471
r_token.type = TK_OP_OR;
471-
} else if (id == "and") {
472+
} else if (lowercase_id == "and") {
472473
r_token.type = TK_OP_AND;
473-
} else if (id == "self") {
474+
} else if (lowercase_id == "self") {
474475
r_token.type = TK_SELF;
475476
} else {
476477
{

0 commit comments

Comments
 (0)