paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 06:39:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: try except on do else end without semicolon at do statement

Browse Source 
git-svn-id: trunk@45473 -
This commit is contained in:
Mattias Gaertner 2020-05-23 13:18:38 +00:00
parent e0d2651a61
commit 766ccac8df
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5955,7 +5955,8 @@ begin
else if (CurBlock is TPasImplWhileDo) else if (CurBlock is TPasImplWhileDo)
or (CurBlock is TPasImplForLoop) or (CurBlock is TPasImplForLoop)
or (CurBlock is TPasImplWithDo) or (CurBlock is TPasImplWithDo)
or (CurBlock is TPasImplRaise) then or (CurBlock is TPasImplRaise)
or (CurBlock is TPasImplExceptOn) then
// simply close block // simply close block
else else
ParseExcSyntaxError; ParseExcSyntaxError;

39
packages/fcl-passrc/tests/tcstatements.pas
View File

@ -115,6 +115,7 @@ Type
Procedure TestTryExceptOn2; Procedure TestTryExceptOn2;
Procedure TestTryExceptOnElse; Procedure TestTryExceptOnElse;
Procedure TestTryExceptOnIfElse; Procedure TestTryExceptOnIfElse;
Procedure TestTryExceptOnElseNoSemicolo;
procedure TestTryExceptRaise; procedure TestTryExceptRaise;
Procedure TestAsm; Procedure TestAsm;
Procedure TestAsmBlock; Procedure TestAsmBlock;
@ -1705,6 +1706,44 @@ begin
AssertExpression('DoSomething call',S.Expr,pekIdent,'DoSomethingMore'); AssertExpression('DoSomething call',S.Expr,pekIdent,'DoSomethingMore');
end; end;
procedure TTestStatementParser.TestTryExceptOnElseNoSemicolo;
Var
T : TPasImplTry;
S : TPasImplSimple;
E : TPasImplTryExcept;
O : TPasImplExceptOn;
EE : TPasImplTryExceptElse;
begin
TestStatement(['Try',' DoSomething;','except','On E : Exception do','DoSomethingElse','else','DoSomethingMore','end']);
T:=AssertStatement('Try statement',TPasImplTry) as TPasImplTry;
AssertEquals(1,T.Elements.Count);
AssertNotNull(T.FinallyExcept);
AssertNotNull(T.ElseBranch);
AssertNotNull(T.Elements[0]);
AssertEquals('Simple statement',TPasImplSimple,TPasElement(T.Elements[0]).ClassType);
S:=TPasImplSimple(T.Elements[0]);
AssertExpression('DoSomething call',S.Expr,pekIdent,'DoSomething');
AssertEquals('Simple statement',TPasImplSimple,TPasElement(T.Elements[0]).ClassType);
AssertEquals('Except statement',TPasImplTryExcept,T.FinallyExcept.ClassType);
E:=TPasImplTryExcept(T.FinallyExcept);
AssertEquals(1,E.Elements.Count);
AssertEquals('Except on handler',TPasImplExceptOn,TPasElement(E.Elements[0]).ClassType);
O:=TPasImplExceptOn(E.Elements[0]);
AssertEquals('Exception Variable name','E',O.VariableName);
AssertEquals('Exception Type name','Exception',O.TypeName);
AssertEquals(1,O.Elements.Count);
AssertEquals('Simple statement',TPasImplSimple,TPasElement(O.Elements[0]).ClassType);
S:=TPasImplSimple(O.Elements[0]);
AssertExpression('DoSomethingElse call',S.Expr,pekIdent,'DoSomethingElse');
AssertEquals('Except Else statement',TPasImplTryExceptElse,T.ElseBranch.ClassType);
EE:=TPasImplTryExceptElse(T.ElseBranch);
AssertEquals(1,EE.Elements.Count);
AssertNotNull(EE.Elements[0]);
AssertEquals('Simple statement',TPasImplSimple,TPasElement(EE.Elements[0]).ClassType);
S:=TPasImplSimple(EE.Elements[0]);
AssertExpression('DoSomething call',S.Expr,pekIdent,'DoSomethingMore');
end;
procedure TTestStatementParser.TestTryExceptRaise; procedure TTestStatementParser.TestTryExceptRaise;
Var Var
T : TPasImplTry; T : TPasImplTry;