paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 18:07:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Correctly handle missing extensions for dotted include file names. Fixes issue #41064

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-12-16 15:02:19 +01:00
parent 98b1aee2a5
commit 5632af2afa
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/scanner.pas
View File

@ -1884,7 +1884,7 @@ type
function preproc_factor(eval: Boolean):texprvalue;
var
hs,countstr,storedpattern: string;
hs,countstr,storedpattern,fileext: string;
mac: tmacro;
srsym : tsym;
srsymtable : TSymtable;
@ -1920,15 +1920,16 @@ type
{ try to find the file, this like 'include' }
found:=findincludefile(path,name,foundfile);
if (not found) and (ExtractFileExt(name)='') then
fileext:=lower(ExtractFileExt(name));
if (not found) and ((fileext<>'.inc') and (fileext<>sourceext) and (fileext<>pasext)) then
begin
{ try default extensions .inc , .pp and .pas }
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,'.inc'),foundfile);
found:=findincludefile(path,name+'.inc',foundfile);
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,sourceext),foundfile);
found:=findincludefile(path,name+sourceext,foundfile);
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,pasext),foundfile);
found:=findincludefile(path,name+pasext,foundfile);
end;
if (not found) and (ExtractFileExt(name)=ExtensionSeparator) and (Length(name)>=2) then
found:=findincludefile(path,Copy(name,1,Length(name)-1),foundfile);
@ -2752,6 +2753,7 @@ type
hp : tinputfile;
found : boolean;
macroIsString : boolean;
fileext: string;
begin
current_scanner.skipspace;
args:=current_scanner.readcomment;
@ -2856,15 +2858,16 @@ type
{ try to find the file }
found:=findincludefile(path,name,foundfile);
if (not found) and (ExtractFileExt(name)='') then
fileext:=lower(ExtractFileExt(name));
if (not found) and ((fileext<>'.inc') and (fileext<>sourceext) and (fileext<>pasext)) then
begin
{ try default extensions .inc , .pp and .pas }
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,'.inc'),foundfile);
found:=findincludefile(path,name+'.inc',foundfile);
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,sourceext),foundfile);
found:=findincludefile(path,name+sourceext,foundfile);
if (not found) then
found:=findincludefile(path,ChangeFileExt(name,pasext),foundfile);
found:=findincludefile(path,name+pasext,foundfile);
end;
{ if the name ends in dot, try without the dot }
if (not found) and (ExtractFileExt(name)=ExtensionSeparator) and (Length(name)>=2) then

3
tests/webtbs/iwb41064.msg.pp Normal file
View File

@ -0,0 +1,3 @@
const
Hello = 'Hello world!';

9
tests/webtbs/twb41064.pp Normal file
View File

@ -0,0 +1,9 @@
program project1;
{$I iwb41064.msg}
begin
writeln(Hello);
readln;
end.