feat: 支持 Dispose 接口。

CYJB · Mar 14, 2024 · b35874a · b35874a
1 parent c40f0d8
commit b35874a
Show file tree

Hide file tree

Showing 18 changed files with 93 additions and 17 deletions.
diff --git a/Compilers/Cyjb.Compilers.csproj b/Compilers/Cyjb.Compilers.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <NeutralLanguage>en</NeutralLanguage>
     <Version>$(VersionPrefix)</Version>
-    <VersionPrefix>1.0.16</VersionPrefix>
+    <VersionPrefix>1.0.17</VersionPrefix>
     <RootNamespace>Cyjb.Compilers</RootNamespace>
     <Authors>CYJB</Authors>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/Compilers/Parsers/Parser`2.Build.cs b/Compilers/Parsers/Parser`2.Build.cs
@@ -10,6 +10,10 @@ public partial class Parser<T, TController>
 	/// </summary>
 	private readonly List<LRState<T>> states = new();
 	/// <summary>
+	/// GOTO 表的个数。
+	/// </summary>
+	private int gotoCount = 0;
+	/// <summary>
 	/// 非终结符号的 FIRST 集。
 	/// </summary>
 	private readonly Dictionary<Symbol<T>, HashSet<Symbol<T>>> firstSet = new();
@@ -139,7 +143,6 @@ public ParserData<T> GetData()
 		}
 		// 提取产生式数据
 		List<ProductionData<T>> productionData = new();
-		int gotoCount = 0;
 		foreach (Production<T> production in productions)
 		{
 			// 只有产生式头才会有 goto 数据。

diff --git a/Design/Cyjb.Compilers.Design.csproj b/Design/Cyjb.Compilers.Design.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <NeutralLanguage>en</NeutralLanguage>
     <Version>$(VersionPrefix)</Version>
-    <VersionPrefix>1.0.16</VersionPrefix>
+    <VersionPrefix>1.0.17</VersionPrefix>
     <RootNamespace>Cyjb.Compilers</RootNamespace>
     <OutputType>Library</OutputType>
     <DevelopmentDependency>true</DevelopmentDependency>

diff --git a/Design/Tools/Cyjb.Compilers.Design.dll b/Design/Tools/Cyjb.Compilers.Design.dll
diff --git a/Design/Tools/Cyjb.Compilers.Runtime.dll b/Design/Tools/Cyjb.Compilers.Runtime.dll
diff --git a/Design/Tools/Cyjb.Compilers.dll b/Design/Tools/Cyjb.Compilers.dll
diff --git a/Design/Tools/Generator.deps.json b/Design/Tools/Generator.deps.json
@@ -9,8 +9,8 @@
       "Generator/1.0.0": {
         "dependencies": {
           "Cyjb": "1.0.22",
-          "Cyjb.Compilers": "1.0.16",
-          "Cyjb.Compilers.Design": "1.0.16",
+          "Cyjb.Compilers": "1.0.17",
+          "Cyjb.Compilers.Design": "1.0.17",
           "Microsoft.CodeAnalysis.CSharp": "4.8.0"
         },
         "runtime": {
@@ -166,10 +166,10 @@
         }
       },
       "System.Runtime.CompilerServices.Unsafe/6.0.0": {},
-      "Cyjb.Compilers/1.0.16": {
+      "Cyjb.Compilers/1.0.17": {
         "dependencies": {
           "Cyjb": "1.0.22",
-          "Cyjb.Compilers.Runtime": "1.0.16"
+          "Cyjb.Compilers.Runtime": "1.0.17"
         },
         "runtime": {
           "Cyjb.Compilers.dll": {}
@@ -180,15 +180,15 @@
           }
         }
       },
-      "Cyjb.Compilers.Design/1.0.16": {
+      "Cyjb.Compilers.Design/1.0.17": {
         "dependencies": {
-          "Cyjb.Compilers.Runtime": "1.0.16"
+          "Cyjb.Compilers.Runtime": "1.0.17"
         },
         "runtime": {
           "Cyjb.Compilers.Design.dll": {}
         }
       },
-      "Cyjb.Compilers.Runtime/1.0.16": {
+      "Cyjb.Compilers.Runtime/1.0.17": {
         "dependencies": {
           "Cyjb": "1.0.22"
         },
@@ -258,17 +258,17 @@
       "path": "system.runtime.compilerservices.unsafe/6.0.0",
       "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
     },
-    "Cyjb.Compilers/1.0.16": {
+    "Cyjb.Compilers/1.0.17": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Cyjb.Compilers.Design/1.0.16": {
+    "Cyjb.Compilers.Design/1.0.17": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Cyjb.Compilers.Runtime/1.0.16": {
+    "Cyjb.Compilers.Runtime/1.0.17": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/Design/Tools/Generator.dll b/Design/Tools/Generator.dll
diff --git a/Design/Tools/zh-Hans/Cyjb.Compilers.Runtime.resources.dll b/Design/Tools/zh-Hans/Cyjb.Compilers.Runtime.resources.dll
diff --git a/Design/Tools/zh-Hans/Cyjb.Compilers.resources.dll b/Design/Tools/zh-Hans/Cyjb.Compilers.resources.dll
diff --git a/Design/Tools/zh-Hans/Generator.resources.dll b/Design/Tools/zh-Hans/Generator.resources.dll
diff --git a/Design/Tools/zh-Hans/System.CommandLine.resources.dll b/Design/Tools/zh-Hans/System.CommandLine.resources.dll
diff --git a/Runtime/Cyjb.Compilers.Runtime.csproj b/Runtime/Cyjb.Compilers.Runtime.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <NeutralLanguage>en</NeutralLanguage>
     <Version>$(VersionPrefix)</Version>
-    <VersionPrefix>1.0.16</VersionPrefix>
+    <VersionPrefix>1.0.17</VersionPrefix>
     <RootNamespace>Cyjb.Compilers</RootNamespace>
     <Authors>CYJB</Authors>
     <PackageTags>Compiler</PackageTags>

diff --git a/Runtime/Lexers/LexerController`1.cs b/Runtime/Lexers/LexerController`1.cs
@@ -7,7 +7,7 @@ namespace Cyjb.Compilers.Lexers;
 /// 表示词法分析器的控制器。
 /// </summary>
 /// <typeparam name="T">词法单元标识符的类型，一般是一个枚举类型。</typeparam>
-public class LexerController<T>
+public class LexerController<T> : IDisposable
 	where T : struct
 {
 	/// <summary>
@@ -303,6 +303,32 @@ public void More()
 		IsMore = true;
 	}
 
+	#region IDisposable 成员
+
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// <overloads>
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// </overloads>
+	public void Dispose()
+	{
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// <param name="disposing">是否释放托管资源。</param>
+	protected virtual void Dispose(bool disposing)
+	{
+	}
+
+	#endregion // IDisposable 成员
+
 	#region 上下文切换
 
 	/// <summary>

diff --git a/Runtime/Lexers/TokenizerBase`1.cs b/Runtime/Lexers/TokenizerBase`1.cs
@@ -265,6 +265,7 @@ protected virtual void Dispose(bool disposing)
 		if (disposing)
 		{
 			source.Dispose();
+			controller.Dispose();
 		}
 	}
 

diff --git a/Runtime/Parsers/LRParser`1.cs b/Runtime/Parsers/LRParser`1.cs
@@ -314,4 +314,24 @@ private void CancelStates()
 			Reduce(production, start);
 		}
 	}
+
+	#region IDisposable 成员
+
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// <overloads>
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// </overloads>
+	public void Dispose()
+	{
+		tokenizer.Dispose();
+		controller.Dispose();
+		GC.SuppressFinalize(this);
+	}
+
+	#endregion // IDisposable 成员
+
 }
diff --git a/Runtime/Parsers/ParserController`1.cs b/Runtime/Parsers/ParserController`1.cs
@@ -10,7 +10,7 @@ namespace Cyjb.Compilers.Parsers;
 /// 表示语法分析器的控制器。
 /// </summary>
 /// <typeparam name="T">语法节点标识符的类型，必须是一个枚举类型。</typeparam>
-public class ParserController<T> : ReadOnlyListBase<ParserNode<T>>
+public class ParserController<T> : ReadOnlyListBase<ParserNode<T>>, IDisposable
 	where T : struct
 {
 	/// <summary>
@@ -474,4 +474,30 @@ public override IEnumerator<ParserNode<T>> GetEnumerator()
 
 	#endregion // ReadOnlyListBase<Token<T>> 成员
 
+	#region IDisposable 成员
+
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// <overloads>
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// </overloads>
+	public void Dispose()
+	{
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+
+	/// <summary>
+	/// 执行与释放或重置非托管资源相关的应用程序定义的任务。
+	/// </summary>
+	/// <param name="disposing">是否释放托管资源。</param>
+	protected virtual void Dispose(bool disposing)
+	{
+	}
+
+	#endregion // IDisposable 成员
+
 }
diff --git a/Runtime/Text/ITokenParser`1.cs b/Runtime/Text/ITokenParser`1.cs
@@ -14,7 +14,7 @@ public delegate void TokenParseErrorHandler<T>(ITokenParser<T> parser, TokenPars
 /// 表示语法分析器。
 /// </summary>
 /// <typeparam name="T">词法单元标识符的类型，一般是一个枚举类型。</typeparam>
-public interface ITokenParser<T>
+public interface ITokenParser<T> : IDisposable
 	where T : struct
 {
 	/// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,6 +265,7 @@ protected virtual void Dispose(bool disposing) @@
     		if (disposing)
     		{
     			source.Dispose();
+    			controller.Dispose();
     		}
     	}
@@ Expand Down @@