change: [独自ヘッダー]ファイル冒頭に特定ヘッダーが無ければ読込をスキップするように

サンプルマップにも反映
automatic9045 · Jul 10, 2023 · b9775a6 · b9775a6
1 parent 2b4bca7
commit b9775a6
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 15 deletions.
diff --git a/AtsEx/MapStatements/HeaderSet.Factory.cs b/AtsEx/MapStatements/HeaderSet.Factory.cs
@@ -12,6 +12,9 @@ namespace AtsEx.MapStatements
 {
     internal partial class HeaderSet
     {
+        private readonly static Identifier UseAtsExHeader;
+        private readonly static string UseAtsExHeaderFullName;
+
         private readonly static Identifier NoMapPluginHeader;
         private readonly static string NoMapPluginHeaderFullName;
 
@@ -23,6 +26,9 @@ internal partial class HeaderSet
 
         static HeaderSet()
         {
+            UseAtsExHeader = new Identifier(Namespace.Root, "useatsex");
+            UseAtsExHeaderFullName = $"[[{UseAtsExHeader.FullName}]]";
+
             NoMapPluginHeader = new Identifier(Namespace.Root, "nompi");
             NoMapPluginHeaderFullName = $"[[{NoMapPluginHeader.FullName}]]";
 
@@ -41,29 +47,32 @@ private static (IDictionary<Identifier, IReadOnlyList<Header>> Headers, IReadOnl
             ConcurrentDictionary<Identifier, IReadOnlyList<Header>> headers = new ConcurrentDictionary<Identifier, IReadOnlyList<Header>>();
             List<Header> noMapPluginHeaders = new List<Header>();
 
-            string fileName = Path.GetFileName(filePath);
-
             string text;
             using (StreamReader sr = new StreamReader(filePath))
             {
                 text = sr.ReadToEnd();
             }
 
-            List<MapTextParser.TextWithPosition> statements = MapTextParser.GetStatementsFromText(text);
-            statements.ForEach(s =>
+            bool isFirstStatement = true;
+            IEnumerable<MapTextParser.TextWithPosition> statements = MapTextParser.GetStatementsFromText(text);
+            foreach (MapTextParser.TextWithPosition s in statements)
             {
                 if (s.Text.StartsWith("include'") && s.Text.EndsWith("'") && s.Text.Length - s.Text.Replace("'", "").Length == 2)
                 {
                     string includePath = s.Text.Split('\'')[1];
                     int headerCloseBracketIndex = includePath.IndexOf(HeaderNameCloseBracket);
+
+                    if (isFirstStatement && !includePath.StartsWith(UseAtsExHeaderFullName)) break;
+                    isFirstStatement = false;
+
                     if (includePath.StartsWith(HeaderNameOpenBracket) && headerCloseBracketIndex != -1)
                     {
                         string headerFullName = includePath.Substring(HeaderNameOpenBracket.Length, headerCloseBracketIndex - HeaderNameOpenBracket.Length);
                         string headerArgument = includePath.Substring(headerCloseBracketIndex + HeaderNameCloseBracket.Length);
 
                         Identifier identifier = Identifier.Parse(headerFullName);
                         Header header = new Header(identifier, headerArgument, s.LineIndex, s.CharIndex);
-                        if (header.Name.Namespace is null || !header.Name.Namespace.IsChildOf(Namespace.Root)) return;
+                        if (header.Name.Namespace is null || !header.Name.Namespace.IsChildOf(Namespace.Root)) continue;
 
                         List<Header> list = headers.GetOrAdd(identifier, new List<Header>()) as List<Header>;
                         list.Add(header);
@@ -85,7 +94,7 @@ private static (IDictionary<Identifier, IReadOnlyList<Header>> Headers, IReadOnl
                         string includeRelativePath = includePath;
                         string includeAbsolutePath = Path.Combine(Path.GetDirectoryName(filePath), includeRelativePath);
 
-                        if (!File.Exists(includeAbsolutePath)) return;
+                        if (!File.Exists(includeAbsolutePath)) continue;
 
                         (IDictionary<Identifier, IReadOnlyList<Header>> headersInIncludedMap, IReadOnlyList<Header> noMapPluginHeadersInIncludedMap) = Load(includeAbsolutePath, readDepth - 1);
 
@@ -98,7 +107,7 @@ private static (IDictionary<Identifier, IReadOnlyList<Header>> Headers, IReadOnl
                         noMapPluginHeaders.AddRange(noMapPluginHeadersInIncludedMap);
                     }
                 }
-            });
+            }
 
             return (headers, noMapPluginHeaders);
         }

diff --git a/AtsEx/MapStatements/MapTextParser.cs b/AtsEx/MapStatements/MapTextParser.cs
@@ -8,12 +8,10 @@ namespace AtsEx.MapStatements
 {
     internal static class MapTextParser
     {
-        public static List<TextWithPosition> GetStatementsFromText(string text)
+        public static IEnumerable<TextWithPosition> GetStatementsFromText(string text)
         {
             string trimmedLine = text.ToLower();
 
-            List<TextWithPosition> statements = new List<TextWithPosition>();
-
             {
                 bool isInString = false;
 
@@ -45,7 +43,7 @@ public static List<TextWithPosition> GetStatementsFromText(string text)
                                 int nextLineBreakIndex = text.IndexOf('\n', i);
                                 if (nextLineBreakIndex == -1)
                                 {
-                                    return statements;
+                                    yield break;
                                 }
                                 else
                                 {
@@ -55,7 +53,7 @@ public static List<TextWithPosition> GetStatementsFromText(string text)
                             break;
 
                         case '#':
-                            return statements;
+                            yield break;
 
                         case '\'':
                             isInString = !isInString;
@@ -81,7 +79,7 @@ public static List<TextWithPosition> GetStatementsFromText(string text)
                                     string notTrimmedStatementText = text.Substring(notTrimmedLastStatementEndIndex + 1, n - notTrimmedLastStatementEndIndex);
 
                                     int headSpaceCount = notTrimmedStatementText.Length - notTrimmedStatementText.TrimStart().Length;
-                                    statements.Add(new TextWithPosition(lineIndex, notTrimmedLastStatementEndIndex + headSpaceCount + 1 - notTrimmedLastLineBreakIndex, statementText));
+                                    yield return new TextWithPosition(lineIndex, notTrimmedLastStatementEndIndex + headSpaceCount + 1 - notTrimmedLastLineBreakIndex, statementText);
                                 }
 
                                 lastStatementEndIndex = i;
@@ -94,8 +92,6 @@ public static List<TextWithPosition> GetStatementsFromText(string text)
                     n++;
                 }
             }
-
-            return statements;
         }
 
         internal class TextWithPosition

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/BaseMap.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/BaseMap.txt
@@ -1,5 +1,7 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
+
 include '[[AtsEx::NOMPI]] このマップでは AtsEX マッププラグインを使用しています。正常動作には車両に AtsEX を搭載する必要があります。詳細は https://automatic9045.github.io をご覧ください。';
 include '[[AtsEx::NOMPI]] This map requires an AtsEX-powered vehicle to execute map plugins. For more information, visit https://automatic9045.github.io';
 

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ChangeRunningResistance/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ChangeRunningResistance/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlPreTrain/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlPreTrain/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlSignal/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlSignal/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlTrains/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlTrains/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlTrainsEx/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ControlTrainsEx/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/CooperateWithVehiclePlugin/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/CooperateWithVehiclePlugin/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/DXDynamicTexture/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/DXDynamicTexture/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/EditStations/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/EditStations/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/Empty/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/Empty/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 Structure.Load('..\..\Structures.csv');

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ExtendedBeacons/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ExtendedBeacons/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/MapStatements/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/MapStatements/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml'; // MapPluginUsing も独自ヘッダーの一種です。

diff --git a/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ScriptPlugins/Map.txt b/_SampleScenarios/AtsEx.Samples/Maps/Basic/Samples/ScriptPlugins/Map.txt
@@ -1,5 +1,6 @@
 BveTs Map 2.02:utf-8
 
+include '[[AtsEx::USEATSEX]]';
 include '[[AtsEx::READDEPTH]]1';
 
 include '<AtsEx::MapPluginUsing>MapPluginUsing.xml';