Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Fix null reference in OverloadResultComparer #287

Merged
merged 4 commits into from
Oct 19, 2018
Merged

Fix null reference in OverloadResultComparer #287

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afc92d3
Fix null ref
Oct 19, 2018
8339eb0
Fix conditionals
Oct 19, 2018
c9ce18f
Simplify
Oct 19, 2018
7923aa4
Init doc
Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions src/Analysis/Engine/Impl/OverloadResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public OverloadResult(ParameterResult[] parameters, string name, string document

public string Name { get; }
public virtual IReadOnlyList<string> ReturnType => _returnType;
public virtual string Documentation { get; }
public virtual string Documentation { get; } = string.Empty;
public virtual ParameterResult[] Parameters => _parameters;

internal virtual OverloadResult WithNewParameters(ParameterResult[] newParameters)
Expand Down Expand Up @@ -138,7 +138,7 @@ public override string ToString() {
}

public override bool Equals(object obj) {
if(obj is OverloadResult other) {
if (obj is OverloadResult other) {
return OverloadResultComparer.Instance.Equals(this, other);
}
return base.Equals(obj);
Expand All @@ -156,7 +156,7 @@ class AccumulatedOverloadResult {

public AccumulatedOverloadResult(string name, string documentation, int parameters) {
_name = name;
_doc = documentation;
_doc = documentation ?? string.Empty;
_pnames = new string[parameters];
_ptypes = new string[parameters];
_pdefaults = new string[parameters];
Expand Down Expand Up @@ -435,35 +435,25 @@ private OverloadResultComparer(bool weak) {
}

public override bool Equals(OverloadResult x, OverloadResult y) {
if (x == null | y == null) {
return x == null & y == null;
if (x == null || y == null) {
return x == null && y == null;
}

if (x.Name != y.Name || (!_weak && x.Documentation != y.Documentation)) {
return false;
}

if (x.Parameters == null | y.Parameters == null) {
return x.Parameters == null & y.Parameters == null;
if (x.Parameters == null || y.Parameters == null) {
return x.Parameters == null && y.Parameters == null;
}

if (x.Parameters.Length != y.Parameters.Length) {
return false;
}

for (var i = 0; i < x.Parameters.Length; ++i) {
if (_weak) {
if (!x.Parameters[i].Name.Equals(y.Parameters[i].Name)) {
return false;
}
} else {
if (!x.Parameters[i].Equals(y.Parameters[i])) {
return false;
}
}
}

return true;
return _weak
? x.Parameters.Select(p => p.Name).SequenceEqual(y.Parameters.Select(p => p.Name))
: x.Parameters.SequenceEqual(y.Parameters);
}

public override int GetHashCode(OverloadResult obj) {
Expand Down