organicmaps/fast_double_parser
13
Fork 0
mirror of https://github.com/lemire/fast_double_parser.git synced 2025-04-03 20:04:57 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Various fixes.

Browse source
This commit is contained in:
Daniel Lemire 2020-06-03 16:15:08 +00:00
parent df9334c780
commit 7901bd813e
4 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CMakeLists.txt
View file

@ -3,6 +3,12 @@ project(fast_double_parser LANGUAGES CXX VERSION 0.0.0.0)
cmake_minimum_required(VERSION 3.11)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (NOT CMAKE_BUILD_TYPE)
message(STATUS "No build type selected, default to Release")
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
endif()
option(FAST_DOUBLE_PARSER_SANITIZE "Sanitize addresses" OFF)
add_subdirectory(benchmarks/dependencies/abseil-cpp)
add_subdirectory(benchmarks/dependencies/double-conversion)
@ -14,11 +20,22 @@ set(stats_src tests/stats.cpp)
set(benchmark_src benchmarks/benchmark.cpp)
add_executable(unit ${unit_src})
if(FAST_DOUBLE_PARSER_SANITIZE)
target_compile_options(unit PUBLIC -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all)
target_link_options(unit PUBLIC -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all)
# Ubuntu bug for GCC 5.0+ (safe for all versions)
if (CMAKE_COMPILER_IS_GNUCC)
target_link_libraries(unit PUBLIC -fuse-ld=gold)
endif()
endif()
target_include_directories(unit PUBLIC include)
enable_testing()
add_test(unit unit)
add_executable(stats ${stats_src})
target_include_directories(stats PUBLIC include)
add_executable(benchmark ${benchmark_src})
target_link_libraries(benchmark PUBLIC double-conversion absl_strings)
target_include_directories(benchmark PUBLIC include)
target_include_directories(benchmark PUBLIC include)

35
include/fast_double_parser.h
View file

@ -12,6 +12,9 @@
#ifdef _MSC_VER
#include <intrin.h>
#define WARN_UNUSED
#else
#define WARN_UNUSED __attribute__((warn_unused_result))
#endif
namespace fast_double_parser {
@ -1279,29 +1282,10 @@ bool is_one_of(char v)
}
#endif
// We need to check that the character following a zero is valid. This is
// probably frequent and it is hard than it looks. We are building all of this
// just to differentiate between 0x1 (invalid), 0,1 (valid) 0e1 (valid)...
const bool structural_or_whitespace_or_exponent_or_decimal_negated[256] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1,
1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
really_inline bool
is_not_structural_or_whitespace_or_exponent_or_decimal(unsigned char c) {
return structural_or_whitespace_or_exponent_or_decimal_negated[c];
}
// parse the number at p
template <char... DecSeparators>
WARN_UNUSED
really_inline bool parse_number_base(const char *p, double *outDouble) {
const char *pinit = p;
bool found_minus = (*p == '-');
@ -1318,7 +1302,7 @@ really_inline bool parse_number_base(const char *p, double *outDouble) {
uint64_t i; // an unsigned int avoids signed overflows (which are bad)
if (*p == '0') { // 0 cannot be followed by an integer
++p;
if (is_not_structural_or_whitespace_or_exponent_or_decimal(*p)) {
if (is_integer(*p)) {
return false;
}
i = 0;
@ -1439,16 +1423,19 @@ really_inline bool parse_number_base(const char *p, double *outDouble) {
return true;
}
const auto parse_number = parse_number_base<'.', ','>;
typedef bool (*parser_function_t)(const char *p, double *outDouble);
constexpr parser_function_t parse_number WARN_UNUSED = parse_number_base<'.', ','>;
namespace decimal_separator_dot
{
const auto parse_number = parse_number_base<'.'>;
constexpr parser_function_t parse_number WARN_UNUSED = parse_number_base<'.'>;
}
namespace decimal_separator_comma
{
const auto parse_number = parse_number_base<','>;
constexpr parser_function_t parse_number WARN_UNUSED = parse_number_base<','>;
}
} // namespace fast_double_parser

2
tests/stats.cpp
View file

@ -152,7 +152,7 @@ int parse_number_stats(const char *p) {
if (*p == '0') { // 0 cannot be followed by an integer
++p;
if (fast_double_parser::
is_not_structural_or_whitespace_or_exponent_or_decimal(*p)) {
is_integer(*p)) {
return false;
}
i = 0;

5
tests/unit.cpp
View file

@ -190,9 +190,10 @@ static const double testing_power_of_ten[] = {
void issue13() {
std::string a = "0";
double x;
fast_double_parser::parse_number(a.c_str(), &x);
bool ok = fast_double_parser::parse_number(a.c_str(), &x);
if(!ok) throw std::runtime_error("could not parse zero.");
if(x != 0) throw std::runtime_error("zero does not map to zero.");
std::cout << " zero maps to zero [!!!] " << std::endl;
std::cout << "zero maps to zero" << std::endl;
}
int main() {