Skip to content

Commit

Permalink
Don't call object.Equals() from '=='-operators but call Equals on the…
Browse files Browse the repository at this point in the history 
… underlying type. Also this fixes a possible NRE in case the wrapper type is a class. Furthermore, we define the '!=' through the '==' operator.
  • Loading branch information
@danielcweber
danielcweber committed Aug 21, 2024
1 parent 986f494 commit c8b3479
Show file tree
Hide file tree
Showing 30,561 changed files with 122,626 additions and 122,610 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
28 changes: 22 additions & 6 deletions src/Vogen/GenerateEqualsMethodsAndOperators.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,30 @@ private static string GenerateEqualsMethodForPrimitive(VoWorkItem item, bool isR
public static string GenerateEqualsOperatorsForPrimitivesIfNeeded(string itemUnderlyingType, SyntaxToken typeName, VoWorkItem item)
{
if (item.Config.PrimitiveEqualityGeneration.HasFlag(PrimitiveEqualityGeneration.GenerateOperators))
return $"""
{
if (item.IsTheWrapperAReferenceType)
{
return $"""
public static global::System.Boolean operator ==({typeName} left, {itemUnderlyingType} right) => left?.Value.Equals(right) ?? false;
public static global::System.Boolean operator !=({typeName} left, {itemUnderlyingType} right) => !(left == right);
public static global::System.Boolean operator ==({itemUnderlyingType} left, {typeName} right) => right?.Value.Equals(left) ?? false;
public static global::System.Boolean operator !=({itemUnderlyingType} left, {typeName} right) => !(left == right);
""";
}
else
{
return $"""
public static global::System.Boolean operator ==({typeName} left, {itemUnderlyingType} right) => Equals(left.Value, right);
public static global::System.Boolean operator !=({typeName} left, {itemUnderlyingType} right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==({typeName} left, {itemUnderlyingType} right) => left.Value.Equals(right);
public static global::System.Boolean operator !=({typeName} left, {itemUnderlyingType} right) => !(left == right);
public static global::System.Boolean operator ==({itemUnderlyingType} left, {typeName} right) => Equals(left, right.Value);
public static global::System.Boolean operator !=({itemUnderlyingType} left, {typeName} right) => !Equals(left, right.Value);
""";
public static global::System.Boolean operator ==({itemUnderlyingType} left, {typeName} right) => right.Value.Equals(left);
public static global::System.Boolean operator !=({itemUnderlyingType} left, {typeName} right) => !(left == right);
""";
}
}

return string.Empty;
}
Expand Down
16 changes: 8 additions & 8 deletions ...snapshots/snap-v8.0/BsonSerializationGenerationTests.Writes_bson_serializers.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Age left, Age right) => left.Equals(right);
public static global::System.Boolean operator !=(Age left, Age right) => !(left == right);
public static global::System.Boolean operator ==(Age left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Age left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Age right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Age right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Age left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Age left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Age right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Age right) => !(left == right);
public int CompareTo(Age other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down Expand Up @@ -840,10 +840,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Name left, Name right) => left.Equals(right);
public static global::System.Boolean operator !=(Name left, Name right) => !(left == right);
public static global::System.Boolean operator ==(Name left, System.String right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Name left, System.String right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.String left, Name right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.String left, Name right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Name left, System.String right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Name left, System.String right) => !(left == right);
public static global::System.Boolean operator ==(System.String left, Name right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.String left, Name right) => !(left == right);
public int CompareTo(Name other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...BugFixes/snapshots/snap-v3.1/Bug575_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...xes/snapshots/snap-v3.1/Bug581_StjDeserializer_throws_correct_exception.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !(left == right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...BugFixes/snapshots/snap-v3.1/Bug595_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...gFixes/snapshots/snap-v4.6.1/Bug575_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...s/snapshots/snap-v4.6.1/Bug581_StjDeserializer_throws_correct_exception.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !(left == right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...gFixes/snapshots/snap-v4.6.1/Bug595_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...ted_even_with_no_conversions_specified.Omitted_if_stj_package_not_referenced.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...BugFixes/snapshots/snap-v4.8/Bug575_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...xes/snapshots/snap-v4.8/Bug581_StjDeserializer_throws_correct_exception.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Guid right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Guid right) => !(left == right);
public static global::System.Boolean operator ==(System.Guid left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Guid left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...BugFixes/snapshots/snap-v4.8/Bug595_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
8 changes: 4 additions & 4 deletions ...BugFixes/snapshots/snap-v5.0/Bug575_AttributesWithArraysBreaksGenerator.Test.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null;

public static global::System.Boolean operator ==(Vo left, Vo right) => left.Equals(right);
public static global::System.Boolean operator !=(Vo left, Vo right) => !(left == right);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => Equals(left.Value, right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !Equals(left.Value, right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => Equals(left, right.Value);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !Equals(left, right.Value);
public static global::System.Boolean operator ==(Vo left, System.Int32 right) => left.Value.Equals(right);
public static global::System.Boolean operator !=(Vo left, System.Int32 right) => !(left == right);
public static global::System.Boolean operator ==(System.Int32 left, Vo right) => right.Value.Equals(left);
public static global::System.Boolean operator !=(System.Int32 left, Vo right) => !(left == right);
public int CompareTo(Vo other) => Value.CompareTo(other.Value);
public int CompareTo(object other)
{
Expand Down
Loading

0 comments on commit c8b3479

Please sign in to comment.