TAG036 2020/08/21

  他アプリとの連携のための微調整

CHANGE.txt

@@ -1,4 +1,7 @@
 �X�V����
+TAG036 2020/08/21
+  ���A�v���Ƃ̘A�g�̂��߂̔�����
+
 TAG035 2020/08/17
   Log�o�͎��̃��\�b�h�����Ԉ���Ă����̂��C���B
 

PMDDotNETCompiler/mc.cs

@@ -9331,7 +9331,14 @@ private void error(int dh, int dl, int si)
             //; ------------------------------------------------------------------------------
             if (si != 0)
             {
-                mes += System.IO.Path.GetFileName(mml_seg.mml_filename);
+                try
+                {
+                    mes += System.IO.Path.GetFileName(mml_seg.mml_filename);
+                }
+                catch
+                {
+                    mes += mml_seg.mml_filename;
+                }
                 mes += string.Format("({0}) :", mml_seg.line);
             }
 

PMDDotNETDriver/PMDDotNETOption.cs

@@ -17,7 +17,6 @@ public class PMDDotNETOption
         public string[] envPmd;
         public string[] envPmdOpt;
         public string srcFile;
-
-        public string PPCHeader { get; internal set; }
+        public string PPCHeader;
     }
 }

PMDDotNETDriver/driver.cs

@@ -253,19 +253,31 @@ public void Init(string fileName, Action<ChipDatum> opnaWrite, Action<long, int>
                 isSPB = (bool)pdnos[7],
                 envPmd = (string[])pdnos[8],
                 envPmdOpt = (string[])pdnos[9],
-                srcFile = (string)pdnos[10]
+                srcFile = (string)pdnos[10],
+                PPCHeader = (string)pdnos[11]
             };
 
+            Func<string, Stream> appendFileReaderCallback = 
+                (pdnos.Length < 13 || pdnos[12] == null) 
+                ? CreateAppendFileReaderCallback(Path.GetDirectoryName(fileName)) 
+                : (Func<string, Stream>)pdnos[12];
             string[] po = (string[])option[1];
             Func<ChipDatum, int> ppz8Write = (Func<ChipDatum, int>)option[2];
             Func<ChipDatum, int> ppsdrvWrite = (Func<ChipDatum, int>)option[3];
             Init(
                 srcBuf,
                 opnaWrite, opnaWaitSend,
                 pdno, po
-                , CreateAppendFileReaderCallback(Path.GetDirectoryName(fileName))
+                , appendFileReaderCallback
                 , ppz8Write
                 , ppsdrvWrite);
+
+            pdnos[2] = pdno.isAUTO;
+            pdnos[3] = pdno.isVA;
+            pdnos[4] = pdno.isNRM;
+            pdnos[5] = pdno.usePPS;
+            pdnos[6] = pdno.usePPZ;
+            pdnos[7] = pdno.isSPB;
         }
 
         public void Init(