Fix NaN value for DATrie float.

Currently the nan value we use doesn't work well on i686.
Try to use value same as std::nanf("1") and std::nanf("2").

Fix #4

.gitignore

@@ -1,6 +1,6 @@
 *.kdev4
 *~
-build
+build*
 test/bench.cpp
 test/cedarpp.h
 *.tar.*

src/libime/core/datrie.cpp

@@ -397,7 +397,7 @@ class DATriePrivate {
                 moved -= 1 + sizeof(value_type); // keep record
             }
             moved += offset;
-            for (auto i = offset; i <= moved; i += 1 + sizeof(value_type)) {
+            for (ssize_t i = offset; i <= moved; i += 1 + sizeof(value_type)) {
                 if (m_tail0.capacity() == m_tail0.size()) {
                     auto quota =
                         m_tail0.capacity() + (m_tail0.size() >= MAX_ALLOC_SIZE

src/libime/core/datrie.h

@@ -34,8 +34,8 @@ struct NaN {
 };
 template <>
 struct NaN<float> {
-    static constexpr auto N1 = 0x7f800001;
-    static constexpr auto N2 = 0x7f800002;
+    static constexpr auto N1 = 0x7fc00001;
+    static constexpr auto N2 = 0x7fc00002;
 };
 
 /**

test/CMakeLists.txt

@@ -24,6 +24,8 @@ foreach(TESTCASE ${LIBIME_SINGLE_FILE_TEST})
              COMMAND ${TESTCASE})
 endforeach()
 
+add_dependencies(testdecoder opengram-dict opengram-lm)
+
 add_executable(triebench triebench.cpp)
 target_link_libraries(triebench LibIME::Core)
 

test/testtrie.cpp

@@ -4,24 +4,52 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 #include "libime/core/datrie.h"
+#include <cmath>
+#include <cstring>
 #include <fcitx-utils/log.h>
 
 using namespace libime;
 
 int main() {
-    DATrie<int32_t> trie;
-    trie.set("aaaa", 1);
-    trie.set("aaab", 1);
-    trie.set("aaac", 1);
-    trie.set("aaad", 1);
-    trie.set("aab", 1);
-    FCITX_ASSERT(trie.size() == 5);
-    trie.erase("aaaa");
-    FCITX_ASSERT(trie.size() == 4);
-    DATrie<int32_t>::position_type pos = 0;
-    auto result = trie.traverse("aaa", pos);
-    FCITX_ASSERT(trie.isNoValue(result));
-    trie.erase(pos);
-    FCITX_ASSERT(trie.size() == 4);
+    {
+        DATrie<int32_t> trie;
+        trie.set("aaaa", 1);
+        trie.set("aaab", 1);
+        trie.set("aaac", 1);
+        trie.set("aaad", 1);
+        trie.set("aab", 1);
+        FCITX_ASSERT(trie.size() == 5);
+        trie.erase("aaaa");
+        FCITX_ASSERT(trie.size() == 4);
+        DATrie<int32_t>::position_type pos = 0;
+        auto result = trie.traverse("aaa", pos);
+        FCITX_ASSERT(trie.isNoValue(result));
+        trie.erase(pos);
+        FCITX_ASSERT(trie.size() == 4);
+    }
+
+    {
+        DATrie<float> trie;
+        trie.set("aaaa", 1);
+        trie.set("aaab", 1);
+        trie.set("aaac", 1);
+        trie.set("aaad", 1);
+        trie.set("aab", 1);
+        FCITX_ASSERT(trie.size() == 5);
+        trie.erase("aaaa");
+        FCITX_ASSERT(trie.size() == 4);
+        DATrie<float>::position_type pos = 0;
+        auto result = trie.traverse("aaa", pos);
+        auto nan1 = std::nanf("1");
+        auto nan2 = std::nanf("2");
+        // NaN != NaN, we must use memcmp to do this.
+        FCITX_ASSERT(memcmp(&nan1, &result, sizeof(float)) == 0);
+        FCITX_ASSERT(trie.isNoValue(result));
+        result = trie.traverse("aaae", pos);
+        FCITX_ASSERT(memcmp(&nan2, &result, sizeof(float)) == 0);
+        FCITX_ASSERT(trie.isNoPath(result));
+        trie.erase(pos);
+        FCITX_ASSERT(trie.size() == 4);
+    }
     return 0;
 }