From 7b89f258189f817bcc177bbc4426c48f3ccd9127 Mon Sep 17 00:00:00 2001
From: ramn <github@rymdimperiet.org>
Date: Sat, 8 Jul 2023 23:46:51 +0200
Subject: [PATCH] Fix #2637

where testing.expect_value can't compare nils
---
 core/testing/testing.odin         |  5 +++--
 tests/issues/run.bat              |  1 +
 tests/issues/run.sh               |  1 +
 tests/issues/test_issue_2637.odin | 13 +++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tests/issues/test_issue_2637.odin

diff --git a/core/testing/testing.odin b/core/testing/testing.odin
index 0ceb58e33..1d738bbd1 100644
--- a/core/testing/testing.odin
+++ b/core/testing/testing.odin
@@ -4,6 +4,7 @@ import "core:fmt"
 import "core:io"
 import "core:time"
 import "core:intrinsics"
+import "core:reflect"
 
 // IMPORTANT NOTE: Compiler requires this layout
 Test_Signature :: proc(^T)
@@ -89,7 +90,7 @@ expect :: proc(t: ^T, ok: bool, msg: string = "", loc := #caller_location) -> bo
 	return ok
 }
 expect_value :: proc(t: ^T, value, expected: $T, loc := #caller_location) -> bool where intrinsics.type_is_comparable(T) {
-	ok := value == expected
+	ok := value == expected || reflect.is_nil(value) && reflect.is_nil(expected)
 	if !ok {
 		errorf(t, "expected %v, got %v", expected, value, loc=loc)
 	}
@@ -100,4 +101,4 @@ expect_value :: proc(t: ^T, value, expected: $T, loc := #caller_location) -> boo
 
 set_fail_timeout :: proc(t: ^T, duration: time.Duration, loc := #caller_location) {
 	_fail_timeout(t, duration, loc)
-}
\ No newline at end of file
+}
diff --git a/tests/issues/run.bat b/tests/issues/run.bat
index 105d474e3..63d722e09 100644
--- a/tests/issues/run.bat
+++ b/tests/issues/run.bat
@@ -14,6 +14,7 @@ set COMMON=-collection:tests=..\..
 ..\..\..\odin build ..\test_issue_2113.odin %COMMON% -file -debug || exit /b
 ..\..\..\odin test ..\test_issue_2466.odin %COMMON% -file || exit /b
 ..\..\..\odin test ..\test_issue_2615.odin %COMMON% -file || exit /b
+..\..\..\odin test ..\test_issue_2637.odin %COMMON% -file || exit /b
 
 @echo off
 
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index c4c53e7e1..7d2101dc6 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -17,6 +17,7 @@ $ODIN test ../test_issue_2087.odin $COMMON -file
 $ODIN build ../test_issue_2113.odin $COMMON -file -debug
 $ODIN test ../test_issue_2466.odin $COMMON -file
 $ODIN test ../test_issue_2615.odin $COMMON -file
+$ODIN test ../test_issue_2637.odin $COMMON -file
 if [[ $($ODIN build ../test_issue_2395.odin $COMMON -file 2>&1 >/dev/null | grep -c "$NO_NIL_ERR") -eq 2 ]] ; then
 	echo "SUCCESSFUL 1/1"
 else
diff --git a/tests/issues/test_issue_2637.odin b/tests/issues/test_issue_2637.odin
new file mode 100644
index 000000000..c170fc444
--- /dev/null
+++ b/tests/issues/test_issue_2637.odin
@@ -0,0 +1,13 @@
+// Tests issue #2637 https://github.com/odin-lang/Odin/issues/2637
+package test_issues
+
+import "core:testing"
+
+Foo :: Maybe(string)
+
+@(test)
+test_expect_value_succeeds_with_nil :: proc(t: ^testing.T) {
+  x: Foo
+  testing.expect(t, x == nil) // Succeeds
+  testing.expect_value(t, x, nil) // Fails, "expected nil, got nil"
+}