Rename internal function and document it better

Author: Blake-Madden

tests/tetests.cpp

@@ -686,12 +686,12 @@ TEST_CASE("Main tests", "[main]")
 
     SECTION("logical")
         {
-        CHECK(te_parser::double_to_bool(2));
-        CHECK(te_parser::double_to_bool((WITHIN_TYPE)22.1));
-        CHECK(te_parser::double_to_bool(-2));
-        CHECK_FALSE(te_parser::double_to_bool(0));
-        CHECK_FALSE(te_parser::double_to_bool(0.0));
-        CHECK_FALSE(te_parser::double_to_bool(te_parser::te_nan));
+        CHECK(te_parser::number_to_bool(2));
+        CHECK(te_parser::number_to_bool((WITHIN_TYPE)22.1));
+        CHECK(te_parser::number_to_bool(-2));
+        CHECK_FALSE(te_parser::number_to_bool(0));
+        CHECK_FALSE(te_parser::number_to_bool(0.0));
+        CHECK_FALSE(te_parser::number_to_bool(te_parser::te_nan));
 
         CHECK(tep.evaluate("if(1, 9, 7)") == 9);
         CHECK(tep.evaluate("if(0, 9, 7)") == 7);

tinyexpr.cpp

@@ -171,7 +171,7 @@ namespace te_builtins
         return (!std::isfinite(val1) && !std::isfinite(val2)) ?
             te_parser::te_nan :
             static_cast<te_type>(
-                (te_parser::double_to_bool(val1) && te_parser::double_to_bool(val2)) ? 1 : 0);
+                (te_parser::number_to_bool(val1) && te_parser::number_to_bool(val2)) ? 1 : 0);
         // clang-format on
         }
 
@@ -182,14 +182,14 @@ namespace te_builtins
         return (!std::isfinite(val1) && !std::isfinite(val2)) ?
             te_parser::te_nan :
             static_cast<te_type>(
-                (te_parser::double_to_bool(val1) || te_parser::double_to_bool(val2)) ? 1 : 0);
+                (te_parser::number_to_bool(val1) || te_parser::number_to_bool(val2)) ? 1 : 0);
         // clang-format on
         }
 
     [[nodiscard]]
     static te_type te_not(te_type val)
         {
-        return std::isfinite(val) ? static_cast<te_type>(!te_parser::double_to_bool(val)) :
+        return std::isfinite(val) ? static_cast<te_type>(!te_parser::number_to_bool(val)) :
                                     te_parser::te_nan;
         }
 
@@ -1126,9 +1126,9 @@ namespace te_builtins
     static te_type te_and_maybe_nan(te_type val1, te_type val2MaybeNan)
         {
         return !std::isfinite(val2MaybeNan) ?
-                   static_cast<te_type>(te_parser::double_to_bool(val1)) :
-                   static_cast<te_type>(te_parser::double_to_bool(val1) &&
-                                        te_parser::double_to_bool(val2MaybeNan));
+                   static_cast<te_type>(te_parser::number_to_bool(val1)) :
+                   static_cast<te_type>(te_parser::number_to_bool(val1) &&
+                                        te_parser::number_to_bool(val2MaybeNan));
         }
 
     [[nodiscard]]
@@ -1175,9 +1175,9 @@ namespace te_builtins
     static te_type te_or_maybe_nan(te_type val1, te_type val2MaybeNan)
         {
         return !std::isfinite(val2MaybeNan) ?
-                   static_cast<te_type>(te_parser::double_to_bool(val1)) :
-                   static_cast<te_type>(te_parser::double_to_bool(val1) ||
-                                        te_parser::double_to_bool(val2MaybeNan));
+                   static_cast<te_type>(te_parser::number_to_bool(val1)) :
+                   static_cast<te_type>(te_parser::number_to_bool(val1) ||
+                                        te_parser::number_to_bool(val2MaybeNan));
         }
 
     [[nodiscard]]
@@ -1223,16 +1223,16 @@ namespace te_builtins
     [[nodiscard]]
     static te_type te_if(te_type val1, te_type val2, te_type val3)
         {
-        return te_parser::double_to_bool(val1) ? val2 : val3;
+        return te_parser::number_to_bool(val1) ? val2 : val3;
         }
 
     [[nodiscard]]
     static te_type te_ifs(te_type if1, te_type if1True, te_type if2, te_type if2True, te_type if3,
                           te_type if3True)
         {
-        return te_parser::double_to_bool(if1) ? if1True :
-               te_parser::double_to_bool(if2) ? if2True :
-               te_parser::double_to_bool(if3) ? if3True :
+        return te_parser::number_to_bool(if1) ? if1True :
+               te_parser::number_to_bool(if2) ? if2True :
+               te_parser::number_to_bool(if3) ? if3True :
                                                 te_parser::te_nan;
         }
 

tinyexpr.h

@@ -711,13 +711,14 @@ class te_parser
         return m_expression;
         }
 
-    /// @brief Helper function to see if a double value is boolean.
+    /// @brief Helper function to convert a number into boolean.
+    /// @details This takes NaN into account, returning @c for NaN.
     /// @param val The value to examine.
-    /// @returns @c if the value is non-zero and also a valid double
+    /// @returns @c true if the value is non-zero and also a valid double
     ///     (not NaN or infinite).
     /// @private
     [[nodiscard]]
-    static bool double_to_bool(te_type val)
+    static bool number_to_bool(te_type val)
         {
         return std::isfinite(val) ? static_cast<bool>(val) : false;
         }