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

fcl-passrc: case statement: consistent calling AddExpression

Browse Source 
git-svn-id: trunk@43872 -
This commit is contained in:
Mattias Gaertner 2020-01-06 16:53:01 +00:00
parent 6612bb4434
commit 1ffc5f49aa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-passrc/src/pastree.pp
View File

@ -1557,6 +1557,7 @@ type
end; end;
{ TPasImplAssign } { TPasImplAssign }
TAssignKind = (akDefault,akAdd,akMinus,akMul,akDivision); TAssignKind = (akDefault,akAdd,akMinus,akMul,akDivision);
TPasImplAssign = class (TPasImplStatement) TPasImplAssign = class (TPasImplStatement)
public public
@ -1594,8 +1595,8 @@ type
procedure ForEachCall(const aMethodCall: TOnForEachPasElement; procedure ForEachCall(const aMethodCall: TOnForEachPasElement;
const Arg: Pointer); override; const Arg: Pointer); override;
public public
FinallyExcept: TPasImplTryHandler; FinallyExcept: TPasImplTryHandler; // not in Elements
ElseBranch: TPasImplTryExceptElse; ElseBranch: TPasImplTryExceptElse; // not in Elements
end; end;
TPasImplTryHandler = class(TPasImplBlock) TPasImplTryHandler = class(TPasImplBlock)

4
packages/fcl-passrc/src/pparser.pp
View File

@ -5924,9 +5924,9 @@ begin
CloseBlock; CloseBlock;
CloseStatement(false); CloseStatement(false);
end; end;
// Case ... else without semicolon in front.
end else if (CurBlock is TPasImplCaseStatement) then end else if (CurBlock is TPasImplCaseStatement) then
begin begin
// Case ... else without semicolon in front.
UngetToken; UngetToken;
CloseStatement(False); CloseStatement(False);
break; break;
@ -6118,7 +6118,7 @@ begin
//writeln(i,'CASE value="',Expr,'" Token=',CurTokenText); //writeln(i,'CASE value="',Expr,'" Token=',CurTokenText);
if CurBlock is TPasImplCaseStatement then if CurBlock is TPasImplCaseStatement then
begin begin
TPasImplCaseStatement(CurBlock).Expressions.Add(Left); TPasImplCaseStatement(CurBlock).AddExpression(Left);
Left:=nil; Left:=nil;
end end
else else