Change the boolean ints to bool #212

Author: kaorut

library/trie/c/include/tetengo/trie/storage.h

@@ -7,6 +7,7 @@
 #if !defined(TETENGO_TRIE_STORAGE_H)
 #define TETENGO_TRIE_STORAGE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #if defined(_WIN32)
 #include <wchar.h>
@@ -117,10 +118,10 @@ int tetengo_trie_storage_baseAt(const tetengo_trie_storage_t* p_storage, size_t
     \param base_check_index A base-check index.
     \param base             A base value.
 
-    \retval non-zero On no error.
-    \retval 0        Otherwise.
+    \retval true  On no error.
+    \retval false Otherwise.
 */
-int tetengo_trie_storage_setBaseAt(tetengo_trie_storage_t* p_storage, size_t base_check_index, int base);
+bool tetengo_trie_storage_setBaseAt(tetengo_trie_storage_t* p_storage, size_t base_check_index, int base);
 
 /*!
     \brief Returns the check value.
@@ -139,10 +140,10 @@ unsigned char tetengo_trie_storage_checkAt(const tetengo_trie_storage_t* p_stora
     \param base_check_index A base-check index.
     \param check            A check value.
 
-    \retval non-zero On no error.
-    \retval 0        Otherwise.
+    \retval true  On no error.
+    \retval false Otherwise.
 */
-int tetengo_trie_storage_setCheckAt(tetengo_trie_storage_t* p_storage, size_t base_check_index, unsigned char check);
+bool tetengo_trie_storage_setCheckAt(tetengo_trie_storage_t* p_storage, size_t base_check_index, unsigned char check);
 
 /*!
     \brief Returns the value count.
@@ -171,10 +172,10 @@ const void* tetengo_trie_storage_valueAt(const tetengo_trie_storage_t* p_storage
     \param p_value     A pointer to a value object. Must not be NULL.
     \param value_size  A value size.
 
-    \retval non-zero On no error.
-    \retval 0        Otherwise.
+    \retval true  On no error.
+    \retval false Otherwise.
 */
-int tetengo_trie_storage_addValueAt(
+bool tetengo_trie_storage_addValueAt(
     tetengo_trie_storage_t* p_storage,
     size_t                  value_index,
     const void*             p_value,
@@ -196,10 +197,10 @@ double tetengo_trie_storage_fillingRate(const tetengo_trie_storage_t* p_storage)
     \param path             A file path.
     \param fixed_value_size The value size if it is fixed. Or 0 if the size is variable.
 
-    \retval non-zero On no error.
-    \retval 0        Otherwise.
+    \retval true  On no error.
+    \retval false Otherwise.
 */
-int tetengo_trie_storage_serialize(
+bool tetengo_trie_storage_serialize(
     const tetengo_trie_storage_t* p_storage,
     const path_character_type*    path,
     size_t                        fixed_value_size);

library/trie/c/include/tetengo/trie/trie.h

@@ -7,6 +7,7 @@
 #if !defined(TETENGO_TRIE_TRIE_H)
 #define TETENGO_TRIE_TRIE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 
 
@@ -118,14 +119,14 @@ tetengo_trie_trie_t* tetengo_trie_trie_createWithStorage(tetengo_trie_storage_t*
 void tetengo_trie_trie_destroy(const tetengo_trie_trie_t* p_trie);
 
 /*!
-    \brief Returns non-zero when the trie is empty.
+    \brief Returns true when the trie is empty.
 
     \param p_trie A pointer to a trie.
 
-    \retval non-zero When the trie is empty.
-    \retval 0        Otherwise.
+    \retval true  When the trie is empty.
+    \retval false Otherwise.
 */
-int tetengo_trie_trie_empty(const tetengo_trie_trie_t* p_trie);
+bool tetengo_trie_trie_empty(const tetengo_trie_trie_t* p_trie);
 
 /*!
     \brief Returns the size of the trie.
@@ -137,15 +138,15 @@ int tetengo_trie_trie_empty(const tetengo_trie_trie_t* p_trie);
 size_t tetengo_trie_trie_size(const tetengo_trie_trie_t* p_trie);
 
 /*!
-    \brief Returns non-zero when the trie contains the given key.
+    \brief Returns true when the trie contains the given key.
 
     \param p_trie A pointer to a trie.
     \param key    A key.
 
-    \retval non-zero When the trie contains the given key.
-    \retval 0        Otherwise.
+    \retval true  When the trie contains the given key.
+    \retval false Otherwise.
 */
-int tetengo_trie_trie_contains(const tetengo_trie_trie_t* p_trie, const char* key);
+bool tetengo_trie_trie_contains(const tetengo_trie_trie_t* p_trie, const char* key);
 
 /*!
     \brief Finds the value object correspoinding the given key.

library/trie/c/include/tetengo/trie/trieIterator.h

@@ -7,6 +7,8 @@
 #if !defined(TETENGO_TRIE_TRIEITERATOR_H)
 #define TETENGO_TRIE_TRIEITERATOR_H
 
+#include <stdbool.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
@@ -50,14 +52,14 @@ void tetengo_trie_trieIterator_destroy(const tetengo_trie_trieIterator_t* p_iter
 const void* tetengo_trie_trieIterator_get(const tetengo_trie_trieIterator_t* p_iterator);
 
 /*!
-    \brief Returns non-zero when the iterator will return more elements.
+    \brief Returns true when the iterator will return more elements.
 
     \param p_iterator A pointer to an iterator.
 
-    \retval non-zero When the iterator will return more elements.
-    \retval 0        Otherwise.
+    \retval true  When the iterator will return more elements.
+    \retval false Otherwise.
 */
-int tetengo_trie_trieIterator_hasNext(const tetengo_trie_trieIterator_t* p_iterator);
+bool tetengo_trie_trieIterator_hasNext(const tetengo_trie_trieIterator_t* p_iterator);
 
 /*!
     \brief Increments the iterator.

library/trie/c/src/tetengo_trie_storage.cpp

@@ -187,7 +187,7 @@ int tetengo_trie_storage_baseAt(const tetengo_trie_storage_t* const p_storage, c
     }
 }
 
-int tetengo_trie_storage_setBaseAt(
+bool tetengo_trie_storage_setBaseAt(
     tetengo_trie_storage_t* const p_storage,
     const size_t                  base_check_index,
     const int                     base)
@@ -201,11 +201,11 @@ int tetengo_trie_storage_setBaseAt(
 
         p_storage->p_cpp_storage()->set_base_at(base_check_index, base);
 
-        return 1;
+        return true;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 
@@ -226,7 +226,7 @@ unsigned char tetengo_trie_storage_checkAt(const tetengo_trie_storage_t* const p
     }
 }
 
-int tetengo_trie_storage_setCheckAt(
+bool tetengo_trie_storage_setCheckAt(
     tetengo_trie_storage_t* const p_storage,
     const size_t                  base_check_index,
     const unsigned char           check)
@@ -240,11 +240,11 @@ int tetengo_trie_storage_setCheckAt(
 
         p_storage->p_cpp_storage()->set_check_at(base_check_index, check);
 
-        return 1;
+        return true;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 
@@ -287,7 +287,7 @@ const void* tetengo_trie_storage_valueAt(const tetengo_trie_storage_t* const p_s
     }
 }
 
-int tetengo_trie_storage_addValueAt(
+bool tetengo_trie_storage_addValueAt(
     tetengo_trie_storage_t* const p_storage,
     const size_t                  value_index,
     const void* const             p_value,
@@ -308,11 +308,11 @@ int tetengo_trie_storage_addValueAt(
             static_cast<const char*>(p_value), static_cast<const char*>(p_value) + value_size);
         p_storage->p_cpp_storage()->add_value_at(value_index, std::move(value_bytes));
 
-        return 1;
+        return true;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 
@@ -333,7 +333,7 @@ double tetengo_trie_storage_fillingRate(const tetengo_trie_storage_t* const p_st
     }
 }
 
-int tetengo_trie_storage_serialize(
+bool tetengo_trie_storage_serialize(
     const tetengo_trie_storage_t* const p_storage,
     const path_character_type* const    path,
     const size_t                        fixed_value_size)
@@ -355,11 +355,11 @@ int tetengo_trie_storage_serialize(
         };
         p_storage->p_cpp_storage()->serialize(stream, serializer);
 
-        return 1;
+        return true;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 

library/trie/c/src/tetengo_trie_trie.cpp

@@ -134,7 +134,7 @@ void tetengo_trie_trie_destroy(const tetengo_trie_trie_t* const p_trie)
     {}
 }
 
-int tetengo_trie_trie_empty(const tetengo_trie_trie_t* const p_trie)
+bool tetengo_trie_trie_empty(const tetengo_trie_trie_t* const p_trie)
 {
     try
     {
@@ -143,11 +143,11 @@ int tetengo_trie_trie_empty(const tetengo_trie_trie_t* const p_trie)
             throw std::invalid_argument{ "p_trie is NULL." };
         }
 
-        return std::empty(*p_trie->p_cpp_trie) ? 1 : 0;
+        return std::empty(*p_trie->p_cpp_trie);
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 
@@ -168,7 +168,7 @@ size_t tetengo_trie_trie_size(const tetengo_trie_trie_t* const p_trie)
     }
 }
 
-int tetengo_trie_trie_contains(const tetengo_trie_trie_t* const p_trie, const char* const key)
+bool tetengo_trie_trie_contains(const tetengo_trie_trie_t* const p_trie, const char* const key)
 {
     try
     {
@@ -185,7 +185,7 @@ int tetengo_trie_trie_contains(const tetengo_trie_trie_t* const p_trie, const ch
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 

library/trie/c/src/tetengo_trie_trieIterator.cpp

@@ -9,6 +9,8 @@
 #include <stdexcept>
 #include <utility>
 
+#include <boost/stl_interfaces/iterator_interface.hpp>
+
 #include <tetengo/trie/storage.h>
 #include <tetengo/trie/trie.h>
 #include <tetengo/trie/trie.hpp>
@@ -75,7 +77,7 @@ const void* tetengo_trie_trieIterator_get(const tetengo_trie_trieIterator_t* p_i
     }
 }
 
-int tetengo_trie_trieIterator_hasNext(const tetengo_trie_trieIterator_t* p_iterator)
+bool tetengo_trie_trieIterator_hasNext(const tetengo_trie_trieIterator_t* p_iterator)
 {
     try
     {
@@ -84,11 +86,11 @@ int tetengo_trie_trieIterator_hasNext(const tetengo_trie_trieIterator_t* p_itera
             throw std::invalid_argument{ "p_iterator is NULL." };
         }
 
-        return p_iterator->p_cpp_iterator_pair->first == p_iterator->p_cpp_iterator_pair->second ? 0 : 1;
+        return p_iterator->p_cpp_iterator_pair->first != p_iterator->p_cpp_iterator_pair->second;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }