From be8eb6625e31254d11f5ac18dfc10c3c24561c04 Mon Sep 17 00:00:00 2001 From: Yuri Rubinsky Date: Thu, 12 May 2022 10:02:03 +0300 Subject: Fix incorrect precedence of pow operator in GDScript --- modules/gdscript/gdscript_parser.cpp | 2 +- modules/gdscript/gdscript_parser.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3