[R！] 命名空间调整：把同属于mai的，parser/generator/chart(IR)/maidata，全部移到MuConvert.mai命名空间下。

Starrah · Starrah · commit 462a414cf64f · 2026-05-01T02:42:13.000+08:00
本项目正式启用基于逻辑和功能的命名空间，而不是基于文件夹的。相关文档TODO
diff --git a/Program.cs b/Program.cs
@@ -1,9 +1,7 @@
 using System.CommandLine;
 using System.Text;
 using System.Text.RegularExpressions;
-using MuConvert.collection;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using MuConvert.utils;
 
 namespace MuConvert;
diff --git a/chart/mai/Duration.cs b/chart/mai/Duration.cs
@@ -1,7 +1,8 @@
 using System.Diagnostics;
+using MuConvert.chart;
 using Rationals;
 
-namespace MuConvert.chart.mai;
+namespace MuConvert.mai;
 
 /**
  * 用于表示持续时间的类，使用于hold和slide的持续时长以及slide的等待时长中。
diff --git a/chart/mai/MaiChart.cs b/chart/mai/MaiChart.cs
@@ -1,7 +1,8 @@
+using MuConvert.chart;
 using MuConvert.utils;
 using Rationals;
 
-namespace MuConvert.chart.mai;
+namespace MuConvert.mai;
 
 public class MaiChart: BaseChart<Note>
 {
diff --git a/chart/mai/Note.cs b/chart/mai/Note.cs
@@ -2,7 +2,7 @@
 using MuConvert.utils;
 using Rationals;
 
-namespace MuConvert.chart.mai;
+namespace MuConvert.mai;
 
 public abstract class Note
 {
diff --git a/chart/mai/Slide.cs b/chart/mai/Slide.cs
@@ -2,7 +2,7 @@
 using MuConvert.utils;
 using Rationals;
 
-namespace MuConvert.chart.mai;
+namespace MuConvert.mai;
 
 public class Star : Tap
 {
diff --git a/chart/mai/Statistics.cs b/chart/mai/Statistics.cs
@@ -1,7 +1,7 @@
 using MuConvert.utils;
 using Rationals;
 
-namespace MuConvert.chart.mai;
+namespace MuConvert.mai;
 
 public class Statistics
 {
diff --git a/collection/Maidata.cs b/collection/Maidata.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using MuConvert.utils;
 
-namespace MuConvert.collection;
+namespace MuConvert.mai;
 
 public record MaidataChart(string Inote, string? Level = null, string? NoteDesigner = null);
 
diff --git a/generator/mai/MA2Generator.cs b/generator/mai/MA2Generator.cs
@@ -1,10 +1,10 @@
 using System.Text;
-using MuConvert.chart.mai;
+using MuConvert.generator;
 using MuConvert.utils;
 using Rationals;
 using static MuConvert.utils.Alert.LEVEL;
 
-namespace MuConvert.generator.mai;
+namespace MuConvert.mai;
 
 public class MA2Generator : IGenerator<MaiChart>
 {
diff --git a/generator/mai/MA2_103Generator.cs b/generator/mai/MA2_103Generator.cs
@@ -1,7 +1,6 @@
-﻿using MuConvert.chart.mai;
-using MuConvert.utils;
+﻿using MuConvert.utils;
 
-namespace MuConvert.generator.mai;
+namespace MuConvert.mai;
 
 public class MA2_103Generator : MA2Generator
 {
diff --git a/generator/mai/SimaiGenerator.cs b/generator/mai/SimaiGenerator.cs
@@ -1,10 +1,10 @@
 using System.Numerics;
-using MuConvert.chart.mai;
+using MuConvert.generator;
 using MuConvert.utils;
 using Rationals;
 using static MuConvert.utils.Alert.LEVEL;
 
-namespace MuConvert.generator.mai;
+namespace MuConvert.mai;
 
 class SimaiNote
 {
diff --git a/parser/mai/ErrorStrategy.cs b/parser/mai/ErrorStrategy.cs
@@ -6,7 +6,7 @@
 using P = MuConvert.Antlr.SimaiParser;
 using Utils = MuConvert.utils.Utils;
 
-namespace MuConvert.parser.mai;
+namespace MuConvert.mai;
 
 public class ErrorListener(SimaiParser simaiParser): BaseErrorListener, IAntlrErrorListener<int>
 {
diff --git a/parser/mai/MA2Parser.cs b/parser/mai/MA2Parser.cs
@@ -1,11 +1,11 @@
 using System.Text.RegularExpressions;
 using MuConvert.chart;
-using MuConvert.chart.mai;
+using MuConvert.parser;
 using MuConvert.utils;
 using Rationals;
 using static MuConvert.utils.Alert.LEVEL;
 
-namespace MuConvert.parser.mai;
+namespace MuConvert.mai;
 
 public class MA2Parser : IParser<MaiChart>
 {
diff --git a/parser/mai/SimaiParser.cs b/parser/mai/SimaiParser.cs
@@ -4,15 +4,15 @@
 using Antlr4.Runtime.Tree;
 using MuConvert.Antlr;
 using MuConvert.chart;
-using MuConvert.chart.mai;
+using MuConvert.parser;
 using MuConvert.utils;
 using Rationals;
 using static MuConvert.utils.Alert.LEVEL;
 using P = MuConvert.Antlr.SimaiParser;
 using L = MuConvert.Antlr.SimaiLexer;
 using Utils = MuConvert.utils.Utils;
 
-namespace MuConvert.parser.mai;
+namespace MuConvert.mai;
 
 public partial class SimaiParser : SimaiBaseVisitor<object>, IParser<MaiChart>
 {
diff --git a/tests/mai/ChartShift测试.cs b/tests/mai/ChartShift测试.cs
@@ -1,5 +1,5 @@
 ﻿using MuConvert.chart;
-using MuConvert.chart.mai;
+using MuConvert.mai;
 using Rationals;
 using static MuConvert.Tests.mai.TestUtils;
 
diff --git a/tests/mai/MA2_103测试.cs b/tests/mai/MA2_103测试.cs
@@ -1,7 +1,5 @@
 using System.Text;
-using MuConvert.collection;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using MuConvert.utils;
 using static MuConvert.Tests.mai.TestUtils;
 
diff --git a/tests/mai/MA2转Simai测试.cs b/tests/mai/MA2转Simai测试.cs
@@ -1,10 +1,7 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using MuConvert.chart.mai;
-using MuConvert.collection;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using Rationals;
 using Xunit.Abstractions;
 
diff --git a/tests/mai/Maidata模块测试.cs b/tests/mai/Maidata模块测试.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using MuConvert.collection;
+using MuConvert.mai;
 using static MuConvert.Tests.mai.TestUtils;
 
 namespace MuConvert.Tests.mai;
diff --git a/tests/mai/Simai片段测试.cs b/tests/mai/Simai片段测试.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Text;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using MuConvert.utils;
 using static MuConvert.Tests.mai.TestUtils;
 
diff --git a/tests/mai/Simai纠错测试.cs b/tests/mai/Simai纠错测试.cs
@@ -1,5 +1,4 @@
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using Xunit.Abstractions;
 using static MuConvert.utils.Alert.LEVEL;
 
diff --git a/tests/mai/Simai转MA2测试.cs b/tests/mai/Simai转MA2测试.cs
@@ -1,7 +1,5 @@
 using System.Text;
-using MuConvert.collection;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using MuConvert.utils;
 using Xunit.Abstractions;
 using static MuConvert.Tests.mai.TestUtils;
diff --git a/tests/mai/Statistics测试.cs b/tests/mai/Statistics测试.cs
@@ -1,6 +1,5 @@
 using System.Text;
-using MuConvert.generator.mai;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using Xunit.Abstractions;
 using static MuConvert.Tests.mai.TestUtils;
 
diff --git a/tests/mai/TestUtils.cs b/tests/mai/TestUtils.cs
@@ -1,8 +1,6 @@
 using System.Text;
 using System.Text.RegularExpressions;
-using MuConvert.chart.mai;
-using MuConvert.collection;
-using MuConvert.parser.mai;
+using MuConvert.mai;
 using MuConvert.utils;
 using YamlDotNet.Serialization;
 
diff --git a/utils/Error.cs b/utils/Error.cs
@@ -34,7 +34,7 @@ public Alert(LEVEL level, string description, Rational? timeInBar = null, double
         TimeInSeconds = timeInSeconds;
     }
     
-    public Alert(LEVEL level, string description, (chart.mai.MaiChart, Rational) barTime, int? line = null, string? relevantNote = null)
+    public Alert(LEVEL level, string description, (mai.MaiChart, Rational) barTime, int? line = null, string? relevantNote = null)
         : this(level, description, line, relevantNote)
     {
         var (chart, time) = barTime; 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
	`1`	`+using MuConvert.chart;`
`1`	`2`	`using MuConvert.utils;`
`2`	`3`	`using Rationals;`
`3`	`4`
`4`		`-namespace MuConvert.chart.mai;`
	`5`	`+namespace MuConvert.mai;`
`5`	`6`
`6`	`7`	`public class MaiChart: BaseChart<Note>`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using MuConvert.utils;`
`3`	`3`	`using Rationals;`
`4`	`4`
`5`		`-namespace MuConvert.chart.mai;`
	`5`	`+namespace MuConvert.mai;`
`6`	`6`
`7`	`7`	`public abstract class Note`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using MuConvert.utils;`
`2`	`2`	`using Rationals;`
`3`	`3`
`4`		`-namespace MuConvert.chart.mai;`
	`4`	`+namespace MuConvert.mai;`
`5`	`5`
`6`	`6`	`public class Statistics`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-using MuConvert.chart.mai;`
`2`		`-using MuConvert.utils;`
	`1`	`+using MuConvert.utils;`
`3`	`2`
`4`		`-namespace MuConvert.generator.mai;`
	`3`	`+namespace MuConvert.mai;`
`5`	`4`
`6`	`5`	`public class MA2_103Generator : MA2Generator`
`7`	`6`	`{`