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

pas2js: fixed skipping #else

Browse Source 
git-svn-id: trunk@38058 -
This commit is contained in:
Mattias Gaertner 2018-01-27 14:12:43 +00:00
parent eb3ba71b98
commit b0367d4430
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/pastojs/src/pas2jscompiler.pp
View File

@ -2051,9 +2051,9 @@ begin
'else':
begin
if IfLvl=0 then
CfgSyntaxError('"'+Directive+'" without ifdef');
CfgSyntaxError('"'+Directive+'" without #ifdef');
if (Skip=skipElse) and (IfLvl=SkipLvl) then
CfgSyntaxError('"there was already an $else');;
CfgSyntaxError('"there was already an #else');
if (Skip=skipIf) and (IfLvl=SkipLvl) then
begin
// if-block was skipped -> execute else block
@ -2067,12 +2067,13 @@ begin
if ShowDebug then
DebugCfgDirective('skip');
Skip:=skipElse;
SkipLvl:=IfLvl;
end;
end;
'elseif':
begin
if IfLvl=0 then
CfgSyntaxError('"'+Directive+'" without ifdef');
CfgSyntaxError('"'+Directive+'" without #ifdef');
if (Skip=skipIf) and (IfLvl=SkipLvl) then
begin
// if-block was skipped -> try this elseif
@ -2100,7 +2101,7 @@ begin
'endif':
begin
if IfLvl=0 then
CfgSyntaxError('"'+Directive+'" without ifdef');
CfgSyntaxError('"'+Directive+'" without #ifdef');
dec(IfLvl);
if IfLvl<SkipLvl then
begin
@ -2115,7 +2116,7 @@ begin
ParamFatal('user defined: '+copy(Line,p-PChar(Line)+1,length(Line)))
else
if Skip=skipNone then
CfgSyntaxError('unknown directive "'+Directive+'"')
CfgSyntaxError('unknown directive "#'+Directive+'"')
else
DebugCfgDirective('skipping unknown directive');
end;