[libc][NFC] rename str_conv_utils to str_to_integer

[michaelrj]

Summary

rename str_conv_utils to str_to_integer to be more
in line with str_to_float.

[michaelrj]

change to str_to_integer to match the function in the file

libc/src/__support/CMakeLists.txt

 add_header_library(
   high_precision_decimal
   HDRS
     high_precision_decimal.h
 
 )
 
 add_header_library(
-  str_conv_utils
+  str_to_integer
+  HDRS
+    str_to_integer.h
+  DEPENDS
+    .ctype_utils
+    libc.include.errno
+    libc.src.errno.__errno_location
+    libc.src.__support.CPP.standalone_cpp
+)
+
+add_header_library(
+  str_to_float
   HDRS
-    str_conv_utils.h
     str_to_float.h
   DEPENDS
+    .str_to_integer
     .ctype_utils
     .high_precision_decimal
     libc.include.errno
     libc.src.errno.__errno_location
     libc.src.__support.CPP.standalone_cpp
     libc.src.__support.FPUtil.fputil
 )
 
 add_header_library(
   integer_operations
   HDRS
     integer_operations.h
 )
 
 add_subdirectory(FPUtil)

libc/src/__support/detailed_powers_of_ten.h

 
 // TODO(michaelrj): write a script that will generate this table.
 
 // This table was generated by
 // https://github.com/google/wuffs/blob/788479dd64f35cb6b4e998a851acb06ee962435b/script/print-mpb-powers-of-10.go
 // and contains the 128 bit mantissa approximations of the powers of 10 from
 // -348 to 347. The exponents are implied by a linear expression with slope
 // 217706.0/65536.0 ≈ log(10)/log(2). This is used by the Eisel-Lemire algorithm
-// in str_conv_utils.h.
+// in str_to_float.h.
 
 constexpr int32_t DETAILED_POWERS_OF_TEN_MIN_EXP_10 = -348;
 constexpr int32_t DETAILED_POWERS_OF_TEN_MAX_EXP_10 = 347;
 
 // This rescales the base 10 exponent by a factor of log(10)/log(2).
 static inline int64_t exp10ToExp2(int64_t exp10) {
   return (217706 * exp10) >> 16;
 }

libc/src/__support/high_precision_decimal.h

 //===-- High Precision Decimal ----------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See httpss//llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LIBC_SRC_SUPPORT_HIGH_PRECISION_DECIMAL_H
 #define LIBC_SRC_SUPPORT_HIGH_PRECISION_DECIMAL_H
 
 #include "src/__support/ctype_utils.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 #include <stdint.h>
 
 namespace __llvm_libc {
 namespace internal {
 
 struct LShiftTableEntry {
   uint32_t newDigits;
   char const *powerOfFive;

libc/src/__support/str_to_float.h

 //===-- String to float conversion utils ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LIBC_SRC_SUPPORT_STR_TO_FLOAT_H
 #define LIBC_SRC_SUPPORT_STR_TO_FLOAT_H
 
 #include "src/__support/CPP/Limits.h"
 #include "src/__support/FPUtil/FPBits.h"
 #include "src/__support/ctype_utils.h"
 #include "src/__support/detailed_powers_of_ten.h"
 #include "src/__support/high_precision_decimal.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 #include <errno.h>
 
 namespace __llvm_libc {
 namespace internal {
 
 // Shifts right and rounds according to the following rules:
 // 1) If the part being cut off is more than 2^(amountToShift - 1) then round
 // up

libc/src/__support/str_to_integer.h

-//===-- Stdlib utils --------------------------------------------*- C++ -*-===//
+//===-- String to integer conversion utils ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIBC_SRC_STDLIB_STDLIB_UTILS_H
-#define LIBC_SRC_STDLIB_STDLIB_UTILS_H
+#ifndef LIBC_SRC_SUPPORT_STR_TO_INTEGER_H
+#define LIBC_SRC_SUPPORT_STR_TO_INTEGER_H
 
 #include "src/__support/CPP/Limits.h"
 #include "src/__support/ctype_utils.h"
 #include <errno.h>
 #include <limits.h>
 
 namespace __llvm_libc {
 namespace internal {
static inline T strtointeger(const char *__restrict src,
   }
 
   return is_positive ? static_cast<T>(result) : -static_cast<T>(result);
 }
 
 } // namespace internal
 } // namespace __llvm_libc
 
-#endif // LIBC_SRC_STDLIB_STDLIB_UTILS_H
+#endif // LIBC_SRC_SUPPORT_STR_TO_INTEGER_H

libc/src/inttypes/CMakeLists.txt

 add_entrypoint_object(
   strtoimax
   SRCS
     strtoimax.cpp
   HDRS
     strtoimax.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   strtoumax
   SRCS
     strtoumax.cpp
   HDRS
     strtoumax.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   imaxdiv
   SRCS
     imaxdiv.cpp
   HDRS
     imaxdiv.h
   DEPENDS
     libc.include.inttypes
     libc.src.__support.integer_operations
 )

libc/src/inttypes/strtoimax.cpp

 //===-- Implementation of strtoimax ---------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/inttypes/strtoimax.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(intmax_t, strtoimax,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<intmax_t>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/src/inttypes/strtoumax.cpp

 //===-- Implementation of strtoumax ---------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/inttypes/strtoumax.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(uintmax_t, strtoumax,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<uintmax_t>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/CMakeLists.txt

 add_entrypoint_object(
   atoi
   SRCS
     atoi.cpp
   HDRS
     atoi.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   atof
   SRCS
     atof.cpp
   HDRS
     atof.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_float
 )
 
 add_entrypoint_object(
   atol
   SRCS
     atol.cpp
   HDRS
     atol.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   atoll
   SRCS
     atoll.cpp
   HDRS
     atoll.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   strtof
   SRCS
     strtof.cpp
   HDRS
     strtof.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_float
 )
 
 add_entrypoint_object(
   strtod
   SRCS
     strtod.cpp
   HDRS
     strtod.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_float
 )
 
 add_entrypoint_object(
   strtol
   SRCS
     strtol.cpp
   HDRS
     strtol.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   strtoll
   SRCS
     strtoll.cpp
   HDRS
     strtoll.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   strtoul
   SRCS
     strtoul.cpp
   HDRS
     strtoul.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   strtoull
   SRCS
     strtoull.cpp
   HDRS
     strtoull.h
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_integer
 )
 
 add_entrypoint_object(
   abs
   SRCS
     abs.cpp
   HDRS
     abs.h

libc/src/stdlib/atoi.cpp

 //===-- Implementation of atoi --------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/atoi.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(int, atoi, (const char *str)) {
   return internal::strtointeger<int>(str, nullptr, 10);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/atol.cpp

 //===-- Implementation of atol --------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/atol.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(long, atol, (const char *str)) {
   return internal::strtointeger<long>(str, nullptr, 10);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/atoll.cpp

 //===-- Implementation of atoll -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/atoll.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(long long, atoll, (const char *str)) {
   return internal::strtointeger<long long>(str, nullptr, 10);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/strtol.cpp

 //===-- Implementation of strtol ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/strtol.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(long, strtol,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<long>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/strtoll.cpp

 //===-- Implementation of strtoll -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/strtoll.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(long long, strtoll,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<long long>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/strtoul.cpp

 //===-- Implementation of strtoul -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/strtoul.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(unsigned long, strtoul,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<unsigned long>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/src/stdlib/strtoull.cpp

 //===-- Implementation of strtoull ----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/strtoull.h"
 #include "src/__support/common.h"
-#include "src/__support/str_conv_utils.h"
+#include "src/__support/str_to_integer.h"
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(unsigned long long, strtoull,
                    (const char *__restrict str, char **__restrict str_end,
                     int base)) {
   return internal::strtointeger<unsigned long long>(str, str_end, base);
 }
 
 } // namespace __llvm_libc

libc/test/src/__support/CMakeLists.txt

 
 add_libc_unittest(
   str_to_float_test
   SUITE
     libc_support_unittests
   SRCS
     str_to_float_test.cpp
   DEPENDS
-    libc.src.__support.str_conv_utils
+    libc.src.__support.str_to_float
 )
 
 add_executable(
   libc_str_to_float_comparison_test
   str_to_float_comparison_test.cpp
 )
 
 target_link_libraries(libc_str_to_float_comparison_test