TAG009 2020/05/03 3rd

Compiler ・Filenameタグ検索時にincludeタグがあると内部でエラーがでて読み込みに失敗するバグを修正
kuma4649 · May 3, 2020 · 16912c2 · 16912c2
1 parent 2c97841
commit 16912c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V����
+TAG009 2020/05/03 3rd
+  Compiler
+    �EFilename�^�O��������include�^�O������Ɠ����ŃG���[���łēǂݍ��݂Ɏ��s����o�O���C��
+
 TAG008 2020/05/03 2nd
   Compiler
     �EFilename�^�O�ɑΉ�

diff --git a/PMDDotNETCompiler/compiler.cs b/PMDDotNETCompiler/compiler.cs
@@ -116,8 +116,9 @@ public CompilerInfo GetCompilerInfo()
             return ci;
         }
 
-        public Tuple<string, string>[] GetTags(string srcBuf)
+        public Tuple<string, string>[] GetTags(string srcBuf, Func<string, Stream> appendFileReaderCallback)
         {
+            this.appendFileReaderCallback = appendFileReaderCallback;
             List<string> lstTag = new List<string>();
             List<Tuple<string, string>> tags = new List<Tuple<string, string>>();
 

diff --git a/PMDDotNETConsole/Program.cs b/PMDDotNETConsole/Program.cs
@@ -181,7 +181,7 @@ static void Compile(string[] args,int argIndex)
                         srcText = sr.ReadToEnd();
 
                     string outFileName = "";
-                    Tuple<string, string>[] tags = compiler.GetTags(srcText);
+                    Tuple<string, string>[] tags = compiler.GetTags(srcText, appendFileReaderCallback);
                     if (tags != null && tags.Length > 0)
                     {
                         foreach (Tuple<string, string> tag in tags)

diff --git a/PMDDotNETConsole/Properties/launchSettings.json b/PMDDotNETConsole/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "PMDDotNETConsole": {
       "commandName": "Project",
-      "commandLineArgs": "/v C:\\Users\\kuma\\Desktop\\pmd\\TT2S_15.mml"
+      "commandLineArgs": "/v C:\\Users\\kuma\\Desktop\\pmd\\KRAN_25.mml"
     }
   }
 }