diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-12 09:52:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 09:52:37 +0200 |
| commit | 9b7e16a6b8b80fe61881e8f4df28550e18050dd2 (patch) | |
| tree | bb9a4470e519b60133c7c6ba0931a84c09f4d6a0 | |
| parent | 516ec892b43a89ac19dfa608b9d754f630a646cc (diff) | |
| parent | be8eb6625e31254d11f5ac18dfc10c3c24561c04 (diff) | |
Merge pull request #60961 from Chaosus/gds_fix_pow_priority
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index e96a2b2025..a2dc9bb8a8 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -3273,7 +3273,7 @@ GDScriptParser::ParseRule *GDScriptParser::get_rule(GDScriptTokenizer::Token::Ty { &GDScriptParser::parse_unary_operator, &GDScriptParser::parse_binary_operator, PREC_ADDITION_SUBTRACTION }, // PLUS, { &GDScriptParser::parse_unary_operator, &GDScriptParser::parse_binary_operator, PREC_ADDITION_SUBTRACTION }, // MINUS, { nullptr, &GDScriptParser::parse_binary_operator, PREC_FACTOR }, // STAR, - { nullptr, &GDScriptParser::parse_binary_operator, PREC_FACTOR }, // STAR_STAR, + { nullptr, &GDScriptParser::parse_binary_operator, PREC_POWER }, // STAR_STAR, { nullptr, &GDScriptParser::parse_binary_operator, PREC_FACTOR }, // SLASH, { nullptr, &GDScriptParser::parse_binary_operator, PREC_FACTOR }, // PERCENT, // Assignment diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index a9f407fbb5..ab05ac5f51 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -1265,6 +1265,7 @@ private: PREC_FACTOR, PREC_SIGN, PREC_BIT_NOT, + PREC_POWER, PREC_TYPE_TEST, PREC_AWAIT, PREC_CALL, |