Skip to content

Commit 42db9ac

Browse files
authored
Merge branch 'main' into P2497R0
2 parents e5d93c9 + a9ac1b4 commit 42db9ac

File tree

7 files changed

+42
-5
lines changed

7 files changed

+42
-5
lines changed

.github/workflows/amalgamate-ubuntu24.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Amalgamate Ubuntu 20.04 CI (GCC 13æ)
1+
name: Amalgamate Ubuntu 24.04 CI
22

33
on: [push, pull_request]
44

.github/workflows/emscripten.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
on: [push, pull_request]
2+
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
9+
- uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14
10+
- name: Verify
11+
run: emcc -v
12+
- name: Checkout
13+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
14+
- name: Configure
15+
run: emcmake cmake -B build
16+
- name: Build # We build but do not test
17+
run: cmake --build build
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Ubuntu 24.04 CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
ubuntu-build:
7+
runs-on: ubuntu-24.04
8+
strategy:
9+
fail-fast: false
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Use cmake
13+
run: |
14+
mkdir build &&
15+
cd build &&
16+
cmake -DFASTFLOAT_CXX_STANDARD=20 -DFASTFLOAT_TEST=ON -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
17+
cmake --build . &&
18+
ctest --output-on-failure &&
19+
cmake --install .

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 3.14)
22

3+
34
project(fast_float VERSION 8.0.2 LANGUAGES CXX)
45
set(FASTFLOAT_CXX_STANDARD 11 CACHE STRING "the C++ standard to use for fastfloat")
56
set(CMAKE_CXX_STANDARD ${FASTFLOAT_CXX_STANDARD})

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ cmake --build build
554554
manager](https://conan.io/center/recipes/fast_float).
555555
* It is part of the [brew package
556556
manager](https://formulae.brew.sh/formula/fast_float).
557+
* fast_float is available on [xmake](https://xmake.io) repository.
557558
* Some Linux distribution like Fedora include fast_float (e.g., as
558559
`fast_float-devel`).
559560

include/fast_float/ascii_number.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ parse_number_string(UC const *p, UC const *pend,
441441
if (digit_count > 19) {
442442
answer.too_many_digits = true;
443443
// Let us start again, this time, avoiding overflows.
444-
// We don't need to check if is_integer, since we use the
444+
// We don't need to call if is_integer, since we use the
445445
// pre-tokenized spans from above.
446446
i = 0;
447447
p = answer.integer.ptr;
@@ -451,7 +451,7 @@ parse_number_string(UC const *p, UC const *pend,
451451
i = i * 10 + uint64_t(*p - UC('0'));
452452
++p;
453453
}
454-
if (i >= minimal_nineteen_digit_integer) { // We have a big integers
454+
if (i >= minimal_nineteen_digit_integer) { // We have a big integer
455455
exponent = end_of_integer_part - p + exp_number;
456456
} else { // We have a value with a fractional component.
457457
p = answer.fraction.ptr;

tests/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ option(FASTFLOAT_SUPPLEMENTAL_TESTS "Run supplemental tests" ON)
99

1010
if (NOT SYSTEM_DOCTEST)
1111
FetchContent_Declare(doctest
12-
GIT_REPOSITORY https://github.com/onqtam/doctest.git
13-
GIT_TAG v2.4.12)
12+
GIT_REPOSITORY https://github.com/lemire/doctest.git)
1413
else ()
1514
find_package(doctest REQUIRED)
1615
endif()

0 commit comments

Comments
 (0)