瀏覽代碼

* Merging revisions r45395 from trunk:
------------------------------------------------------------------------
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 -

michael 5 年之前
父節點
當前提交
02393dbf78
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 7 2
      packages/fcl-passrc/src/pscanner.pp
  2. 2 1
      packages/pastojs/src/pas2jsfiler.pp

+ 7 - 2
packages/fcl-passrc/src/pscanner.pp

@@ -665,7 +665,8 @@ type
     po_CheckCondFunction,    // error on unknown function in conditional expression, default: return '0'
     po_StopOnErrorDirective, // error on user $Error, $message error|fatal
     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;
 
@@ -3374,7 +3375,11 @@ begin
   if (H=Nil) then
     H:=FindResourceHandler('*');
   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.
   OptList:=TStringList.Create;
   try

+ 2 - 1
packages/pastojs/src/pas2jsfiler.pp

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