paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 20:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Pascal Riekenberg to fix HasAggregate for functions

Browse Source 
git-svn-id: trunk@37057 -
This commit is contained in:
michael 2017-08-25 07:54:07 +00:00
parent e325284160
commit 6e308feb60
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/fcl-base/src/fpexprpars.pp
View File

@ -567,6 +567,9 @@ Type
Procedure Check; override; Procedure Check; override;
Constructor CreateFunction(AID : TFPExprIdentifierDef; Const Args : TExprArgumentArray); virtual; Constructor CreateFunction(AID : TFPExprIdentifierDef; Const Args : TExprArgumentArray); virtual;
Destructor Destroy; override; Destructor Destroy; override;
Procedure InitAggregate; override;
Procedure UpdateAggregate; override;
Function HasAggregate : Boolean; override;
Property ArgumentNodes : TExprArgumentArray Read FArgumentNodes; Property ArgumentNodes : TExprArgumentArray Read FArgumentNodes;
Property ArgumentParams : TExprParameterArray Read FArgumentParams; Property ArgumentParams : TExprParameterArray Read FArgumentParams;
Function AsString : String; override; Function AsString : String; override;
@ -3382,6 +3385,19 @@ begin
end; end;
end; end;
function TFPExprFunction.HasAggregate: Boolean;
var
I: Integer;
begin
Result := true;
if IsAggregate then
exit;
For I:=0 to Length(FArgumentNodes)-1 do
if FArgumentNodes[I].HasAggregate then
exit;
Result := false;
end;
procedure TFPExprFunction.Check; procedure TFPExprFunction.Check;
Var Var
@ -3428,6 +3444,22 @@ begin
inherited Destroy; inherited Destroy;
end; end;
procedure TFPExprFunction.InitAggregate;
var
I: Integer;
begin
For I:=0 to Length(FArgumentNodes)-1 do
FArgumentNodes[i].InitAggregate;
end;
procedure TFPExprFunction.UpdateAggregate;
var
I: Integer;
begin
For I:=0 to Length(FArgumentNodes)-1 do
FArgumentNodes[i].UpdateAggregate;
end;
function TFPExprFunction.AsString: String; function TFPExprFunction.AsString: String;
Var Var