[libc][NFC] rename str_conv_utils to str_to_integer
rename str_conv_utils to str_to_integer to be more
in line with str_to_float.
Reviewed By: sivachandra, lntue
Differential Revision: https://reviews.llvm.org/D113061
GitOrigin-RevId: 31d797f41efe00dbc3eaf5d97778f1c4dd0c15c2
diff --git a/src/__support/CMakeLists.txt b/src/__support/CMakeLists.txt
index 5d2667d..567ed06 100644
--- a/src/__support/CMakeLists.txt
+++ b/src/__support/CMakeLists.txt
@@ -23,11 +23,22 @@
)
add_header_library(
- str_conv_utils
+ str_to_integer
HDRS
- str_conv_utils.h
+ 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_to_float.h
DEPENDS
+ .str_to_integer
.ctype_utils
.high_precision_decimal
libc.include.errno
diff --git a/src/__support/detailed_powers_of_ten.h b/src/__support/detailed_powers_of_ten.h
index e168b95..9a58ba5 100644
--- a/src/__support/detailed_powers_of_ten.h
+++ b/src/__support/detailed_powers_of_ten.h
@@ -21,7 +21,7 @@
// 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;
diff --git a/src/__support/high_precision_decimal.h b/src/__support/high_precision_decimal.h
index ae8aac3..352de58 100644
--- a/src/__support/high_precision_decimal.h
+++ b/src/__support/high_precision_decimal.h
@@ -10,7 +10,7 @@
#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 {
diff --git a/src/__support/str_to_float.h b/src/__support/str_to_float.h
index b62e8ff..59bd1ec 100644
--- a/src/__support/str_to_float.h
+++ b/src/__support/str_to_float.h
@@ -14,7 +14,7 @@
#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 {
diff --git a/src/__support/str_conv_utils.h b/src/__support/str_to_integer.h
similarity index 95%
rename from src/__support/str_conv_utils.h
rename to src/__support/str_to_integer.h
index 13c800a..ec7f6f5 100644
--- a/src/__support/str_conv_utils.h
+++ b/src/__support/str_to_integer.h
@@ -1,4 +1,4 @@
-//===-- 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.
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#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"
@@ -148,4 +148,4 @@
} // namespace internal
} // namespace __llvm_libc
-#endif // LIBC_SRC_STDLIB_STDLIB_UTILS_H
+#endif // LIBC_SRC_SUPPORT_STR_TO_INTEGER_H
diff --git a/src/inttypes/CMakeLists.txt b/src/inttypes/CMakeLists.txt
index e0e0f4d..00fd791 100644
--- a/src/inttypes/CMakeLists.txt
+++ b/src/inttypes/CMakeLists.txt
@@ -5,7 +5,7 @@
HDRS
strtoimax.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -15,7 +15,7 @@
HDRS
strtoumax.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
diff --git a/src/inttypes/strtoimax.cpp b/src/inttypes/strtoimax.cpp
index ecd59ff..ef5e84e 100644
--- a/src/inttypes/strtoimax.cpp
+++ b/src/inttypes/strtoimax.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/inttypes/strtoumax.cpp b/src/inttypes/strtoumax.cpp
index cc3f145..edf8b65 100644
--- a/src/inttypes/strtoumax.cpp
+++ b/src/inttypes/strtoumax.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/CMakeLists.txt b/src/stdlib/CMakeLists.txt
index 3700d9a..f5f3390 100644
--- a/src/stdlib/CMakeLists.txt
+++ b/src/stdlib/CMakeLists.txt
@@ -5,7 +5,7 @@
HDRS
atoi.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -15,7 +15,7 @@
HDRS
atof.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_float
)
add_entrypoint_object(
@@ -25,7 +25,7 @@
HDRS
atol.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -35,7 +35,7 @@
HDRS
atoll.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -45,7 +45,7 @@
HDRS
strtof.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_float
)
add_entrypoint_object(
@@ -55,7 +55,7 @@
HDRS
strtod.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_float
)
add_entrypoint_object(
@@ -65,7 +65,7 @@
HDRS
strtol.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -75,7 +75,7 @@
HDRS
strtoll.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -85,7 +85,7 @@
HDRS
strtoul.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
@@ -95,7 +95,7 @@
HDRS
strtoull.h
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_integer
)
add_entrypoint_object(
diff --git a/src/stdlib/atoi.cpp b/src/stdlib/atoi.cpp
index f0e57ca..37cfab1 100644
--- a/src/stdlib/atoi.cpp
+++ b/src/stdlib/atoi.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/atol.cpp b/src/stdlib/atol.cpp
index 8f0ed88..6a1da4c 100644
--- a/src/stdlib/atol.cpp
+++ b/src/stdlib/atol.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/atoll.cpp b/src/stdlib/atoll.cpp
index c75e521..ffa8105 100644
--- a/src/stdlib/atoll.cpp
+++ b/src/stdlib/atoll.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/strtol.cpp b/src/stdlib/strtol.cpp
index 1c744c9..33038b5 100644
--- a/src/stdlib/strtol.cpp
+++ b/src/stdlib/strtol.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/strtoll.cpp b/src/stdlib/strtoll.cpp
index e2fc37f..e2f0aac 100644
--- a/src/stdlib/strtoll.cpp
+++ b/src/stdlib/strtoll.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/strtoul.cpp b/src/stdlib/strtoul.cpp
index eab264f..0069679 100644
--- a/src/stdlib/strtoul.cpp
+++ b/src/stdlib/strtoul.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/src/stdlib/strtoull.cpp b/src/stdlib/strtoull.cpp
index bece278..db6c838 100644
--- a/src/stdlib/strtoull.cpp
+++ b/src/stdlib/strtoull.cpp
@@ -8,7 +8,7 @@
#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 {
diff --git a/test/src/__support/CMakeLists.txt b/test/src/__support/CMakeLists.txt
index 85b819c..d2367ef 100644
--- a/test/src/__support/CMakeLists.txt
+++ b/test/src/__support/CMakeLists.txt
@@ -27,7 +27,7 @@
SRCS
str_to_float_test.cpp
DEPENDS
- libc.src.__support.str_conv_utils
+ libc.src.__support.str_to_float
)
add_executable(
