paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-26 21:10:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r45395 from trunk:

Browse Source 
------------------------------------------------------------------------
    r45395 | michael | 2020-05-17 09:54:41 +0200 (Sun, 17 May 2020) | 1 line
    
    * Add switch to ignore unknown resources
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46644 -
This commit is contained in:
michael 2020-08-23 10:34:08 +00:00
parent fc661e0d02
commit 02393dbf78
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,7 +665,8 @@ type
po_CheckCondFunction, // error on unknown function in conditional expression, default: return '0' po_CheckCondFunction, // error on unknown function in conditional expression, default: return '0'
po_StopOnErrorDirective, // error on user $Error, $message error|fatal po_StopOnErrorDirective, // error on user $Error, $message error|fatal
po_ExtConstWithoutExpr, // allow typed const without expression in external class and with external modifier po_ExtConstWithoutExpr, // allow typed const without expression in external class and with external modifier
po_StopOnUnitInterface // parse only a unit name and stop at interface keyword po_StopOnUnitInterface, // parse only a unit name and stop at interface keyword
po_IgnoreUnknownResource // Ignore resources for which no handler is registered.
); );
TPOptions = set of TPOption; TPOptions = set of TPOption;
@ -3374,7 +3375,11 @@ begin
if (H=Nil) then if (H=Nil) then
H:=FindResourceHandler('*'); H:=FindResourceHandler('*');
if (H=Nil) then if (H=Nil) then
Error(nNoResourceSupport,SNoResourceSupport,[Ext]); begin
if not (po_IgnoreUnknownResource in Options) then
Error(nNoResourceSupport,SNoResourceSupport,[Ext]);
exit;
end;
// Let the handler take care of the rest. // Let the handler take care of the rest.
OptList:=TStringList.Create; OptList:=TStringList.Create;
try try

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

@ -106,7 +106,8 @@ const
'CheckCondFunction', 'CheckCondFunction',
'StopOnErrorDirective', 'StopOnErrorDirective',
'ExtClassConstWithoutExpr', 'ExtClassConstWithoutExpr',
'StopOnUnitInterface'); 'StopOnUnitInterface',
'IgnoreUnknownResource');
PCUDefaultModeSwitches: TModeSwitches = [ PCUDefaultModeSwitches: TModeSwitches = [
msObjfpc, msObjfpc,