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

* Support for $I %unit% %module% %filename% includes

Browse Source 
git-svn-id: trunk@47379 -
This commit is contained in:
michael 2020-11-10 21:53:25 +00:00
parent c06a020c9c
commit df4fc55214
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3060,6 +3060,7 @@ begin
FCurModule:=Module; FCurModule:=Module;
HasFinished:=true; HasFinished:=true;
try try
Scanner.CurModuleName:=AUnitName;
if Assigned(Engine.Package) then if Assigned(Engine.Package) then
begin begin
Module.PackageName := Engine.Package.Name; Module.PackageName := Engine.Package.Name;
@ -3231,6 +3232,7 @@ begin
HasFinished:=true; HasFinished:=true;
FCurModule:=Module; FCurModule:=Module;
try try
Scanner.CurModuleName:=N;
if Assigned(Engine.Package) then if Assigned(Engine.Package) then
begin begin
Module.PackageName := Engine.Package.Name; Module.PackageName := Engine.Package.Name;
@ -3307,6 +3309,7 @@ begin
HasFinished:=true; HasFinished:=true;
FCurModule:=Module; FCurModule:=Module;
try try
Scanner.CurModuleName:=N;
if Assigned(Engine.Package) then if Assigned(Engine.Package) then
begin begin
Module.PackageName := Engine.Package.Name; Module.PackageName := Engine.Package.Name;

2
packages/fcl-passrc/src/pscanner.pp
View File

@ -703,6 +703,7 @@ type
FAllowedModeSwitches: TModeSwitches; FAllowedModeSwitches: TModeSwitches;
FAllowedValueSwitches: TValueSwitches; FAllowedValueSwitches: TValueSwitches;
FConditionEval: TCondDirectiveEvaluator; FConditionEval: TCondDirectiveEvaluator;
FCurModulename: string;
FCurrentBoolSwitches: TBoolSwitches; FCurrentBoolSwitches: TBoolSwitches;
FCurrentModeSwitches: TModeSwitches; FCurrentModeSwitches: TModeSwitches;
FCurrentValueSwitches: TValueSwitchArray; FCurrentValueSwitches: TValueSwitchArray;
@ -864,6 +865,7 @@ type
property Files: TStrings read FFiles; property Files: TStrings read FFiles;
property CurSourceFile: TLineReader read FCurSourceFile; property CurSourceFile: TLineReader read FCurSourceFile;
property CurFilename: string read FCurFilename; property CurFilename: string read FCurFilename;
property CurModuleName: string read FCurModulename Write FCurModuleName;
property CurLine: string read FCurLine; property CurLine: string read FCurLine;
property CurRow: Integer read FCurRow; property CurRow: Integer read FCurRow;
property CurColumn: Integer read GetCurColumn; property CurColumn: Integer read GetCurColumn;

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

@ -2877,6 +2877,17 @@ begin
SetStr(CurFilename); SetStr(CurFilename);
exit; exit;
end; end;
'%filename%':
begin
SetStr(ExtractFileName(CurFilename));
exit;
end;
'%unit%',
'%module%':
begin
SetStr(CurModuleName);
exit;
end;
'%line%': '%line%':
begin begin
SetStr(IntToStr(CurRow)); SetStr(IntToStr(CurRow));