new section (distributive) conditional type seems to be working again

marcj · Jul 8, 2022 · 88a9c00 · 88a9c00
1 parent 38e7f7b
commit 88a9c00
Show file tree

Hide file tree

Showing 14 changed files with 677 additions and 209 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "libs/asmjit"]
 	path = libs/asmjit
 	url = [email protected]:asmjit/asmjit.git
+[submodule "libs/doctest"]
+	path = libs/doctest
+	url = [email protected]:doctest/doctest.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,7 @@ list(APPEND CMAKE_MODULE_PATH libs)
 #add_definitions(-DTRACY_ENABLE)
 #include_directories(libs/tracy/)
 
+add_subdirectory(libs/doctest)
 add_subdirectory(libs/tracy)
 add_subdirectory(libs/fmt)
 

diff --git a/libs/doctest b/libs/doctest
diff --git a/src/checker/check2.h b/src/checker/check2.h
@@ -44,6 +44,9 @@ namespace ts::vm2 {
                         //todo: comparing tuple is much more complex than that
                         auto rightCurrent = (TypeRef *) right->type;
                         auto leftCurrent = (TypeRef *) left->type;
+                        if (rightCurrent && !leftCurrent) return false;
+                        if (!rightCurrent && leftCurrent) return false;
+
                         while (rightCurrent) {
                             if (rightCurrent && !leftCurrent) return false;
                             if (!rightCurrent && leftCurrent) return false;