SabreTools/SabreTools.IO
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.IO.git synced 2026-02-04 05:36:05 +00:00
Code Issues 1 Packages Projects Releases 20 Wiki Activity

Private readers and writers don't have to be nullable

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-23 11:06:21 -04:00
parent e89450c4c1
commit f2bdc815b8
5 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SabreTools.IO/Readers/ClrMameProReader.cs
View File

@@ -34,13 +34,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Get if at end of stream
/// </summary>
public bool EndOfStream
{
get
{
return _reader?.EndOfStream ?? true;
}
}
public bool EndOfStream => _reader.EndOfStream;
/// <summary>
/// Contents of the currently read line as an internal item
@@ -90,7 +84,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Internal stream reader
/// </summary>
private readonly StreamReader? _reader;
private readonly StreamReader _reader;
#endregion
@@ -127,7 +121,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public bool ReadNextLine()
{
if (_reader?.BaseStream == null)
if (_reader.BaseStream == null)
return false;
if (!_reader.BaseStream.CanRead || _reader.EndOfStream)
@@ -327,7 +321,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public void Dispose()
{
_reader?.Dispose();
_reader.Dispose();
}
#endregion

14
SabreTools.IO/Readers/IniReader.cs
View File

@@ -12,13 +12,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Get if at end of stream
/// </summary>
public bool EndOfStream
{
get
{
return _reader?.EndOfStream ?? true;
}
}
public bool EndOfStream => _reader.EndOfStream;
/// <summary>
/// Contents of the currently read line as a key value pair
@@ -57,7 +51,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Internal stream reader
/// </summary>
private readonly StreamReader? _reader;
private readonly StreamReader _reader;
#endregion
@@ -94,7 +88,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public bool ReadNextLine()
{
if (_reader?.BaseStream == null)
if (_reader.BaseStream == null)
return false;
if (!_reader.BaseStream.CanRead || _reader.EndOfStream)
@@ -171,7 +165,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public void Dispose()
{
_reader?.Dispose();
_reader.Dispose();
}
#endregion

14
SabreTools.IO/Readers/SeparatedValueReader.cs
View File

@@ -13,13 +13,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Get if at end of stream
/// </summary>
public bool EndOfStream
{
get
{
return _reader?.EndOfStream ?? true;
}
}
public bool EndOfStream => _reader.EndOfStream;
/// <summary>
/// Contents of the current line, unprocessed
@@ -68,7 +62,7 @@ namespace SabreTools.IO.Readers
/// <summary>
/// Internal stream reader
/// </summary>
private readonly StreamReader? _reader;
private readonly StreamReader _reader;
/// <summary>
/// How many fields should be written
@@ -124,7 +118,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public bool ReadNextLine()
{
if (_reader?.BaseStream == null)
if (_reader.BaseStream == null)
return false;
if (!_reader.BaseStream.CanRead || _reader.EndOfStream)
@@ -225,7 +219,7 @@ namespace SabreTools.IO.Readers
/// </summary>
public void Dispose()
{
_reader?.Dispose();
_reader.Dispose();
}
#endregion

16
SabreTools.IO/Writers/IniWriter.cs
View File

@@ -11,7 +11,7 @@ namespace SabreTools.IO.Writers
/// <summary>
/// Internal stream writer
/// </summary>
private readonly StreamWriter? _writer;
private readonly StreamWriter _writer;
#endregion
@@ -52,7 +52,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void WriteSection(string? value)
{
if (_writer?.BaseStream == null)
if (_writer.BaseStream == null)
return;
if (string.IsNullOrEmpty(value))
@@ -66,7 +66,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void WriteKeyValuePair(string key, string? value)
{
if (_writer?.BaseStream == null)
if (_writer.BaseStream == null)
return;
if (string.IsNullOrEmpty(key))
@@ -81,7 +81,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void WriteComment(string? value)
{
if (_writer?.BaseStream == null)
if (_writer.BaseStream == null)
return;
value ??= string.Empty;
@@ -93,7 +93,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void WriteString(string? value)
{
if (_writer?.BaseStream == null)
if (_writer.BaseStream == null)
return;
value ??= string.Empty;
@@ -105,7 +105,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void WriteLine()
{
if (_writer?.BaseStream == null)
if (_writer.BaseStream == null)
return;
_writer.WriteLine();
@@ -116,7 +116,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void Flush()
{
_writer?.Flush();
_writer.Flush();
}
#region IDisposable Implementation
@@ -126,7 +126,7 @@ namespace SabreTools.IO.Writers
/// </summary>
public void Dispose()
{
_writer?.Dispose();
_writer.Dispose();
}
#endregion

2
SabreTools.IO/Writers/SeparatedValueWriter.cs
View File

@@ -99,7 +99,7 @@ namespace SabreTools.IO.Writers
public void WriteValues(object?[] values, bool newline = true)
{
// If the writer can't be used, we error
if (_writer == null || !_writer.BaseStream.CanWrite)
if (!_writer.BaseStream.CanWrite)
throw new ArgumentException(nameof(_writer));
// If the separator character is invalid, we error