Skip to content

fix issue #2675 #2677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mumencoder wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −21
Open

fix issue #2675 #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions Content.Tests/DMProject/Tests/Operators/equality_disparate_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Comparing values of different types with == / != should never error;
// disparate types are simply never equal.
// Regression test for https://github.com/OpenDreamProject/OpenDream/issues/2675

/datum/equality_test

/proc/RunTest()
var/res = 'Shared/file.txt'
var/datum/equality_test/obj = new

// The exact case from the issue: number vs resource
ASSERT((0 == res) == FALSE)
ASSERT((0 != res) == TRUE)
ASSERT((res == 0) == FALSE)
ASSERT((res != 0) == TRUE)

// A resource is still equal to itself (compared by path)
ASSERT((res == res) == TRUE)
ASSERT((res != res) == FALSE)

// Other previously-unhandled cross-type comparisons
ASSERT(("str" == res) == FALSE)
ASSERT((res == "str") == FALSE)
ASSERT((obj == res) == FALSE)
ASSERT((res == obj) == FALSE)
ASSERT((/datum == res) == FALSE)
ASSERT((res == /datum) == FALSE)
25 changes: 4 additions & 21 deletions OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2882,49 +2882,32 @@ public static bool IsEqual(DreamValue first, DreamValue second) {

switch (second.Type) {
case DreamValue.DreamValueType.DreamObject: return firstValue == second.MustGetValueAsDreamObject();
case DreamValue.DreamValueType.Appearance:
case DreamValue.DreamValueType.DreamProc:
case DreamValue.DreamValueType.DreamType:
case DreamValue.DreamValueType.String:
case DreamValue.DreamValueType.Float: return false;
default: return false;
}

break;
}
case DreamValue.DreamValueType.Float: {
float firstValue = first.MustGetValueAsFloat();

switch (second.Type) {
case DreamValue.DreamValueType.Float: return firstValue == second.MustGetValueAsFloat();
case DreamValue.DreamValueType.DreamType:
case DreamValue.DreamValueType.DreamObject:
case DreamValue.DreamValueType.String: return false;
default: return false;
}

break;
}
case DreamValue.DreamValueType.String: {
string firstValue = first.MustGetValueAsString();

switch (second.Type) {
case DreamValue.DreamValueType.String: return firstValue == second.MustGetValueAsString();
case DreamValue.DreamValueType.DreamObject:
case DreamValue.DreamValueType.Float: return false;
default: return false;
}

break;
}
case DreamValue.DreamValueType.DreamType: {
var firstValue = first.MustGetValueAsType();

switch (second.Type) {
case DreamValue.DreamValueType.DreamType: return firstValue.Equals(second.MustGetValueAsType());
case DreamValue.DreamValueType.Float:
case DreamValue.DreamValueType.DreamObject:
case DreamValue.DreamValueType.String: return false;
default: return false;
}

break;
}
case DreamValue.DreamValueType.DreamProc: {
if (second.Type != DreamValue.DreamValueType.DreamProc)
Expand Down
Loading