claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readonly readers in readers, update CMP reader

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-21 13:20:58 -07:00
parent db0c50bd3a
commit 83d67c7ac1
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SabreTools.Library/IO/ClrMameProReader.cs
View File

@@ -14,7 +14,7 @@ namespace SabreTools.Library.IO
/// <summary>
/// Internal stream reader for inputting
/// </summary>
private StreamReader sr;
private readonly StreamReader sr;
/// <summary>
/// Contents of the current line, unprocessed
@@ -104,26 +104,24 @@ namespace SabreTools.Library.IO
CurrentLine = sr.ReadLine().Trim();
LineNumber++;
// TODO: Act like IniReader here
ProcessLine(CurrentLine);
ProcessLine();
return true;
}
/// <summary>
/// Process the current line and extract out values
/// </summary>
private void ProcessLine(string line)
private void ProcessLine()
{
// Standalone (special case for DC dats)
if (line.StartsWith("Name:"))
if (CurrentLine.StartsWith("Name:"))
{
string temp = line.Substring("Name:".Length).Trim();
line = $"Name: {temp}";
string temp = CurrentLine.Substring("Name:".Length).Trim();
CurrentLine = $"Name: {temp}";
}
// Comment
if (line.StartsWith("#"))
if (CurrentLine.StartsWith("#"))
{
Internal = null;
InternalName = null;
@@ -132,9 +130,9 @@ namespace SabreTools.Library.IO
}
// Top-level
else if (Regex.IsMatch(line, Constants.HeaderPatternCMP))
else if (Regex.IsMatch(CurrentLine, Constants.HeaderPatternCMP))
{
GroupCollection gc = Regex.Match(line, Constants.HeaderPatternCMP).Groups;
GroupCollection gc = Regex.Match(CurrentLine, Constants.HeaderPatternCMP).Groups;
string normalizedValue = gc[1].Value.ToLowerInvariant();
Internal = null;
@@ -145,9 +143,9 @@ namespace SabreTools.Library.IO
}
// Internal
else if (Regex.IsMatch(line, Constants.InternalPatternCMP))
else if (Regex.IsMatch(CurrentLine, Constants.InternalPatternCMP))
{
GroupCollection gc = Regex.Match(line, Constants.InternalPatternCMP).Groups;
GroupCollection gc = Regex.Match(CurrentLine, Constants.InternalPatternCMP).Groups;
string normalizedValue = gc[1].Value.ToLowerInvariant();
string[] linegc = SplitLineAsCMP(gc[2].Value);
@@ -234,9 +232,9 @@ namespace SabreTools.Library.IO
}
// Standalone
else if (Regex.IsMatch(line, Constants.ItemPatternCMP))
else if (Regex.IsMatch(CurrentLine, Constants.ItemPatternCMP))
{
GroupCollection gc = Regex.Match(line, Constants.ItemPatternCMP).Groups;
GroupCollection gc = Regex.Match(CurrentLine, Constants.ItemPatternCMP).Groups;
string itemval = gc[2].Value.Replace("\"", string.Empty);
Internal = null;
@@ -246,7 +244,7 @@ namespace SabreTools.Library.IO
}
// End section
else if (Regex.IsMatch(line, Constants.EndPatternCMP))
else if (Regex.IsMatch(CurrentLine, Constants.EndPatternCMP))
{
Internal = null;
InternalName = null;

2
SabreTools.Library/IO/IniReader.cs
View File

@@ -11,7 +11,7 @@ namespace SabreTools.Library.IO
/// <summary>
/// Internal stream reader for inputting
/// </summary>
private StreamReader sr;
private readonly StreamReader sr;
/// <summary>
/// Get if at end of stream

2
SabreTools.Library/IO/SeparatedValueReader.cs
View File

@@ -12,7 +12,7 @@ namespace SabreTools.Library.IO
/// <summary>
/// Internal stream reader for inputting
/// </summary>
private StreamReader sr;
private readonly StreamReader sr;
/// <summary>
/// Internal value to say how many fields should be written