From b60590d691f04c65c0614f9e5c551fcb03ae9460 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Mon, 8 Sep 2014 12:27:00 +0000 Subject: [PATCH] fpspreadsheet: Fix priority of percent operator for formula calculation git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3531 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/fpsexprparser.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/fpspreadsheet/fpsexprparser.pas b/components/fpspreadsheet/fpsexprparser.pas index 63ce1f46f..c76ca1f71 100644 --- a/components/fpspreadsheet/fpsexprparser.pas +++ b/components/fpspreadsheet/fpsexprparser.pas @@ -1552,6 +1552,10 @@ begin Result := TsUPlusExprNode.Create(self, Result); if isMinus then Result := TsUMinusExprNode.Create(self, Result); + if TokenType = ttPercent then begin + Result := TsPercentExprNode.Create(self, Result); + GetToken; + end; end; function TsExpressionParser.Level6: TsExprNode; @@ -1740,10 +1744,6 @@ begin end; end; GetToken; - if TokenType = ttPercent then begin - Result := TsPercentExprNode.Create(self, Result); - GetToken; - end; end; function TsExpressionParser.ResultType: TsResultType;