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

pastojs: fixed exit in program begin-end

Browse Source 
git-svn-id: trunk@35905 -
This commit is contained in:
Mattias Gaertner 2017-04-22 15:53:07 +00:00
parent c212a71dff
commit b4a4ad725c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/pastojs/src/fppas2js.pp
View File

@ -6005,7 +6005,8 @@ begin
begin begin
// without parameter. // without parameter.
ProcEl:=El.Parent; ProcEl:=El.Parent;
while not (ProcEl is TPasProcedure) do ProcEl:=ProcEl.Parent; while (ProcEl<>nil) and not (ProcEl is TPasProcedure) do
ProcEl:=ProcEl.Parent;
if ProcEl is TPasFunction then if ProcEl is TPasFunction then
// in a function, "return result;" // in a function, "return result;"
TJSReturnStatement(Result).Expr:=CreateBuiltInIdentifierExpr(ResolverResultVar) TJSReturnStatement(Result).Expr:=CreateBuiltInIdentifierExpr(ResolverResultVar)

5
packages/pastojs/tests/tcmodules.pas
View File

@ -2119,7 +2119,10 @@ begin
' return Result;', ' return Result;',
'};' '};'
]), ]),
''); LinesToStr([
'return;',
'return 1;',
'']));
end; end;
procedure TTestModule.TestBreak; procedure TTestModule.TestBreak;