Formula engine: fix exponentiation being left-associative

wesnoth · Mar 18, 2016 · a446921 · a446921
1 parent 0b84677
commit a446921
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/formula.cpp b/src/formula.cpp
@@ -888,7 +888,9 @@ expression_ptr parse_expression(const token* i1, const token* i2, function_symbo
 		} else if(parens == 0 && i->type == TOKEN_OPERATOR) {
 			if( ( !operator_group ) && (op == NULL || operator_precedence(*op) >=
 							 operator_precedence(*i)) ) {
-				op = i;
+				// Need special exception for exponentiation to be right-associative
+				if(*i->begin != '^' || op == NULL || *op->begin != '^')
+					op = i;
 			}
 			operator_group = true;
 		} else {