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

Reduce implicit null checks

Browse Source
This commit is contained in:
Matt Nadareski
2023-08-10 11:35:32 -04:00
parent 5213490689
commit c59bd4d857
35 changed files with 1406 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
SabreTools.Serialization/Internal.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SabreTools.Models.Internal;
@@ -6,6 +7,31 @@ namespace SabreTools.Serialization
{
public class Internal
{
/// <summary>
/// Extract nested items from a Dump
/// </summary>
public static DatItem[]? ExtractItems(Dump? item)
{
if (item == null)
return null;
var datItems = new List<DatItem>();
var rom = item.Read<Rom>(Dump.RomKey);
if (rom != null)
datItems.Add(rom);
var megaRom = item.Read<Rom>(Dump.MegaRomKey);
if (megaRom != null)
datItems.Add(megaRom);
var sccPlusCart = item.Read<Rom>(Dump.SCCPlusCartKey);
if (sccPlusCart != null)
datItems.Add(sccPlusCart);
return datItems.ToArray();
}
/// <summary>
/// Extract nested items from a Part
/// </summary>
@@ -22,15 +48,26 @@ namespace SabreTools.Serialization
var dataAreas = item.Read<DataArea[]>(Part.DataAreaKey);
if (dataAreas != null && dataAreas.Any())
datItems.AddRange(dataAreas.SelectMany(ExtractItems));
{
datItems.AddRange(dataAreas
.Where(d => d != null)
.SelectMany(ExtractItems));
}
var diskAreas = item.Read<DiskArea[]>(Part.DiskAreaKey);
if (diskAreas != null && diskAreas.Any())
datItems.AddRange(diskAreas.SelectMany(ExtractItems));
{
datItems.AddRange(diskAreas
.Where(d => d != null)
.SelectMany(ExtractItems));
}
var dipSwitches = item.Read<DipSwitch[]>(Part.DipSwitchKey);
if (dipSwitches != null && dipSwitches.Any())
datItems.AddRange(dipSwitches);
{
datItems.AddRange(dipSwitches
.Where(d => d != null));
}
return datItems.ToArray();
}
@@ -38,23 +75,25 @@ namespace SabreTools.Serialization
/// <summary>
/// Extract nested items from a DataArea
/// </summary>
private static Rom[]? ExtractItems(DataArea? item)
private static Rom[] ExtractItems(DataArea item)
{
if (item == null)
return null;
var roms = item.Read<Rom[]>(DataArea.RomKey);
if (roms == null || !roms.Any())
return Array.Empty<Rom>();
return item.Read<Rom[]>(DataArea.RomKey);
return roms.ToArray();
}
/// <summary>
/// Extract nested items from a DiskArea
/// </summary>
private static Disk[]? ExtractItems(DiskArea? item)
private static Disk[] ExtractItems(DiskArea item)
{
if (item == null)
return null;
var roms = item.Read<Disk[]>(DiskArea.DiskKey);
if (roms == null || !roms.Any())
return Array.Empty<Disk>();
return item.Read<Disk[]>(DiskArea.DiskKey);
return roms.ToArray();
}
}
}