pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix priority of percent operator for formula calculation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3531 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-09-08 12:27:00 +00:00
parent 5279284bf0
commit b60590d691
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/fpsexprparser.pas
View File

@@ -1552,6 +1552,10 @@ begin
Result := TsUPlusExprNode.Create(self, Result); Result := TsUPlusExprNode.Create(self, Result);
if isMinus then if isMinus then
Result := TsUMinusExprNode.Create(self, Result); Result := TsUMinusExprNode.Create(self, Result);
if TokenType = ttPercent then begin
Result := TsPercentExprNode.Create(self, Result);
GetToken;
end;
end; end;
function TsExpressionParser.Level6: TsExprNode; function TsExpressionParser.Level6: TsExprNode;
@@ -1740,10 +1744,6 @@ begin
end; end;
end; end;
GetToken; GetToken;
if TokenType = ttPercent then begin
Result := TsPercentExprNode.Create(self, Result);
GetToken;
end;
end; end;
function TsExpressionParser.ResultType: TsResultType; function TsExpressionParser.ResultType: TsResultType;