Deukhoofd
/
Upsilon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Even better equality checking

This commit is contained in:
Deukhoofd 2018-12-09 13:47:13 +01:00
parent 6e960e38ff
commit b63e8d37b5
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
7 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Upsilon/BaseTypes/Number/ScriptNumber.cs
View File

@ -102,6 +102,15 @@ namespace Upsilon.BaseTypes.Number
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (IsFloat && obj is double d)
{
return Math.Abs(((ScriptNumberDouble) this).Value - d) < 0.0000001;
}
if (!IsFloat && obj is long l)
{
return ((ScriptNumberLong) this).Value == l;
}
if (obj.GetType() != this.GetType()) return false;
return Equals((ScriptNumber) obj);
}

1
Upsilon/BaseTypes/ScriptBoolean.cs
View File

@ -49,6 +49,7 @@ namespace Upsilon.BaseTypes
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj is bool b) return b == Value;
if (obj.GetType() != this.GetType()) return false;
return Equals((ScriptBoolean) obj);
}

2
Upsilon/BaseTypes/ScriptNull.cs
View File

@ -26,7 +26,7 @@ namespace Upsilon.BaseTypes
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
if (obj == null) return true;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != this.GetType()) return false;
return Equals((ScriptNull) obj);

9
Upsilon/BaseTypes/ScriptString.cs
View File

@ -29,6 +29,10 @@ namespace Upsilon.BaseTypes
{
if (obj == null)
return false;
if (obj is string str)
{
return string.Equals(str, Value);
}
if (!(obj is ScriptString s))
return false;
return Equals(s);
@ -39,6 +43,11 @@ namespace Upsilon.BaseTypes
return (Value != null ? Value.GetHashCode() : 0);
}
public static implicit operator string(ScriptString s)
{
return s.Value;
}
private bool Equals(ScriptString s)
{
return s != null && string.Equals(s.Value, Value);

4
Upsilon/BaseTypes/UserData/DictionaryUserData.cs
View File

@ -65,6 +65,10 @@ namespace Upsilon.BaseTypes.UserData
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() == Dictionary.GetType())
{
return Dictionary.Equals(obj);
}
if (obj.GetType() != this.GetType()) return false;
return Equals((DictionaryUserData) obj);
}

4
Upsilon/BaseTypes/UserData/GenericUserData.cs
View File

@ -65,6 +65,10 @@ namespace Upsilon.BaseTypes.UserData
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() == Value.GetType())
{
return obj.Equals(Value);
}
if (obj.GetType() != this.GetType()) return false;
return Equals((GenericUserData) obj);
}

4
Upsilon/BaseTypes/UserData/ListUserData.cs
View File

@ -81,6 +81,10 @@ namespace Upsilon.BaseTypes.UserData
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() == List.GetType())
{
return List.Equals(obj);
}
if (obj.GetType() != this.GetType()) return false;
return Equals((ListUserData) obj);
}