6502/EightBitNet
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBitNet.git synced 2025-04-03 23:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Sort out null warnings

Browse Source
This commit is contained in:
Adrian Conlon 2024-06-05 14:45:46 +01:00
parent f57563d631
commit 2123d2195a
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
M6502/M6502.Symbols/IdentifiableSection.cs
View File

@ -14,26 +14,25 @@
#region Generic FK access
protected static T TakeReference<T>(int key, List<T> from) where T : IdentifiableSection
protected static T TakeReference<T>(int key, List<T>? from) where T : IdentifiableSection
{
ArgumentNullException.ThrowIfNull(from);
var identifiable = from[key];
if (identifiable.ID != key)
{
throw new ArgumentOutOfRangeException(nameof(key), "Retrieved object has a mismatched key");
}
ArgumentOutOfRangeException.ThrowIfNotEqual(identifiable.ID, key, nameof(key));
return identifiable;
}
protected T TakeReference<T>(string key, List<T> from) where T : IdentifiableSection => TakeReference(this.TakeInteger(key), from);
protected T TakeReference<T>(string key, List<T>? from) where T : IdentifiableSection => TakeReference(this.TakeInteger(key), from);
protected T? MaybeTakeReference<T>(string key, List<T> from) where T : IdentifiableSection
protected T? MaybeTakeReference<T>(string key, List<T>? from) where T : IdentifiableSection
{
var id = this.MaybeTakeInteger(key);
return id == null ? null : TakeReference(id.Value, from);
}
protected List<T> TakeReferences<T>(string key, List<T> from) where T : IdentifiableSection
protected List<T> TakeReferences<T>(string key, List<T>? from) where T : IdentifiableSection
{
ArgumentNullException.ThrowIfNull(from);
List<T> returned = [];
var ids = this.MaybeTakeMultiple(key);
if (ids != null)
@ -50,23 +49,23 @@
#region Specific FK access
protected Module TakeModuleReference(string key = "mod") => this.TakeReference<Module>(key, this._parent.Modules);
protected Module TakeModuleReference(string key = "mod") => this.TakeReference<Module>(key, this._parent?.Modules);
protected File TakeFileReference(string key = "file") => this.TakeReference<File>(key, this._parent.Files);
protected File TakeFileReference(string key = "file") => this.TakeReference<File>(key, this._parent?.Files);
protected Type TakeTypeReference(string key = "type") => this.TakeReference<Type>(key, this._parent.Types);
protected Type TakeTypeReference(string key = "type") => this.TakeReference<Type>(key, this._parent?.Types);
protected Segment TakeSegmentReference(string key = "seg") => this.TakeReference<Segment>(key, this._parent.Segments);
protected Segment TakeSegmentReference(string key = "seg") => this.TakeReference<Segment>(key, this._parent?.Segments);
protected Scope TakeScopeReference(string key = "scope") => this.TakeReference<Scope>(key, this._parent.Scopes);
protected Scope TakeScopeReference(string key = "scope") => this.TakeReference<Scope>(key, this._parent?.Scopes);
protected Scope? MaybeTakeParentReference(string key = "parent") => this.MaybeTakeReference<Scope>(key, this._parent.Scopes);
protected Scope? MaybeTakeParentReference(string key = "parent") => this.MaybeTakeReference<Scope>(key, this._parent?.Scopes);
protected Symbol? MaybeTakeSymbolReference(string key = "sym") => this.MaybeTakeReference<Symbol>(key, this._parent.Symbols);
protected Symbol? MaybeTakeSymbolReference(string key = "sym") => this.MaybeTakeReference<Symbol>(key, this._parent?.Symbols);
protected List<Span> TakeSpanReferences(string key = "span") => this.TakeReferences<Span>(key, this._parent.Spans);
protected List<Span> TakeSpanReferences(string key = "span") => this.TakeReferences<Span>(key, this._parent?.Spans);
protected List<Line> TakeLineReferences(string key) => this.TakeReferences<Line>(key, this._parent.Lines);
protected List<Line> TakeLineReferences(string key) => this.TakeReferences<Line>(key, this._parent?.Lines);
#endregion