feat: update version

fix issue #231

.circleci/config.yml

@@ -2,19 +2,24 @@ version: 2.1
 
 jobs:
   test_suite:
-    environment:
-      - GOPATH: /home/circleci/go
     docker:
-      - image: circleci/golang:1.9
+      - image: cimg/go:1.16
     steps:
       - checkout
       - run:
           command: |
               g++ --version
               cd tests/
-              g++ -std=c++11 -O2 -Wall -Wextra -Werror -DTOML11_DISALLOW_HETEROGENEOUS_ARRAYS -I../ check_toml_test.cpp -o check_toml_test
-              go get github.com/BurntSushi/toml-test
-              $GOPATH/bin/toml-test ./check_toml_test
+              g++ -std=c++11 -O2 -Wall -Wextra -Werror -I../ check_toml_test.cpp -o check_toml_test
+              export PATH=$(pwd):${PATH}
+              git clone --depth 1 --branch v1.3.0 https://github.com/BurntSushi/toml-test.git
+              cd toml-test/
+              go install -v ./cmd/toml-test
+              cd -
+              toml-test check_toml_test
+#               go clean -modcache
+#               go get github.com/BurntSushi/toml-test/cmd/toml-test
+#               $GOPATH/bin/toml-test ./check_toml_test
   test_serialization:
     docker:
       - image: circleci/buildpack-deps:bionic
@@ -24,7 +29,7 @@ jobs:
           command: |
               g++ --version
               cd tests/
-              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -DTOML11_DISALLOW_HETEROGENEOUS_ARRAYS -I../ check_serialization.cpp -o check_serialization
+              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -I../ check_serialization.cpp -o check_serialization
               git clone https://github.com/BurntSushi/toml-test.git
               cp check_serialization toml-test/tests/valid
               cd toml-test/tests/valid
@@ -47,7 +52,7 @@ jobs:
           command: |
               g++ --version
               cd tests/
-              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -DTOML11_DISALLOW_HETEROGENEOUS_ARRAYS -I../ check.cpp -o check
+              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -I../ check.cpp -o check
               git clone https://github.com/BurntSushi/toml-test.git
               cp check toml-test/tests/invalid
               cp check toml-test/tests/valid

.clusterfuzzlite/Dockerfile

@@ -0,0 +1,6 @@
+FROM gcr.io/oss-fuzz-base/base-builder
+RUN apt-get update && apt-get install -y make autoconf automake libtool
+
+COPY . $SRC/toml11
+COPY .clusterfuzzlite/build.sh $SRC/build.sh
+WORKDIR $SRC/toml11

.clusterfuzzlite/README.md

@@ -0,0 +1,3 @@
+# ClusterFuzzLite set up
+
+This folder contains a fuzzing set for [ClusterFuzzLite](https://google.github.io/clusterfuzzlite).

.clusterfuzzlite/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -eu
+# Copy fuzzer executable to $OUT/
+$CXX $CFLAGS $LIB_FUZZING_ENGINE \
+  $SRC/toml11/.clusterfuzzlite/parse_fuzzer.cpp \
+  -o $OUT/parse_fuzzer \
+  -I$SRC/toml11/

.clusterfuzzlite/parse_fuzzer.cpp

@@ -0,0 +1,16 @@
+
+#include <toml.hpp>
+
+#include <sstream>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  std::string s(reinterpret_cast<const char *>(data), size);
+  std::istringstream iss(s);
+  try {
+    const auto ref = toml::parse(iss);
+  } catch (...) {
+  }
+
+  return 0;
+}

.clusterfuzzlite/project.yaml

@@ -0,0 +1 @@
+language: c++

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = space
+
+[CMakeLists.txt]
+indent_size = 4
+
+[*.{c,h}*]
+indent_size = 4
+
+[*.{md,yml}]
+indent_size = 2

.github/workflows/cflite_pr.yml

@@ -0,0 +1,30 @@
+name: ClusterFuzzLite PR fuzzing
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [ master ]
+permissions: read-all
+jobs:
+  PR:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: [address]
+    steps:
+    - name: Build Fuzzers (${{ matrix.sanitizer }})
+      id: build
+      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+      with:
+        sanitizer: ${{ matrix.sanitizer }}
+        language: c++
+        bad-build-check: false
+    - name: Run Fuzzers (${{ matrix.sanitizer }})
+      id: run
+      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        fuzz-seconds: 240
+        mode: 'code-change'
+        report-unreproducible-crashes: false
+        sanitizer: ${{ matrix.sanitizer }}

.github/workflows/main.yml

@@ -4,41 +4,28 @@ on: [push, pull_request]
 
 jobs:
   build-linux-gcc:
-    runs-on: Ubuntu-18.04
+    runs-on: Ubuntu-22.04
     strategy:
       matrix:
-        # g++-4.8 and 4.9 are tested on Travis.CI.
-        compiler: ['g++-9', 'g++-8', 'g++-7', 'g++-6', 'g++-5']
+        compiler: ['g++-12', 'g++-11', 'g++-10', 'g++-9']
         standard: ['11', '14', '17', '20']
-        exclude:
-            - {compiler: 'g++-5', standard: '17'}
-            - {compiler: 'g++-6', standard: '17'}
-            - {compiler: 'g++-5', standard: '20'}
-            - {compiler: 'g++-6', standard: '20'}
-            - {compiler: 'g++-7', standard: '20'}
+        unreleased: ['ON', 'OFF']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install
         run: |
-            sudo apt-add-repository ppa:mhier/libboost-latest
+            sudo apt-add-repository ppa:ubuntu-toolchain-r/test
             sudo apt-get update
-            sudo apt-get install boost1.70
-            if [[ "${{ matrix.compiler }}" == "g++-6" || "${{ matrix.compiler }}" == "g++-5" ]] ; then
-                sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-                sudo apt-get update
-                sudo apt-get install ${{ matrix.compiler }}
-            fi
+            sudo apt-get install libboost-test-dev
+            sudo apt-get install language-pack-fr # test serializer w/ locale
+            sudo apt-get install ${{ matrix.compiler }}
       - name: Configure
         run: |
             mkdir build && cd build
-            if [[ "${{ matrix.compiler }}" == "g++-8" && ( "${{ matrix.standard }}" == "17" || "${{ matrix.standard }}" == "20" ) ]] ; then
-                cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_REQUIRE_FILESYSTEM_LIBRARY=ON
-            else
-                cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }}
-            fi
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
       - name: Build
         run: |
             cd build && cmake --build .
@@ -46,54 +33,231 @@ jobs:
         run: |
             cd build && ctest --output-on-failure
   build-linux-clang:
-    runs-on: Ubuntu-18.04
+    runs-on: Ubuntu-22.04
     strategy:
       matrix:
-        compiler: ['10', '9', '8', '7', '6.0', '5.0', '4.0', '3.9']
+        compiler: ['15', '14', '13', '12', '11']
         standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
         exclude:
-            - {compiler: '3.9', standard: '17'}
-            - {compiler: '4.0', standard: '17'}
-            - {compiler: '5.0', standard: '17'}
-            - {compiler: '3.9', standard: '20'}
-            - {compiler: '4.0', standard: '20'}
-            - {compiler: '5.0', standard: '20'}
+            - {compiler: '14', standard: '20'} # to avoid using gcc-13 libstdc++
+            - {compiler: '13', standard: '20'} # with older clang
+            - {compiler: '12', standard: '20'}
+            - {compiler: '11', standard: '20'}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install
         run: |
-            sudo apt-add-repository ppa:mhier/libboost-latest
+            sudo apt-add-repository ppa:ubuntu-toolchain-r/test
             sudo apt-get update
-            sudo apt-get install boost1.70
-            if [[ "${{ matrix.compiler }}" != "6" && "${{ matrix.compiler }}" != "8" && "${{ matrix.compiler }}" != "9" ]] ; then
-                sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-                sudo apt-get update
-                sudo apt-get install clang-${{ matrix.compiler }}
-            fi
+            sudo apt-get install libboost-test-dev
+            sudo apt-get install language-pack-fr # test serializer w/ locale
+            sudo apt-get install clang-${{ matrix.compiler }}
       - name: Configure
         run: |
             mkdir build && cd build
-            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=clang++-${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }}
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_C_COMPILER=clang-${{ matrix.compiler }} -DCMAKE_CXX_COMPILER=clang++-${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
       - name: Build
         run: |
             cd build && cmake --build .
       - name: Test
         run: |
             cd build && ctest --output-on-failure
+
+  build-linux-old-gcc:
+    runs-on: Ubuntu-20.04
+    strategy:
+      matrix:
+        compiler: ['g++-8', 'g++-7']
+        standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
+        exclude:
+            - {compiler: 'g++-7', standard: '20'}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install
+        run: |
+            sudo apt-add-repository ppa:ubuntu-toolchain-r/test
+            sudo apt-get update
+            sudo apt-get install libboost-test-dev
+            sudo apt-get install language-pack-fr # test serializer w/ locale
+            sudo apt-get install ${{ matrix.compiler }}
+      - name: Configure
+        run: |
+            mkdir build && cd build
+            if [[ "${{ matrix.compiler }}" == "g++-8" && ( "${{ matrix.standard }}" == "17" || "${{ matrix.standard }}" == "20" ) ]] ; then
+                cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_REQUIRE_FILESYSTEM_LIBRARY=ON -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+            else
+                cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+            fi
+      - name: Build
+        run: |
+            cd build && cmake --build .
+      - name: Test
+        run: |
+            cd build && ctest --output-on-failure
+
+  build-linux-old-clang:
+    runs-on: Ubuntu-20.04
+    strategy:
+      matrix:
+        compiler: ['10', '9', '8', '7', '6.0']
+        standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
+        exclude:
+            - {compiler: '6.0', standard: '20'}
+            - {compiler: '7',   standard: '20'}
+            - {compiler: '8',   standard: '20'}
+            - {compiler: '9',   standard: '20'}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install
+        run: |
+            sudo apt-add-repository ppa:ubuntu-toolchain-r/test
+            sudo apt-get update
+            sudo apt-get install libboost-test-dev
+            sudo apt-get install language-pack-fr # test serializer w/ locale
+            sudo apt-get install clang-${{ matrix.compiler }}
+      - name: Configure
+        run: |
+            mkdir build && cd build
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_C_COMPILER=clang-${{ matrix.compiler }} -DCMAKE_CXX_COMPILER=clang++-${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+      - name: Build
+        run: |
+            cd build && cmake --build .
+      - name: Test
+        run: |
+            cd build && ctest --output-on-failure
+
+#  build-osx-13-arm64:
+#    runs-on: macos-13-arm64
+#    strategy:
+#      matrix:
+#        standard: ['11', '14', '17', '20']
+#        unreleased: ['ON', 'OFF']
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#        with:
+#          submodules: true
+#      - name: Install
+#        run: |
+#            brew install boost
+#      - name: Configure
+#        run: |
+#            mkdir build && cd build
+#            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+#      - name: Build
+#        run: |
+#            cd build && cmake --build .
+#      - name: Test
+#        run: |
+#            cd build && ctest --output-on-failure
+
+  build-osx-13:
+    runs-on: macos-13
+    strategy:
+      matrix:
+        standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install
+        run: |
+            brew install boost
+      - name: Configure
+        run: |
+            mkdir build && cd build
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+      - name: Build
+        run: |
+            cd build && cmake --build .
+      - name: Test
+        run: |
+            cd build && ctest --output-on-failure
+
+  build-osx-12:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install
+        run: |
+            brew install boost
+      - name: Configure
+        run: |
+            mkdir build && cd build
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+      - name: Build
+        run: |
+            cd build && cmake --build .
+      - name: Test
+        run: |
+            cd build && ctest --output-on-failure
+
+
+  build-osx-11:
+    runs-on: macos-11
+    strategy:
+      matrix:
+        standard: ['11', '14', '17', '20']
+        unreleased: ['ON', 'OFF']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install
+        run: |
+            brew install boost
+      - name: Configure
+        run: |
+            mkdir build && cd build
+            cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
+      - name: Build
+        run: |
+            cd build && cmake --build .
+      - name: Test
+        run: |
+            cd build && ctest --output-on-failure
+
   build-windows-msvc:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         standard: ['11', '14', '17', '20']
         config: ['Release', 'Debug']
+        unreleased: ['ON', 'OFF']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Install
+        run: |
+            (New-Object System.Net.WebClient).DownloadFile("https://github.com/actions/boost-versions/releases/download/1.72.0-20200608.4/boost-1.72.0-win32-msvc14.2-x86_64.tar.gz", "$env:TEMP\\boost.tar.gz")
+            7z.exe x "$env:TEMP\\boost.tar.gz" -o"$env:TEMP\\boostArchive" -y | Out-Null
+            7z.exe x "$env:TEMP\\boostArchive" -o"$env:TEMP\\boost" -y | Out-Null
+            Push-Location -Path "$env:TEMP\\boost"
+            Invoke-Expression .\\setup.ps1
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Configure
         shell: cmd
@@ -101,7 +265,7 @@ jobs:
             file --mime-encoding tests/test_literals.cpp
             mkdir build
             cd build
-            cmake ../ -G "NMake Makefiles" -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DBoost_ADDITIONAL_VERSIONS=1.72.0 -DBoost_USE_MULTITHREADED=ON -DBoost_ARCHITECTURE=-x64 -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=%BOOST_ROOT_1_72_0%
+            cmake ../ -G "NMake Makefiles" -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT="C:\\hostedtoolcache\\windows\\Boost\\1.72.0\\x86_64" -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }}
       - name: Build
         working-directory: ./build
         run: |
@@ -109,7 +273,6 @@ jobs:
       - name: Test
         working-directory: ./build
         run: |
-            ./tests/test_literals --log_level=all
             file --mime-encoding tests/toml/tests/example.toml
             file --mime-encoding tests/toml/tests/fruit.toml
             file --mime-encoding tests/toml/tests/hard_example.toml

.travis.yml

@@ -1,337 +0,0 @@
-dist: trusty
-
-matrix:
-  include:
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-4.8" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-4.8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-4.9" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-4.9
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-5" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-5
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-6" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-6
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-7" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-7
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-8" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-8" CXX_STANDARD=11 TOML_HEAD=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-8" CXX_STANDARD=14
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-8" CXX_STANDARD=17 REQUIRE_FILESYSTEM_LIBRARY=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: gcc
-    env: COMPILER="g++-8" CXX_STANDARD=17 TOML_HEAD=ON REQUIRE_FILESYSTEM_LIBRARY=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        packages:
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-3.9" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-3.9
-        packages:
-        - g++-8
-        - clang-3.9
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-4.0" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-4.0
-        packages:
-        - g++-8
-        - clang-4.0
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-5.0" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-5.0
-        packages:
-        - g++-8
-        - clang-5.0
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-6.0" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-6.0
-        packages:
-        - g++-8
-        - clang-6.0
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-7" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-7
-        packages:
-        - g++-8
-        - clang-7
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=11
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - g++-8
-        - clang-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=11 TOML_HEAD=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - g++-8
-        - clang-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=14
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - clang-8
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=17 REQUIRE_FILESYSTEM_LIBRARY=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - clang-8
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=17 TOML_HEAD=ON REQUIRE_FILESYSTEM_LIBRARY=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - clang-8
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=11 WITH_ASAN=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - clang-8
-        - g++-8
-        - boost1.70
-  - os: linux
-    language: cpp
-    compiler: clang
-    env: COMPILER="clang++-8" CXX_STANDARD=11 WITH_UBSAN=ON
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        - sourceline: 'ppa:mhier/libboost-latest'
-        - llvm-toolchain-trusty-8
-        packages:
-        - clang-8
-        - g++-8
-        - boost1.70
-  - os: osx
-    language: cpp
-    compiler: clang
-
-script:
-- |
-  if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-    mkdir -p cmake
-    travis_retry wget "https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.tar.gz"
-    tar xf cmake-3.14.5-Linux-x86_64.tar.gz -C cmake --strip-components=1
-    export PATH=${TRAVIS_BUILD_DIR}/cmake/bin:${PATH}
-  fi
-- |
-  if [[ "${CXX_STANDARD}" == "" ]]; then
-      export CXX_STANDARD="11"
-  fi
-- |
-  if [[ "${TOML_HEAD}" != "ON" ]]; then
-    export TOML_HEAD="OFF"
-  fi
-- echo "TOML_HEAD = ${TOML_HEAD}"
-- |
-  if [[ "${WITH_ASAN}" != "ON" ]]; then
-    export WITH_ASAN="OFF"
-  fi
-- echo "WITH_ASAN = ${WITH_ASAN}"
-- |
-  if [[ "${WITH_UBSAN}" != "ON" ]]; then
-    export WITH_UBSAN="OFF"
-  fi
-- echo "WITH_UBSAN = ${WITH_UBSAN}"
-- echo "REQUIRE_FILESYSTEM_LIBRARY = ${REQUIRE_FILESYSTEM_LIBRARY}"
-- |
-  if [[ "${REQUIRE_FILESYSTEM_LIBRARY}" != "ON" ]]; then
-    export REQUIRE_FILESYSTEM_LIBRARY="OFF"
-  fi
-- echo "REQUIRE_FILESYSTEM_LIBRARY = ${REQUIRE_FILESYSTEM_LIBRARY}"
-- cmake --version
-- mkdir build
-- cd build
-- echo "COMPILER     = ${COMPILER}"
-- echo "CXX_STANDARD = ${CXX_STANDARD}"
-- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DTOML11_REQUIRE_FILESYSTEM_LIBRARY=${REQUIRE_FILESYSTEM_LIBRARY} -Dtoml11_BUILD_TEST=ON -DTOML11_USE_UNRELEASED_TOML_FEATURES=${TOML_HEAD} -Dtoml11_TEST_WITH_ASAN=${WITH_ASAN} -Dtoml11_TEST_WITH_UBSAN=${WITH_UBSAN} ..
-- make
-- ctest --output-on-failure

CMakeLists.txt

@@ -1,17 +1,25 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 enable_testing()
 
-project(toml11 VERSION 3.5.0)
+project(toml11 VERSION 3.8.0)
 
 option(toml11_BUILD_TEST "Build toml tests" OFF)
+option(toml11_INSTALL "Install CMake targets during install step." ON)
 option(toml11_TEST_WITH_ASAN  "use LLVM address sanitizer" OFF)
 option(toml11_TEST_WITH_UBSAN "use LLVM undefined behavior sanitizer" OFF)
 
+option(TOML11_USE_UNRELEASED_TOML_FEATURES
+    "use features in toml-lang/toml master while testing" OFF)
+
 include(CheckCXXCompilerFlag)
 if("${CMAKE_VERSION}" VERSION_GREATER 3.1)
-    set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard whose features are requested to build all targets.")
-    set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "Boolean describing whether the value of CXX_STANDARD is a requirement.")
     set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Boolean specifying whether compiler specific extensions are requested.")
+    if(NOT DEFINED CMAKE_CXX_STANDARD)
+        message(FATAL_ERROR "CMAKE_CXX_STANDARD is not defined. \
+The C++ standard whose features are requested to *build* all targets. \
+Remember that toml11 is a header only library that does NOT require compilation to use.")
+    endif()
+    set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "Boolean describing whether the value of CXX_STANDARD is a requirement.")
 else()
     # Manually check for C++11 compiler flag.
     CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
@@ -38,8 +46,16 @@ else()
 endif()
 
 if(MSVC)
-    add_definitions("/Zc:__cplusplus") # define __cplusplus value correctly
-    add_definitions("/utf-8")          # enable to use u8"" literal
+#     add_definitions("/Zc:__cplusplus")  # define __cplusplus value correctly
+    add_definitions("/utf-8")           # enable to use u8"" literal
+    if(MSVC_VERSION LESS 1910)
+        message(STATUS "MSVC < 1910. DEFINE_CONVERSION_NON_INTRUSIVE is disabled")
+        add_definitions(-DTOML11_WITHOUT_DEFINE_NON_INTRUSIVE)
+    elseif(MSVC_VERSION LESS 1920)
+        add_definitions("/experimental:preprocessor") # MSVC 2017
+    else()
+        add_definitions("/Zc:preprocessor") # MSVC 2019
+    endif()
 endif()
 
 # Set some common directories
@@ -65,38 +81,40 @@ write_basic_package_version_file(
     COMPATIBILITY SameMajorVersion
 )
 
-configure_package_config_file(
-    cmake/toml11Config.cmake.in
-    ${toml11_config}
-    INSTALL_DESTINATION ${toml11_install_cmake_dir}
-    PATH_VARS toml11_install_cmake_dir
-)
+if (toml11_INSTALL)
+    configure_package_config_file(
+        cmake/toml11Config.cmake.in
+        ${toml11_config}
+        INSTALL_DESTINATION ${toml11_install_cmake_dir}
+        PATH_VARS toml11_install_cmake_dir
+    )
 
-# Install config files
-install(FILES ${toml11_config} ${toml11_config_version}
-    DESTINATION ${toml11_install_cmake_dir}
-)
+    # Install config files
+    install(FILES ${toml11_config} ${toml11_config_version}
+        DESTINATION ${toml11_install_cmake_dir}
+    )
 
-# Install header files
-install(
-    FILES toml.hpp
-    DESTINATION "${toml11_install_include_dir}"
-)
-install(
-    DIRECTORY "toml"
-    DESTINATION "${toml11_install_include_dir}"
-    FILES_MATCHING PATTERN "*.hpp"
-)
+    # Install header files
+    install(
+        FILES toml.hpp
+        DESTINATION "${toml11_install_include_dir}"
+    )
+    install(
+        DIRECTORY "toml"
+        DESTINATION "${toml11_install_include_dir}"
+        FILES_MATCHING PATTERN "*.hpp"
+    )
 
-# Export targets and install them
-install(TARGETS toml11
-    EXPORT toml11Targets
-)
-install(EXPORT toml11Targets
-    FILE toml11Targets.cmake
-    DESTINATION ${toml11_install_cmake_dir}
-    NAMESPACE toml11::
-)
+    # Export targets and install them
+    install(TARGETS toml11
+        EXPORT toml11Targets
+    )
+    install(EXPORT toml11Targets
+        FILE toml11Targets.cmake
+        DESTINATION ${toml11_install_cmake_dir}
+        NAMESPACE toml11::
+    )
+endif()
 
 if (toml11_BUILD_TEST)
     add_subdirectory(tests)

README.md

@@ -2,7 +2,6 @@ toml11
 ======
 
 [![Build Status on GitHub Actions](https://github.com/ToruNiina/toml11/workflows/build/badge.svg)](https://github.com/ToruNiina/toml11/actions)
-[![Build Status on TravisCI](https://travis-ci.org/ToruNiina/toml11.svg?branch=master)](https://travis-ci.org/ToruNiina/toml11)
 [![Build status on Appveyor](https://ci.appveyor.com/api/projects/status/m2n08a926asvg5mg/branch/master?svg=true)](https://ci.appveyor.com/project/ToruNiina/toml11/branch/master)
 [![Build status on CircleCI](https://circleci.com/gh/ToruNiina/toml11/tree/master.svg?style=svg)](https://circleci.com/gh/ToruNiina/toml11/tree/master)
 [![Version](https://img.shields.io/github/release/ToruNiina/toml11.svg?style=flat)](https://github.com/ToruNiina/toml11/releases)
@@ -11,7 +10,7 @@ toml11
 
 toml11 is a C++11 (or later) header-only toml parser/encoder depending only on C++ standard library.
 
-- It is compatible to the latest version of [TOML v1.0.0-rc.2](https://toml.io/en/v1.0.0-rc.2).
+- It is compatible to the latest version of [TOML v1.0.0](https://toml.io/en/v1.0.0).
 - It is one of the most TOML standard compliant libraries, tested with [the language agnostic test suite for TOML parsers by BurntSushi](https://github.com/BurntSushi/toml-test).
 - It shows highly informative error messages. You can see the error messages about invalid files at [CircleCI](https://circleci.com/gh/ToruNiina/toml11).
 - It has configurable container. You can use any random-access containers and key-value maps as backend containers.
@@ -28,6 +27,10 @@ toml11 is a C++11 (or later) header-only toml parser/encoder depending only on C
 
 int main()
 {
+    // ```toml
+    // title = "an example toml file"
+    // nums  = [3, 1, 4, 1, 5]
+    // ```
     auto data = toml::parse("example.toml");
 
     // find a value with the specified type from a table
@@ -37,9 +40,9 @@ int main()
     std::vector<int> nums = toml::find<std::vector<int>>(data, "nums");
 
     // access with STL-like manner
-    if(not data.at("a").contains("b"))
+    if(!data.contains("foo"))
     {
-        data["a"]["b"] = "c";
+        data["foo"] = "bar";
     }
 
     // pass a fallback
@@ -112,6 +115,37 @@ it in your system by CMake.
 
 Note for MSVC: We recommend to set `/Zc:__cplusplus` to detect C++ version correctly.
 
+### Example installation
+
+For local installation build & use the provided install target
+
+```bash
+git clone https://github.com/ToruNiina/toml11.git
+mkdir -p toml11/build
+cd toml11/build
+cmake .. -DCMAKE_CXX_STANDARD=11
+sudo make install
+```
+
+In case you want to create a `.deb` you can use `checkinstall`.
+```bash
+sudo checkinstall
+[[ .. skipping for clarity ]]
+**********************************************************************
+
+ Done. The new package has been installed and saved to
+
+ /home/user/toml11/build/build_20230728-1_amd64.deb
+
+ You can remove it from your system anytime using:
+
+      dpkg -r build
+
+**********************************************************************
+```
+
+You should get a package that you can install with `dpkg -i <myfile>.deb` and remove with `dpkg -r <myfile>.deb`
+
 ## Decoding a toml file
 
 To parse a toml file, the only thing you have to do is
@@ -247,7 +281,7 @@ See also [underlying types](#underlying-types).
 **NOTE**: For some technical reason, automatic conversion between `integer` and
 `floating` is not supported. If you want to get a floating value even if a value
 has integer value, you need to convert it manually after obtaining a value,
-like the followings.
+like the following.
 
 ```cpp
 const auto vx = toml::find(data, "x");
@@ -474,11 +508,16 @@ elements.
 ```cpp
 const auto data = toml::parse("example.toml");
 std::cout << "keys in the top-level table are the following: \n";
-for(const auto& [k, v] : data.as_table())
+for(const auto& kv : data.as_table())
+{
+    std::cout << kv.first << '\n';
+}
+for(const auto& [k, v] : data.as_table()) // or in C++17
 {
     std::cout << k << '\n';
 }
 
+
 const auto& fruits = toml::find(data, "fruits");
 for(const auto& v : fruits.as_array())
 {
@@ -831,6 +870,19 @@ const auto data = toml::parse("example.toml");
 const auto num  = toml::find_or(data, "num", 42);
 ```
 
+It works recursively if you pass several keys for subtables.
+In that case, the last argument is considered to be the optional value.
+All other arguments between `toml::value` and the optional value are considered as keys.
+
+```cpp
+// [fruit.physical]
+// color = "red"
+auto data  = toml::parse("fruit.toml");
+auto color = toml::find_or(data, "fruit", "physical", "color", "red");
+//                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^
+//                               arguments                     optional value
+```
+
 Also, `toml::get_or` returns a default value if `toml::get<T>` failed.
 
 ```cpp
@@ -888,7 +940,7 @@ toml::visit([](const auto& val) -> void {
 ```
 
 The function object that would be passed to `toml::visit` must be able to
-recieve all the possible TOML types. Also, the result types should be the same
+receive all the possible TOML types. Also, the result types should be the same
 each other.
 
 ## Constructing a toml::value
@@ -954,13 +1006,28 @@ v.push_back(6);
 
 ## Preserving comments
 
-After toml11 v3, you can choose whether comments are preserved or not.
+toml11 v3 or later allows you yo choose whether comments are preserved or not via template parameter
 
 ```cpp
 const auto data1 = toml::parse<toml::discard_comments >("example.toml");
 const auto data2 = toml::parse<toml::preserve_comments>("example.toml");
 ```
 
+or macro definition.
+
+```cpp
+#define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
+#include <toml11/toml.hpp>
+```
+
+This feature is controlled by template parameter in `toml::basic_value<...>`.
+`toml::value` is an alias of `toml::basic_value<...>`.
+
+If template parameter is explicitly specified, the return value of `toml::parse`
+will be `toml::basic_value<toml::preserve_comments>`.
+If the macro is defined, the alias `toml::value` will be
+`toml::basic_value<toml::preserve_comments>`.
+
 Comments related to a value can be obtained by `toml::value::comments()`.
 The return value has the same interface as `std::vector<std::string>`.
 
@@ -1137,7 +1204,7 @@ add a comma after the first element (like `[1,]`).
 "[[table]]"_toml; // This is a table that has an array of tables inside.
 
 "[[1]]"_toml;     // This literal is ambiguous.
-                  // Currently, it becomes a table that has array of table "1".
+                  // Currently, it becomes an empty array of table named "1".
 "1 = [{}]"_toml;  // This is a table that has an array of table named 1.
 "[[1,]]"_toml;    // This is an array of arrays.
 "[[1],]"_toml;    // ditto.
@@ -1251,8 +1318,16 @@ struct from<ext::foo>
 In this way, since the conversion function is defined outside of the class,
 you can add conversion between `toml::value` and classes defined in another library.
 
-Note that you cannot implement both of the functions because the overload
-resolution of `toml::get` will be ambiguous.
+In some cases, a class has a templatized constructor that takes a template, `T`.
+It confuses `toml::get/find<T>` because it makes the class "constructible" from
+`toml::value`. To avoid this problem, `toml::from` and `from_toml` always
+precede constructor. It makes easier to implement conversion between
+`toml::value` and types defined in other libraries because it skips constructor.
+
+But, importantly, you cannot define `toml::from<T>` and `T.from_toml` at the same
+time because it causes ambiguity in the overload resolution of `toml::get<T>` and `toml::find<T>`.
+
+So the precedence is `toml::from<T>` == `T.from_toml()` > `T(toml::value)`.
 
 If you want to convert any versions of `toml::basic_value`,
 you need to templatize the conversion function as follows.
@@ -1303,9 +1378,9 @@ struct foo
     double      b;
     std::string c;
 
-    toml::table into_toml() const // you need to mark it const.
+    toml::value into_toml() const // you need to mark it const.
     {
-        return toml::table{{"a", this->a}, {"b", this->b}, {"c", this->c}};
+        return toml::value{{"a", this->a}, {"b", this->b}, {"c", this->c}};
     }
 };
 } // ext
@@ -1332,9 +1407,9 @@ namespace toml
 template<>
 struct into<ext::foo>
 {
-    static toml::table into_toml(const ext::foo& f)
+    static toml::value into_toml(const ext::foo& f)
     {
-        return toml::table{{"a", f.a}, {"b", f.b}, {"c", f.c}};
+        return toml::value{{"a", f.a}, {"b", f.b}, {"c", f.c}};
     }
 };
 } // toml
@@ -1346,6 +1421,55 @@ toml::value v(f);
 Any type that can be converted to `toml::value`, e.g. `int`, `toml::table` and
 `toml::array` are okay to return from `into_toml`.
 
+You can also return a custom `toml::basic_value` from `toml::into`.
+
+```cpp
+namespace toml
+{
+template<>
+struct into<ext::foo>
+{
+    static toml::basic_value<toml::preserve_comments> into_toml(const ext::foo& f)
+    {
+        toml::basic_value<toml::preserve_comments> v{{"a", f.a}, {"b", f.b}, {"c", f.c}};
+        v.comments().push_back(" comment");
+        return v;
+    }
+};
+} // toml
+```
+
+But note that, if this `basic_value` would be assigned into other `toml::value`
+that discards `comments`, the comments would be dropped.
+
+### Macro to automatically define conversion functions
+
+There is a helper macro that automatically generates conversion functions `from` and `into` for a simple struct.
+
+```cpp
+namespace foo
+{
+struct Foo
+{
+    std::string s;
+    double      d;
+    int         i;
+};
+} // foo
+
+TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(foo::Foo, s, d, i)
+
+int main()
+{
+    const auto file = toml::parse("example.toml");
+    auto f = toml::find<foo::Foo>(file, "foo");
+}
+```
+
+And then you can use `toml::find<foo::Foo>(file, "foo");`
+
+**Note** that, because of a slight difference in implementation of preprocessor between gcc/clang and MSVC, [you need to define `/Zc:preprocessor`](https://github.com/ToruNiina/toml11/issues/139#issuecomment-803683682) to use it in MSVC (Thank you @glebm !).
+
 ## Formatting user-defined error messages
 
 When you encounter an error after you read the toml value, you may want to
@@ -1529,7 +1653,7 @@ it uses [ANSI escape code](https://en.wikipedia.org/wiki/ANSI_escape_code).
 Without `TOML11_COLORIZE_ERROR_MESSAGE`, you can still colorize user-defined
 error message by passing `true` to the `toml::format_error` function.
 If you define `TOML11_COLORIZE_ERROR_MESSAGE`, the value is `true` by default.
-If not, the defalut value would be `false`.
+If not, the default value would be `false`.
 
 ```cpp
 std::cerr << toml::format_error("[error] value should be positive",
@@ -1537,10 +1661,62 @@ std::cerr << toml::format_error("[error] value should be positive",
                                 hints, /*colorize = */ true) << std::endl;
 ```
 
-Note: It colorize `[error]` in red. That means that it detects `[error]` prefix
+Note: It colorizes `[error]` in red. That means that it detects `[error]` prefix
 at the front of the error message. If there is no `[error]` prefix,
 `format_error` adds it to the error message.
 
+Compared to the `TOML11_COLORIZE_ERROR_MESSAGE` macro that enables colorization
+statically, toml11 provides `toml::color::enable` & `toml::color::disable`
+functions to dynamically change the color mode. This feature overwrites
+`TOML11_COLORIZE_ERROR_MESSAGE` and the `colorize` argument of
+`toml::format_error` when you call `enable`.
+
+Note: If either `TOML11_COLORIZE_ERROR_MESSAGE` is defined or the `colorize`
+argument is used, it takes precedence, meaning that `disable` won't work.
+Accordingly, we highly recommend using only one of them.
+
+```cpp
+toml::color::enable();  // enable colorization
+toml::color::disable(); // disable colorization
+```
+
+If you use user-defined error message, you can manage the setting as follows:
+
+```cpp
+toml::color::enable();
+std::cerr << toml::format_error("[error] value should be positive",
+                                data.at("num"), "positive number required",
+                                hints) << std::endl; // colorized
+
+toml::color::disable();
+std::cerr << toml::format_error("[error] value should be positive",
+                                data.at("num"), "positive number required",
+                                hints) << std::endl; // NOT colorized
+```
+
+Or you may use toml11 in your application like:
+
+```cpp
+std::vector<std::string> args(argv + 1, argv + argc);
+auto result = std::find(args.begin(), args.end(), "--color");
+if (result != args.end()) {
+    toml::color::enable();
+} else {
+    toml::color::disable();
+}
+
+// use toml11 ...
+```
+
+## Opting out of the default `[error]` prefix
+
+toml11 prints error messages with the `[error]` prefix by default.
+Defining `TOML11_NO_ERROR_PREFIX` will let toml11 omit the prefix regardless of colorized or not in case you would use a custom prefix, such as `Error:`.
+
+```cpp
+#define TOML11_NO_ERROR_PREFIX
+```
+
 ## Serializing TOML data
 
 toml11 enables you to serialize data into toml format.
@@ -1630,7 +1806,7 @@ const std::string fmt = toml::format(v);
 ```
 
 To control the width and precision, `toml::format` receives optional second and
-third arguments to set them. By default, the witdh is 80 and the precision is
+third arguments to set them. By default, the width is 80 and the precision is
 `std::numeric_limits<double>::max_digit10`.
 
 ```cpp
@@ -1666,7 +1842,7 @@ flag that represents a kind of a string, `string_t::basic` and `string_t::litera
 Although `std::string` is not an exact toml type, still you can get a reference
 that points to internal `std::string` by using `toml::get<std::string>()` for convenience.
 The most important difference between `std::string` and `toml::string` is that
-`toml::string` will be formatted as a TOML string when outputed with `ostream`.
+`toml::string` will be formatted as a TOML string when outputted with `ostream`.
 This feature is introduced to make it easy to write a custom serializer.
 
 `Datetime` variants are `struct` that are defined in this library.
@@ -1675,16 +1851,13 @@ not capable of representing a Local Time independent from a specific day.
 
 ## Unreleased TOML features
 
-Since TOML v1.0.0-rc.1 has been released, those features are now activated by
-default. We no longer need to define `TOML11_USE_UNRELEASED_FEATURES`.
+After TOML v1.0.0 has been released, some features are added to the main branch
+of the TOML spec repository. (see: [CHANGELOG.md in toml-lang/toml repository](https://github.com/toml-lang/toml/blob/main/CHANGELOG.md)).
 
-- Leading zeroes in exponent parts of floats are permitted.
-  - e.g. `1.0e+01`, `5e+05`
-  - [toml-lang/toml/PR/656](https://github.com/toml-lang/toml/pull/656)
-- Allow raw tab characters in basic strings and multi-line basic strings.
-  - [toml-lang/toml/PR/627](https://github.com/toml-lang/toml/pull/627)
-- Allow heterogeneous arrays
-  - [toml-lang/toml/PR/676](https://github.com/toml-lang/toml/pull/676)
+The following list shows available "unreleased" features that can be activated
+by defining a macro named `TOML11_USE_UNRELEASED_FEATURES`.
+
+- Add new `\e` shorthand for the escape character.
 
 ## Note about heterogeneous arrays
 
@@ -1817,12 +1990,13 @@ I appreciate the help of the contributors who introduced the great feature to th
   - Intel Compiler support
 - Quentin Khan (@xaxousis)
   - Found & Fixed a bug around ODR
-  - Improved error messages for invaild keys to show the location where the parser fails
+  - Improved error messages for invalid keys to show the location where the parser fails
 - Petr Beneš (@wbenny)
   - Fixed warnings on MSVC
 - Ivan Shynkarenka (@chronoxor)
   - Fixed Visual Studio 2019 warnings
-- @khoitd1997
+  - Fix compilation error in `<filesystem>` with MinGW
+- Khoi Dinh Trinh (@khoitd1997)
   - Fixed warnings while type conversion
 - @KerstinKeller
   - Added installation script to CMake
@@ -1833,6 +2007,7 @@ I appreciate the help of the contributors who introduced the great feature to th
   - Suppress warnings in Debug mode
 - OGAWA Kenichi (@kenichiice)
   - Suppress warnings on intel compiler
+  - Fix include path in README
 - Jordan Williams (@jwillikers)
   - Fixed clang range-loop-analysis warnings
   - Fixed feature test macro to suppress -Wundef
@@ -1844,16 +2019,64 @@ I appreciate the help of the contributors who introduced the great feature to th
   - fix "Finding a value in an array" example in README
 - @maass-tv and @SeverinLeonhardt
   - Fix MSVC warning C4866
-- OGAWA KenIchi (@kenichiice)
-  - Fix include path in README
 - Mohammed Alyousef (@MoAlyousef)
   - Made testing optional in CMake
-
+- Alex Merry (@amerry)
+  - Add missing include files
+- sneakypete81 (@sneakypete81)
+  - Fix typo in error message
+- Oliver Kahrmann (@founderio)
+  - Fix missing filename in error message if parsed file is empty
+- Karl Nilsson (@karl-nilsson)
+  - Fix many spelling errors
+- ohdarling88 (@ohdarling)
+  - Fix a bug in a constructor of serializer
+- estshorter (@estshorter)
+  - Fix MSVC warning C26478
+- Philip Top (@phlptp)
+  - Improve checking standard library feature availability check
+- Louis Marascio (@marascio)
+  - Fix free-nonheap-object warning
+- Axel Huebl (@ax3l)
+  - Make installation optional if the library is embedded
+- Ken Matsui (@ken-matsui)
+  - Support user-defined error message prefix
+  - Support dynamic color mode
+- Giel van Schijndel (@muggenhor)
+  - Remove needless copy in `parse` function
+- Lukáš Hrázký (@lukash)
+  - Add a `parse(FILE *)` interface and improve file-related error messages
+- spiderman idog (@spiderman-idog)
+  - Fix typo in README
+- Jajauma's GitHub (@Jajauma)
+  - Avoid possible lexer truncation warnings
+- Moritz Klammler (@ctcmkl)
+  - Many patches in (#200) including:
+  - Improve CMake scripts, build process, and test file handling
+  - Detect error when `discard_comments` is accessed
+  - And more.
+- Chris White (@cxw42)
+  - Fix address-sanitizer error when parsing literal strings having invalid UTF-8 characters
+  - Fix function name in error messages
+- offa (@offa)
+  - Update checkout action to v3
+  - Update Required CMake version
+  - Cleanup old CI settings
+- Sergey Vidyuk (@VestniK)
+  - Fix for case when vector iterator is raw pointer
+- Kfir Gollan (@kfirgollan)
+  - Add installation example with checkinstall and cmake
+- Martin Tournoij (@arp242)
+  - Escape control characters in keys
+- @DavidKorczynski
+  - Add fuzzing test based on ClusterFuzzLite
+- Esonhugh Skyworship (@Esonhugh)
+  - Fix function signature of `strerror_r` on macos
 
 ## Licensing terms
 
 This product is licensed under the terms of the [MIT License](LICENSE).
 
-- Copyright (c) 2017-2020 Toru Niina
+- Copyright (c) 2017-2024 Toru Niina
 
 All rights reserved.

appveyor.yml

@@ -17,7 +17,7 @@ build_script:
   - cd C:\toml11
   - mkdir build
   - cd build
-  - cmake -G"%generator%" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -Dtoml11_BUILD_TEST=ON ..
+  - cmake -G"%generator%" -DCMAKE_CXX_STANDARD=11 -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -Dtoml11_BUILD_TEST=ON ..
   - cmake --build . --config "%configuration%"
   - file --mime-encoding tests/toml/tests/hard_example_unicode.toml
 

tests/CMakeLists.txt

@@ -1,11 +1,20 @@
 include(ExternalProject)
-ExternalProject_Add(toml
-        SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/toml
-        GIT_REPOSITORY https://github.com/toml-lang/toml
-        GIT_TAG v0.5.0
+
+set(TOML11_LANGSPEC_GIT_REPOSITORY "https://github.com/toml-lang/toml" CACHE STRING
+    "URL of the TOML language specification repository")
+
+set(TOML11_LANGSPEC_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/toml" CACHE FILEPATH
+    "directory for the TOML language specification tree")
+
+if(NOT EXISTS "${TOML11_LANGSPEC_SOURCE_DIR}/toml.abnf")
+    ExternalProject_Add(toml
+        SOURCE_DIR "${TOML11_LANGSPEC_SOURCE_DIR}"
+        GIT_REPOSITORY "${TOML11_LANGSPEC_GIT_REPOSITORY}"
+        GIT_TAG "v0.5.0"
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         INSTALL_COMMAND "")
+endif()
 
 set(TEST_NAMES
     test_datetime
@@ -36,6 +45,7 @@ set(TEST_NAMES
     test_get_or
     test_find
     test_find_or
+    test_find_or_recursive
     test_expect
     test_parse_file
     test_serialize_file
@@ -59,6 +69,83 @@ CHECK_CXX_COMPILER_FLAG("-Wuseless-cast"        COMPILER_SUPPORTS_WUSELESS_CAST)
 CHECK_CXX_COMPILER_FLAG("-Wdouble-promotion"    COMPILER_SUPPORTS_WDOUBLE_PROMOTION)
 CHECK_CXX_COMPILER_FLAG("-Wrange-loop-analysis" COMPILER_SUPPORTS_WRANGE_LOOP_ANALYSIS)
 CHECK_CXX_COMPILER_FLAG("-Wundef"               COMPILER_SUPPORTS_WUNDEF)
+CHECK_CXX_COMPILER_FLAG("-Wshadow"              COMPILER_SUPPORTS_WSHADOW)
+
+include(CheckCXXSourceCompiles)
+
+# check which standard library implementation is used. If libstdc++ is used,
+# it will fail to compile. It compiles if libc++ is used.
+check_cxx_source_compiles("
+#include <cstddef>
+#ifdef __GLIBCXX__
+    static_assert(false);
+#endif
+int main() {
+    return 0;
+}" TOML11_WITH_LIBCXX_LIBRARY)
+
+# LLVM 8 requires -lc++fs if compiled with libc++ to use <filesystem>.
+# LLVM 9+ does not require any special library.
+# GCC 8 requires -lstdc++fs. GCC 9+ does not require it.
+#
+# Yes, we can check the version of the compiler used in the current build
+# directly in CMake. But, in most cases, clang build uses libstdc++ as the
+# standard library implementation and it makes the condition complicated.
+# In many environment, the default installed C++ compiler is GCC and libstdc++
+# is installed along with it. In most build on such an environment, even if we
+# chose clang as the C++ compiler, still libstdc++ is used. Checking default
+# gcc version makes the condition complicated.
+# The purpose of this file is to compile tests. We know the environment on which
+# the tests run. We can set this option and, I think, it is easier and better.
+option(TOML11_REQUIRE_FILESYSTEM_LIBRARY "need to link -lstdc++fs or -lc++fs" OFF)
+
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
+
+set(PREVIOUSLY_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
+set(PREVIOUSLY_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
+
+list(APPEND CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIRS})
+list(APPEND CMAKE_REQUIRED_LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+
+check_cxx_source_compiles("
+#define BOOST_TEST_MODULE \"dummy\"
+#undef BOOST_TEST_DYN_LINK
+#define BOOST_TEST_NO_LIB
+#include <boost/test/included/unit_test.hpp>
+BOOST_AUTO_TEST_CASE(proforma) { BOOST_TEST(true); }
+" TOML11_WITH_BOOST_TEST_HEADER)
+
+check_cxx_source_compiles("
+#define BOOST_TEST_MODULE \"dummy\"
+#undef BOOST_TEST_DYN_LINK
+#undef BOOST_TEST_NO_LIB
+#include <boost/test/unit_test.hpp>
+BOOST_AUTO_TEST_CASE(proforma) { BOOST_TEST(true); }
+" TOML11_WITH_BOOST_TEST_STATIC)
+
+check_cxx_source_compiles("
+#define BOOST_TEST_MODULE \"dummy\"
+#define BOOST_TEST_DYN_LINK
+#undef BOOST_TEST_NO_LIB
+#include <boost/test/unit_test.hpp>
+BOOST_AUTO_TEST_CASE(proforma) { BOOST_TEST(true); }
+" TOML11_WITH_BOOST_TEST_DYNAMIC)
+
+set(CMAKE_REQUIRED_INCLUDES "${PREVIOUSLY_REQUIRED_INCLUDES}")
+set(CMAKE_REQUIRED_LIBRARIES "${PREVIOUSLY_REQUIRED_LIBRARIES}")
+
+unset(PREVIOUSLY_REQUIRED_INCLUDES)
+unset(PREVIOUSLY_REQUIRED_LIBRARIES)
+
+if(TOML11_WITH_BOOST_TEST_DYNAMIC)
+    add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST -DBOOST_TEST_DYN_LINK)
+elseif(TOML11_WITH_BOOST_TEST_STATIC)
+    add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST)
+elseif(TOML11_WITH_BOOST_TEST_HEADER)
+    add_definitions(-DBOOST_TEST_NO_LIB)
+else()
+    message(FATAL_ERROR "Neither the Boost.Test static or shared library nor the header-only version seem to be usable.")
+endif()
 
 if(COMPILER_SUPPORTS_WALL)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
@@ -72,6 +159,9 @@ endif()
 if(COMPILER_SUPPORTS_WERROR)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 endif()
+if(COMPILER_SUPPORTS_WSHADOW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
+endif()
 if(COMPILER_SUPPORTS_WSIGN_CONVERSION)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
 endif()
@@ -100,9 +190,6 @@ if(COMPILER_SUPPORTS_WUNDEF)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wundef")
 endif()
 
-option(TOML11_USE_UNRELEASED_TOML_FEATURES
-    "use features in toml-lang/toml master while testing" OFF)
-
 if(TOML11_USE_UNRELEASED_TOML_FEATURES)
     message(STATUS "adding TOML11_USE_UNRELEASED_TOML_FEATURES flag")
     add_definitions("-DTOML11_USE_UNRELEASED_TOML_FEATURES")
@@ -144,42 +231,24 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4820")
     # pragma warning(pop): likely mismatch, popping warning state pushed in different file
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd5031")
+	# pragma warning(pop): spectre warnings in tests
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd5045")
+	# pragma warning(pop): spectre warnings in tests
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4265")
 endif()
 
-find_package(Boost COMPONENTS unit_test_framework REQUIRED)
-add_definitions(-DBOOST_TEST_DYN_LINK)
-add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST)
-
-# check which standard library implementation is used. If libstdc++ is used,
-# it will fail to compile. It compiles if libc++ is used.
-include(CheckCXXSourceCompiles)
-check_cxx_source_compiles("
-#include <cstddef>
-#ifdef __GLIBCXX__
-    static_assert(false);
-#endif
-int main() {
-    return 0;
-}" TOML11_WITH_LIBCXX_LIBRARY)
-
-# LLVM 8 requires -lc++fs if compiled with libc++ to use <filesystem>.
-# LLVM 9+ does not require any special library.
-# GCC 8 requires -lstdc++fs. GCC 9+ does not require it.
-#
-# Yes, we can check the version of the compiler used in the current build
-# directly in CMake. But, in most cases, clang build uses libstdc++ as the
-# standard library implementation and it makes the condition complicated.
-# In many environment, the default installed C++ compiler is GCC and libstdc++
-# is installed along with it. In most build on such an environment, even if we
-# chose clang as the C++ compiler, still libstdc++ is used. Checking default
-# gcc version makes the condition complicated.
-# The purpose of this file is to compile tests. We know the environment on which
-# the tests run. We can set this option and, I think, it is easier and better.
-option(TOML11_REQUIRE_FILESYSTEM_LIBRARY "need to link -lstdc++fs or -lc++fs" OFF)
+set(TEST_ENVIRON "TOMLDIR=${TOML11_LANGSPEC_SOURCE_DIR}")
+if(WIN32)
+    # Set the PATH to be able to find Boost DLL
+    STRING(REPLACE ";" "\\;" PATH_STRING "$ENV{PATH}")
+    list(APPEND TEST_ENVIRON "PATH=${PATH_STRING}\;${Boost_LIBRARY_DIRS}")
+endif()
 
 foreach(TEST_NAME ${TEST_NAMES})
     add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
     target_link_libraries(${TEST_NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} toml11::toml11)
+    target_include_directories(${TEST_NAME} SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
+    target_compile_definitions(${TEST_NAME} PRIVATE "BOOST_TEST_MODULE=\"${TEST_NAME}\"")
 
     # to compile tests with <filesystem>...
     if(TOML11_REQUIRE_FILESYSTEM_LIBRARY)
@@ -205,14 +274,7 @@ foreach(TEST_NAME ${TEST_NAMES})
     endif()
 
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-    # Set the PATH to be able to find Boost DLL
-    if(WIN32)
-        STRING(REPLACE ";" "\\;" PATH_STRING "$ENV{PATH}")
-        set_tests_properties(${TEST_NAME}
-            PROPERTIES ENVIRONMENT "PATH=${PATH_STRING}\;${Boost_LIBRARY_DIRS}"
-        )
-    endif()
+    set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT "${TEST_ENVIRON}")
 endforeach(TEST_NAME)
 
 

tests/check.cpp

@@ -1,4 +1,5 @@
-#include "toml.hpp"
+#include <toml.hpp>
+
 #include <iostream>
 #include <iomanip>
 

tests/check_serialization.cpp

@@ -1,6 +1,7 @@
-#include "toml.hpp"
-#include <iostream>
+#include <toml.hpp>
+
 #include <iomanip>
+#include <iostream>
 
 int main(int argc, char **argv)
 {
@@ -22,15 +23,40 @@ int main(int argc, char **argv)
 
         if(data != serialized)
         {
-            std::cerr << "============================================================\n";
-            std::cerr << "result (w/o comment) different: " << filename << std::endl;
-            std::cerr << "------------------------------------------------------------\n";
-            std::cerr << "# serialized\n";
-            std::cerr << serialized;
-            std::cerr << "------------------------------------------------------------\n";
-            std::cerr << "# data\n";
-            std::cerr << data;
-            return 1;
+            // this is really a ditry hack, but is the easiest way...
+            // TODO: cleanup by adding comparison function to check if a value is NaN or not
+            if(filename.substr(filename.size() - 22, 22) == "float-inf-and-nan.toml" &&
+                std::isnan   (toml::find<double>(serialized, "nan"))           &&
+               !std::signbit (toml::find<double>(serialized, "nan"))           &&
+                std::isnan   (toml::find<double>(serialized, "nan_plus"))      &&
+               !std::signbit (toml::find<double>(serialized, "nan_plus"))      &&
+                std::isnan   (toml::find<double>(serialized, "nan_neg"))       &&
+                std::signbit (toml::find<double>(serialized, "nan_neg"))       &&
+               !std::isnan   (toml::find<double>(serialized, "infinity"))      &&
+               !std::isfinite(toml::find<double>(serialized, "infinity"))      &&
+               !std::signbit (toml::find<double>(serialized, "infinity"))      &&
+               !std::isnan   (toml::find<double>(serialized, "infinity_plus")) &&
+               !std::isfinite(toml::find<double>(serialized, "infinity_plus")) &&
+               !std::signbit (toml::find<double>(serialized, "infinity_plus")) &&
+               !std::isnan   (toml::find<double>(serialized, "infinity_neg"))  &&
+               !std::isfinite(toml::find<double>(serialized, "infinity_neg"))  &&
+                std::signbit (toml::find<double>(serialized, "infinity_neg")))
+            {
+                // then it is correctly serialized.
+                // Note that, the result of (nan == nan) is false. so `data == serialized` is false.
+            }
+            else
+            {
+                std::cerr << "============================================================\n";
+                std::cerr << "result (w/o comment) different: " << filename << std::endl;
+                std::cerr << "------------------------------------------------------------\n";
+                std::cerr << "# serialized\n";
+                std::cerr << serialized;
+                std::cerr << "------------------------------------------------------------\n";
+                std::cerr << "# data\n";
+                std::cerr << data;
+                return 1;
+            }
         }
     }
     {
@@ -42,15 +68,46 @@ int main(int argc, char **argv)
         const auto serialized = toml::parse<toml::preserve_comments>("tmp.toml");
         if(data != serialized)
         {
-            std::cerr << "============================================================\n";
-            std::cerr << "result (w/  comment) different: " << filename << std::endl;
-            std::cerr << "------------------------------------------------------------\n";
-            std::cerr << "# serialized\n";
-            std::cerr << serialized;
-            std::cerr << "------------------------------------------------------------\n";
-            std::cerr << "# data\n";
-            std::cerr << data;
-            return 1;
+            // this is really a ditry hack, but is the easiest way...
+            // TODO: cleanup by adding comparison function to check if a value is NaN or not
+            if(filename.substr(filename.size() - 22, 22) == "float-inf-and-nan.toml" &&
+                std::isnan   (toml::find<double>(serialized, "nan"))           &&
+               !std::signbit (toml::find<double>(serialized, "nan"))           &&
+                std::isnan   (toml::find<double>(serialized, "nan_plus"))      &&
+               !std::signbit (toml::find<double>(serialized, "nan_plus"))      &&
+                std::isnan   (toml::find<double>(serialized, "nan_neg"))       &&
+                std::signbit (toml::find<double>(serialized, "nan_neg"))       &&
+               !std::isnan   (toml::find<double>(serialized, "infinity"))      &&
+               !std::isfinite(toml::find<double>(serialized, "infinity"))      &&
+               !std::signbit (toml::find<double>(serialized, "infinity"))      &&
+               !std::isnan   (toml::find<double>(serialized, "infinity_plus")) &&
+               !std::isfinite(toml::find<double>(serialized, "infinity_plus")) &&
+               !std::signbit (toml::find<double>(serialized, "infinity_plus")) &&
+               !std::isnan   (toml::find<double>(serialized, "infinity_neg"))  &&
+               !std::isfinite(toml::find<double>(serialized, "infinity_neg"))  &&
+                std::signbit (toml::find<double>(serialized, "infinity_neg"))  &&
+                toml::find(data, "nan").comments()           == toml::find(serialized, "nan").comments()           &&
+                toml::find(data, "nan_plus").comments()      == toml::find(serialized, "nan_plus").comments()      &&
+                toml::find(data, "nan_neg").comments()       == toml::find(serialized, "nan_neg").comments()       &&
+                toml::find(data, "infinity").comments()      == toml::find(serialized, "infinity").comments()      &&
+                toml::find(data, "infinity_plus").comments() == toml::find(serialized, "infinity_plus").comments() &&
+                toml::find(data, "infinity_neg").comments()  == toml::find(serialized, "infinity_neg").comments()  )
+            {
+                // then it is correctly serialized.
+                // Note that, the result of (nan == nan) is false. so `data == serialized` is false.
+            }
+            else
+            {
+                std::cerr << "============================================================\n";
+                std::cerr << "result (w/  comment) different: " << filename << std::endl;
+                std::cerr << "------------------------------------------------------------\n";
+                std::cerr << "# serialized\n";
+                std::cerr << serialized;
+                std::cerr << "------------------------------------------------------------\n";
+                std::cerr << "# data\n";
+                std::cerr << data;
+                return 1;
+            }
         }
     }
     return 0;

tests/check_toml_test.cpp

@@ -1,6 +1,7 @@
-#include "toml.hpp"
-#include <iostream>
+#include <toml.hpp>
+
 #include <iomanip>
+#include <iostream>
 
 struct json_serializer
 {
@@ -16,6 +17,14 @@ struct json_serializer
     }
     void operator()(toml::floating v)
     {
+        if(std::isnan(v) && std::signbit(v))
+        {
+            // toml-test does not allow negative NaN represented in "-nan" because
+            // there are languages that does not distinguish nan and -nan.
+            // But toml11 keeps sign from input. To resolve this difference,
+            // we convert -nan to nan here.
+            v = std::numeric_limits<toml::floating>::quiet_NaN();
+        }
         std::cout << "{\"type\":\"float\",\"value\":\"" << toml::value(v) << "\"}";
         return ;
     }
@@ -24,23 +33,24 @@ struct json_serializer
         // since toml11 automatically convert string to multiline string that is
         // valid only in TOML, we need to format the string to make it valid in
         // JSON.
-        std::cout << "{\"type\":\"string\",\"value\":\""
-                  << this->escape_string(v.str) << "\"}";
+        toml::serializer<toml::value> ser(std::numeric_limits<std::size_t>::max());
+        std::cout << "{\"type\":\"string\",\"value\":"
+                  << ser(v.str) << "}";
         return ;
     }
     void operator()(const toml::local_time& v)
     {
-        std::cout << "{\"type\":\"local_time\",\"value\":\"" << toml::value(v) << "\"}";
+        std::cout << "{\"type\":\"time-local\",\"value\":\"" << toml::value(v) << "\"}";
         return ;
     }
     void operator()(const toml::local_date& v)
     {
-        std::cout << "{\"type\":\"local_date\",\"value\":\"" << toml::value(v) << "\"}";
+        std::cout << "{\"type\":\"date-local\",\"value\":\"" << toml::value(v) << "\"}";
         return ;
     }
     void operator()(const toml::local_datetime& v)
     {
-        std::cout << "{\"type\":\"local_datetime\",\"value\":\"" << toml::value(v) << "\"}";
+        std::cout << "{\"type\":\"datetime-local\",\"value\":\"" << toml::value(v) << "\"}";
         return ;
     }
     void operator()(const toml::offset_datetime& v)
@@ -64,7 +74,8 @@ struct json_serializer
         }
         else
         {
-            std::cout << "{\"type\":\"array\",\"value\":[";
+//             std::cout << "{\"type\":\"array\",\"value\":[";
+            std::cout << "[";
             bool is_first = true;
             for(const auto& elem : v)
             {
@@ -72,7 +83,7 @@ struct json_serializer
                 is_first = false;
                 toml::visit(*this, elem);
             }
-            std::cout << "]}";
+            std::cout << "]";
         }
         return ;
     }
@@ -84,38 +95,20 @@ struct json_serializer
         {
             if(!is_first) {std::cout << ", ";}
             is_first = false;
-            std::cout << this->format_key(elem.first) << ':';
+            const auto k = toml::format_key(elem.first);
+            if(k.at(0) == '"')
+            {
+                std::cout << k << ":";
+            }
+            else // bare key
+            {
+                std::cout << '\"' << k << "\":";
+            }
             toml::visit(*this, elem.second);
         }
         std::cout << '}';
         return ;
     }
-
-    std::string escape_string(const std::string& s) const
-    {
-        std::string retval;
-        for(const char c : s)
-        {
-            switch(c)
-            {
-                case '\\': {retval += "\\\\"; break;}
-                case '\"': {retval += "\\\""; break;}
-                case '\b': {retval += "\\b";  break;}
-                case '\t': {retval += "\\t";  break;}
-                case '\f': {retval += "\\f";  break;}
-                case '\n': {retval += "\\n";  break;}
-                case '\r': {retval += "\\r";  break;}
-                default  : {retval += c;      break;}
-            }
-        }
-        return retval;
-    }
-
-    std::string format_key(const std::string& s) const
-    {
-        const auto quote("\"");
-        return quote + escape_string(s) + quote;
-    }
 };
 
 int main()

tests/test_comments.cpp

@@ -1,13 +1,7 @@
-#define BOOST_TEST_MODULE "test_comments"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
-
 #include <toml.hpp>
 
+#include "unit_test.hpp"
+
 BOOST_AUTO_TEST_CASE(test_comment_before)
 {
     {
@@ -138,6 +132,43 @@ BOOST_AUTO_TEST_CASE(test_comment_both)
     }
 }
 
+BOOST_AUTO_TEST_CASE(test_comments_on_implicit_values)
+{
+    {
+        const std::string file = R"(
+            # comment for the first element of array-of-tables.
+            [[array-of-tables]]
+            foo = "bar"
+        )";
+        std::istringstream iss(file);
+        const auto v = toml::parse<toml::preserve_comments>(iss);
+
+        const auto aot = toml::find(v, "array-of-tables");
+        const auto elm = aot.at(0);
+        BOOST_TEST(aot.comments().empty());
+        BOOST_TEST(elm.comments().size() == 1);
+        BOOST_TEST(elm.comments().front() == " comment for the first element of array-of-tables.");
+    }
+    {
+        const std::string file = R"(
+            # comment for the array itself
+            array-of-tables = [
+                # comment for the first element of array-of-tables.
+                {foo = "bar"}
+            ]
+        )";
+        std::istringstream iss(file);
+        const auto v = toml::parse<toml::preserve_comments>(iss);
+
+        const auto aot = toml::find(v, "array-of-tables");
+        const auto elm = aot.at(0);
+        BOOST_TEST(aot.comments().size() == 1);
+        BOOST_TEST(aot.comments().front() == " comment for the array itself");
+        BOOST_TEST(elm.comments().size() == 1);
+        BOOST_TEST(elm.comments().front() == " comment for the first element of array-of-tables.");
+    }
+}
+
 BOOST_AUTO_TEST_CASE(test_discard_comment)
 {
     const std::string file = R"(
@@ -153,7 +184,7 @@ BOOST_AUTO_TEST_CASE(test_discard_comment)
     )";
 
     std::istringstream iss(file);
-    const auto v = toml::parse(iss);
+    const auto v = toml::parse<toml::discard_comments>(iss);
 
     const auto& a  = toml::find(v, "a");
     const auto& b  = toml::find(v, "b");
@@ -235,7 +266,7 @@ BOOST_AUTO_TEST_CASE(test_construct_value_with_comments)
         BOOST_TEST(v.is_string());
         BOOST_TEST(v.as_string() == "str");
     }
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
     {
         using namespace std::literals::string_view_literals;
         const value_type v("str"sv, {"comment1", "comment2"});

tests/test_datetime.cpp

@@ -1,12 +1,7 @@
-#define BOOST_TEST_MODULE "test_datetime"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/datetime.hpp>
 
+#include "unit_test.hpp"
+
 BOOST_AUTO_TEST_CASE(test_local_date)
 {
     const toml::local_date date(2018, toml::month_t::Jan, 1);

tests/test_error_detection.cpp

@@ -1,13 +1,9 @@
-#define BOOST_TEST_MODULE "test_error_detection"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <iostream>
+
+#include "unit_test.hpp"
+
 #include <fstream>
+#include <iostream>
 
 BOOST_AUTO_TEST_CASE(test_detect_empty_key)
 {

tests/test_expect.cpp

@@ -1,16 +1,12 @@
-#define BOOST_TEST_MODULE "test_expect"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
+#include <array>
+#include <deque>
+#include <list>
 #include <map>
 #include <unordered_map>
-#include <list>
-#include <deque>
-#include <array>
 
 BOOST_AUTO_TEST_CASE(test_expect)
 {

tests/test_extended_conversions.cpp

@@ -1,11 +1,7 @@
-#define BOOST_TEST_MODULE "test_extended_conversions"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
 #include <deque>
 #include <map>
 
@@ -70,9 +66,9 @@ struct from<extlib::foo>
 template<>
 struct into<extlib::foo>
 {
-    static toml::table into_toml(const extlib::foo& f)
+    static toml::value into_toml(const extlib::foo& f)
     {
-        return toml::table{{"a", f.a}, {"b", f.b}};
+        return toml::value{{"a", f.a}, {"b", f.b}};
     }
 };
 
@@ -545,3 +541,87 @@ BOOST_AUTO_TEST_CASE(test_recursive_conversion)
 
 }
 
+// ===========================================================================
+
+#ifndef TOML11_WITHOUT_DEFINE_NON_INTRUSIVE
+
+namespace extlib3
+{
+struct foo
+{
+    int a;
+    std::string b;
+};
+struct bar
+{
+    int         a;
+    std::string b;
+    foo         f;
+};
+
+} // extlib3
+
+TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(extlib3::foo, a, b)
+TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(extlib3::bar, a, b, f)
+
+BOOST_AUTO_TEST_CASE(test_conversion_via_macro)
+{
+    {
+        const toml::value v{{"a", 42}, {"b", "baz"}};
+
+        const auto foo = toml::get<extlib3::foo>(v);
+        BOOST_TEST(foo.a == 42);
+        BOOST_TEST(foo.b == "baz");
+
+        const toml::value v2(foo);
+        BOOST_TEST(v2 == v);
+    }
+    {
+        const toml::basic_value<toml::discard_comments, std::map, std::deque> v{
+            {"a", 42}, {"b", "baz"}
+        };
+
+        const auto foo = toml::get<extlib3::foo>(v);
+        BOOST_TEST(foo.a == 42);
+        BOOST_TEST(foo.b == "baz");
+
+        const toml::basic_value<toml::discard_comments, std::map, std::deque> v2(foo);
+        BOOST_TEST(v2 == v);
+    }
+
+    // -----------------------------------------------------------------------
+
+    {
+        const toml::value v{
+            {"a", 42},
+            {"b", "bar.b"},
+            {"f", toml::table{{"a", 42}, {"b", "foo.b"}}}
+        };
+
+        const auto bar = toml::get<extlib3::bar>(v);
+        BOOST_TEST(bar.a == 42);
+        BOOST_TEST(bar.b == "bar.b");
+        BOOST_TEST(bar.f.a == 42);
+        BOOST_TEST(bar.f.b == "foo.b");
+
+        const toml::value v2(bar);
+        BOOST_TEST(v2 == v);
+    }
+    {
+        const toml::basic_value<toml::discard_comments, std::map, std::deque> v{
+            {"a", 42},
+            {"b", "bar.b"},
+            {"f", toml::table{{"a", 42}, {"b", "foo.b"}}}
+        };
+
+        const auto bar = toml::get<extlib3::bar>(v);
+        BOOST_TEST(bar.a == 42);
+        BOOST_TEST(bar.b == "bar.b");
+        BOOST_TEST(bar.f.a == 42);
+        BOOST_TEST(bar.f.b == "foo.b");
+
+        const toml::basic_value<toml::discard_comments, std::map, std::deque> v2(bar);
+        BOOST_TEST(v2 == v);
+    }
+}
+#endif // TOML11_WITHOUT_DEFINE_NON_INTRUSIVE

tests/test_find.cpp

@@ -1,25 +1,20 @@
-#define BOOST_TEST_MODULE "test_find"
-
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
-
 #include <toml.hpp>
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <deque>
+
+#include "unit_test.hpp"
+
 #include <array>
-#if __cplusplus >= 201703L
+#include <deque>
+#include <list>
+#include <map>
+#include <tuple>
+#include <unordered_map>
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #include <string_view>
 #endif
-#include <tuple>
 
 using test_value_types = std::tuple<
-    toml::value,
+    toml::basic_value<toml::discard_comments>,
     toml::basic_value<toml::preserve_comments>,
     toml::basic_value<toml::discard_comments,  std::map, std::deque>,
     toml::basic_value<toml::preserve_comments, std::map, std::deque>
@@ -477,7 +472,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_string_type, value_type, test_value_type
         BOOST_TEST("foo" == moved);
     }
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
     {
         value_type v{{"key", toml::string("foo", toml::string_t::basic)}};
         BOOST_TEST("foo" == toml::find<std::string_view>(v, "key"));
@@ -830,4 +825,3 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_get_toml_offset_datetime, value_type, test_va
         BOOST_TEST(tm.tm_sec ==            0);
     }
 }
-

tests/test_find_or.cpp

@@ -1,23 +1,20 @@
-#define BOOST_TEST_MODULE "test_find_or"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <deque>
+
+#include "unit_test.hpp"
+
 #include <array>
+#include <deque>
+#include <list>
+#include <map>
 #include <tuple>
-#if __cplusplus >= 201703L
+#include <unordered_map>
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #include <string_view>
 #endif
 
 using test_value_types = std::tuple<
-    toml::value,
+    toml::basic_value<toml::discard_comments>,
     toml::basic_value<toml::preserve_comments>,
     toml::basic_value<toml::discard_comments,  std::map, std::deque>,
     toml::basic_value<toml::preserve_comments, std::map, std::deque>

tests/test_find_or_recursive.cpp

@@ -0,0 +1,393 @@
+#include <toml.hpp>
+
+#include "unit_test.hpp"
+
+#include <array>
+#include <deque>
+#include <list>
+#include <map>
+#include <tuple>
+#include <unordered_map>
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
+#include <string_view>
+#endif
+
+using test_value_types = std::tuple<
+    toml::basic_value<toml::discard_comments>,
+    toml::basic_value<toml::preserve_comments>,
+    toml::basic_value<toml::discard_comments,  std::map, std::deque>,
+    toml::basic_value<toml::preserve_comments, std::map, std::deque>
+>;
+
+namespace test
+{
+template<typename charT, typename traits, typename T, typename Alloc>
+std::basic_ostream<charT, traits>&
+operator<<(std::basic_ostream<charT, traits>& os, const std::vector<T, Alloc>& v)
+{
+    os << "[ ";
+    for(const auto& i : v) {os << i << ' ';}
+    os << ']';
+    return os;
+}
+template<typename charT, typename traits, typename T, typename Alloc>
+std::basic_ostream<charT, traits>&
+operator<<(std::basic_ostream<charT, traits>& os, const std::deque<T, Alloc>& v)
+{
+    os << "[ ";
+    for(const auto& i : v) {os << i << ' ';}
+    os << ']';
+    return os;
+}
+template<typename charT, typename traits, typename T, typename Alloc>
+std::basic_ostream<charT, traits>&
+operator<<(std::basic_ostream<charT, traits>& os, const std::list<T, Alloc>& v)
+{
+    os << "[ ";
+    for(const auto& i : v) {os << i << ' ';}
+    os << ']';
+    return os;
+}
+template<typename charT, typename traits,
+         typename Key, typename Value, typename Comp, typename Alloc>
+std::basic_ostream<charT, traits>&
+operator<<(std::basic_ostream<charT, traits>& os,
+           const std::map<Key, Value, Comp, Alloc>& v)
+{
+    os << "[ ";
+    for(const auto& i : v) {os << '{' << i.first << ", " << i.second << "} ";}
+    os << ']';
+    return os;
+}
+template<typename charT, typename traits,
+         typename Key, typename Value, typename Hash, typename Eq, typename Alloc>
+std::basic_ostream<charT, traits>&
+operator<<(std::basic_ostream<charT, traits>& os,
+           const std::unordered_map<Key, Value, Hash, Eq, Alloc>& v)
+{
+    os << "[ ";
+    for(const auto& i : v) {os << '{' << i.first << ", " << i.second << "} ";}
+    os << ']';
+    return os;
+}
+} // test
+
+#define TOML11_TEST_FIND_OR_EXACT(toml_type, init_expr, opt_expr) \
+    {                                                             \
+        using namespace test;                                     \
+        const toml::toml_type init init_expr ;                    \
+        const toml::toml_type opt  opt_expr ;                     \
+        const value_type v{{"key1", value_type{{"key2", init}} }};\
+        BOOST_TEST(init != opt);                                  \
+        BOOST_TEST(init == toml::find_or(v, "key1", "key2", opt));\
+    }                                                             \
+    /**/
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_or_exact, value_type, test_value_types)
+{
+    TOML11_TEST_FIND_OR_EXACT(boolean,         ( true), (false))
+    TOML11_TEST_FIND_OR_EXACT(integer,         (   42), (   54))
+    TOML11_TEST_FIND_OR_EXACT(floating,        ( 3.14), ( 2.71))
+    TOML11_TEST_FIND_OR_EXACT(string,          ("foo"), ("bar"))
+    TOML11_TEST_FIND_OR_EXACT(local_time,      (12, 30, 45), (6, 0, 30))
+    TOML11_TEST_FIND_OR_EXACT(local_date,      (2019, toml::month_t::Apr, 1),
+                                               (1999, toml::month_t::Jan, 2))
+    TOML11_TEST_FIND_OR_EXACT(local_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30))
+            )
+    TOML11_TEST_FIND_OR_EXACT(offset_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45), toml::time_offset( 9, 0)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30), toml::time_offset(-3, 0))
+            )
+    {
+        const typename value_type::array_type init{1,2,3,4,5};
+        const typename value_type::array_type opt {6,7,8,9,10};
+        const value_type v{{"key", init}};
+        BOOST_TEST(init != opt);
+        BOOST_TEST(init == toml::find_or(v, "key", opt));
+    }
+    {
+        const typename value_type::table_type init{{"key1", 42}, {"key2", "foo"}};
+        const typename value_type::table_type opt {{"key1", 54}, {"key2", "bar"}};
+        const value_type v{{"key", init}};
+        BOOST_TEST(init != opt);
+        BOOST_TEST(init == toml::find_or(v, "key", opt));
+    }
+}
+#undef TOML11_TEST_FIND_OR_EXACT
+
+#define TOML11_TEST_FIND_OR_MOVE(toml_type, init_expr, opt_expr)   \
+    {                                                              \
+        using namespace test;                                      \
+        const toml::toml_type init init_expr ;                     \
+        toml::toml_type opt  opt_expr ;                            \
+        value_type v{{"key1", value_type{{"key2", init}} }};       \
+        BOOST_TEST(init != opt);                                   \
+        const auto moved = toml::find_or(std::move(v), "key1", "key2", std::move(opt));\
+        BOOST_TEST(init == moved);                                 \
+    }                                                              \
+    /**/
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_or_move, value_type, test_value_types)
+{
+    TOML11_TEST_FIND_OR_MOVE(boolean,         ( true), (false))
+    TOML11_TEST_FIND_OR_MOVE(integer,         (   42), (   54))
+    TOML11_TEST_FIND_OR_MOVE(floating,        ( 3.14), ( 2.71))
+    TOML11_TEST_FIND_OR_MOVE(string,          ("foo"), ("bar"))
+    TOML11_TEST_FIND_OR_MOVE(local_time,      (12, 30, 45), (6, 0, 30))
+    TOML11_TEST_FIND_OR_MOVE(local_date,      (2019, toml::month_t::Apr, 1),
+                                              (1999, toml::month_t::Jan, 2))
+    TOML11_TEST_FIND_OR_MOVE(local_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30))
+            )
+    TOML11_TEST_FIND_OR_MOVE(offset_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45), toml::time_offset( 9, 0)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30), toml::time_offset(-3, 0))
+            )
+    {
+        typename value_type::array_type init{1,2,3,4,5};
+        typename value_type::array_type opt {6,7,8,9,10};
+        value_type v{{"key", init}};
+        BOOST_TEST(init != opt);
+        const auto moved = toml::find_or(std::move(v), "key", std::move(opt));
+        BOOST_TEST(init == moved);
+    }
+    {
+        typename value_type::table_type init{{"key1", 42}, {"key2", "foo"}};
+        typename value_type::table_type opt {{"key1", 54}, {"key2", "bar"}};
+        value_type v{{"key", init}};
+        BOOST_TEST(init != opt);
+        const auto moved = toml::find_or(std::move(v), "key", std::move(opt));
+        BOOST_TEST(init == moved);
+    }
+}
+#undef TOML11_TEST_FIND_OR_MOVE
+
+
+#define TOML11_TEST_FIND_OR_MODIFY(toml_type, init_expr, opt_expr)\
+    {                                                             \
+        using namespace test;                                     \
+        const toml::toml_type init init_expr ;                    \
+        toml::toml_type       opt1 opt_expr ;                     \
+        toml::toml_type       opt2 opt_expr ;                     \
+        value_type v{{"key1", value_type{{"key2", init}} }};      \
+        BOOST_TEST(init != opt1);                                 \
+        toml::find_or(v, "key1", "key2", opt2) = opt1;            \
+        BOOST_TEST(opt1 == toml::find<toml::toml_type>(v, "key1", "key2"));\
+    }                                                             \
+    /**/
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_or_modify, value_type, test_value_types)
+{
+    TOML11_TEST_FIND_OR_MODIFY(boolean,         ( true), (false))
+    TOML11_TEST_FIND_OR_MODIFY(integer,         (   42), (   54))
+    TOML11_TEST_FIND_OR_MODIFY(floating,        ( 3.14), ( 2.71))
+    TOML11_TEST_FIND_OR_MODIFY(string,          ("foo"), ("bar"))
+    TOML11_TEST_FIND_OR_MODIFY(local_time,      (12, 30, 45), (6, 0, 30))
+    TOML11_TEST_FIND_OR_MODIFY(local_date,      (2019, toml::month_t::Apr, 1),
+                                              (1999, toml::month_t::Jan, 2))
+    TOML11_TEST_FIND_OR_MODIFY(local_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30))
+            )
+    TOML11_TEST_FIND_OR_MODIFY(offset_datetime,
+            (toml::local_date(2019, toml::month_t::Apr, 1), toml::local_time(12, 30, 45), toml::time_offset( 9, 0)),
+            (toml::local_date(1999, toml::month_t::Jan, 2), toml::local_time( 6,  0, 30), toml::time_offset(-3, 0))
+            )
+    {
+        typename value_type::array_type init{1,2,3,4,5};
+        typename value_type::array_type opt1{6,7,8,9,10};
+        typename value_type::array_type opt2{6,7,8,9,10};
+        BOOST_TEST(init != opt1);
+        value_type v{{"key", init}};
+        toml::find_or(v, "key", opt2) = opt1;
+        BOOST_TEST(opt1 == toml::find<typename value_type::array_type>(v, "key"));
+    }
+    {
+        typename value_type::table_type init{{"key1", 42}, {"key2", "foo"}};
+        typename value_type::table_type opt1{{"key1", 54}, {"key2", "bar"}};
+        typename value_type::table_type opt2{{"key1", 54}, {"key2", "bar"}};
+        value_type v{{"key", init}};
+        BOOST_TEST(init != opt1);
+        toml::find_or(v, "key", opt2) = opt1;
+        BOOST_TEST(opt1 == toml::find<typename value_type::table_type>(v, "key"));
+    }
+}
+#undef TOML11_TEST_FIND_OR_MODIFY
+
+#define TOML11_TEST_FIND_OR_FALLBACK(init_type, opt_type)                   \
+    {                                                                       \
+        using namespace test;                                               \
+        value_type v1{{"key1", value_type{{"key3", "foo"}}}};               \
+        BOOST_TEST(opt_type == toml::find_or(v1, "key1", "key2", opt_type));\
+        value_type v2{{"key1", "foo"}};                                     \
+        BOOST_TEST(opt_type == toml::find_or(v2, "key1", "key3", opt_type));\
+    }                                                                       \
+    /**/
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_or_fallback, value_type, test_value_types)
+{
+    const toml::boolean         boolean        (true);
+    const toml::integer         integer        (42);
+    const toml::floating        floating       (3.14);
+    const toml::string          string         ("foo");
+    const toml::local_time      local_time     (12, 30, 45);
+    const toml::local_date      local_date     (2019, toml::month_t::Apr, 1);
+    const toml::local_datetime  local_datetime (
+            toml::local_date(2019, toml::month_t::Apr, 1),
+            toml::local_time(12, 30, 45));
+    const toml::offset_datetime offset_datetime(
+            toml::local_date(2019, toml::month_t::Apr, 1),
+            toml::local_time(12, 30, 45), toml::time_offset( 9, 0));
+
+    using array_type = typename value_type::array_type;
+    using table_type = typename value_type::table_type;
+    const array_type array{1, 2, 3, 4, 5};
+    const table_type table{{"key1", 42}, {"key2", "foo"}};
+
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(boolean, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(integer, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(integer, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(integer, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(floating, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(floating, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(floating, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(string, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(string, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(string, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(string, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(string, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(string, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(string, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(string, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(string, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(local_time, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(local_date, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(local_datetime, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, array          );
+    TOML11_TEST_FIND_OR_FALLBACK(offset_datetime, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(array, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(array, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(array, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(array, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(array, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(array, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(array, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(array, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(array, table          );
+
+    TOML11_TEST_FIND_OR_FALLBACK(table, boolean        );
+    TOML11_TEST_FIND_OR_FALLBACK(table, integer        );
+    TOML11_TEST_FIND_OR_FALLBACK(table, floating       );
+    TOML11_TEST_FIND_OR_FALLBACK(table, string         );
+    TOML11_TEST_FIND_OR_FALLBACK(table, local_time     );
+    TOML11_TEST_FIND_OR_FALLBACK(table, local_date     );
+    TOML11_TEST_FIND_OR_FALLBACK(table, local_datetime );
+    TOML11_TEST_FIND_OR_FALLBACK(table, offset_datetime);
+    TOML11_TEST_FIND_OR_FALLBACK(table, array          );
+}
+#undef TOML11_TEST_FIND_OR_FALLBACK
+
+struct move_only_type
+{
+    explicit move_only_type(const std::string& n): name_(n) {}
+
+    void from_toml(const toml::value& v)
+    {
+        this->name_ = toml::find<std::string>(v, "name");
+        return;
+    }
+
+    move_only_type(): name_("default"){}
+    ~move_only_type() = default;
+    move_only_type(move_only_type&&)            = default;
+    move_only_type& operator=(move_only_type&&) = default;
+    move_only_type(const move_only_type&)            = delete;
+    move_only_type& operator=(const move_only_type&) = delete;
+
+    bool operator==(const move_only_type& other) const noexcept {return this->name_ == other.name_;}
+    bool operator!=(const move_only_type& other) const noexcept {return this->name_ != other.name_;}
+    bool operator< (const move_only_type& other) const noexcept {return this->name_ <  other.name_;}
+    bool operator<=(const move_only_type& other) const noexcept {return this->name_ <= other.name_;}
+    bool operator> (const move_only_type& other) const noexcept {return this->name_ >  other.name_;}
+    bool operator>=(const move_only_type& other) const noexcept {return this->name_ >= other.name_;}
+
+    std::string name_;
+};
+
+std::ostream& operator<<(std::ostream& os, const move_only_type& mot)
+{
+    os << mot.name_;
+    return os;
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_or_move_only, value_type, test_value_types)
+{
+    const move_only_type ref("reference");
+    move_only_type opt("optional");
+    {
+        const value_type v{{"key1", value_type{{"key2", value_type{{"name", "reference"}} }} }};
+        BOOST_TEST(ref == toml::find_or(v, "key1", "key2", std::move(opt)));
+    }
+}

tests/test_format_error.cpp

@@ -1,11 +1,7 @@
-#define BOOST_TEST_MODULE "test_format_error"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
 #include <iostream>
 
 // to check it successfully compiles. it does not check the formatted string.

tests/test_get.cpp

@@ -1,23 +1,20 @@
-#define BOOST_TEST_MODULE "test_get"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <deque>
+
+#include "unit_test.hpp"
+
 #include <array>
+#include <deque>
+#include <list>
+#include <map>
 #include <tuple>
-#if __cplusplus >= 201703L
+#include <unordered_map>
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #include <string_view>
 #endif
 
 using test_value_types = std::tuple<
-    toml::value,
+    toml::basic_value<toml::discard_comments>,
     toml::basic_value<toml::preserve_comments>,
     toml::basic_value<toml::discard_comments,  std::map, std::deque>,
     toml::basic_value<toml::preserve_comments, std::map, std::deque>
@@ -224,7 +221,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_get_string_type, value_type, test_value_types
         BOOST_TEST("foobar" == x);
     }
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
     {
         value_type v("foo", toml::string_t::basic);
         BOOST_TEST("foo" == toml::get<std::string_view>(v));
@@ -506,4 +503,3 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_get_toml_offset_datetime, value_type, test_va
     BOOST_TEST(tm.tm_sec ==            0);
     }
 }
-

tests/test_get_or.cpp

@@ -1,23 +1,20 @@
-#define BOOST_TEST_MODULE "test_get_or"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <deque>
+
+#include "unit_test.hpp"
+
 #include <array>
+#include <deque>
+#include <list>
+#include <map>
 #include <tuple>
-#if __cplusplus >= 201703L
+#include <unordered_map>
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #include <string_view>
 #endif
 
 using test_value_types = std::tuple<
-    toml::value,
+    toml::basic_value<toml::discard_comments>,
     toml::basic_value<toml::preserve_comments>,
     toml::basic_value<toml::discard_comments,  std::map, std::deque>,
     toml::basic_value<toml::preserve_comments, std::map, std::deque>

tests/test_lex_boolean.cpp

@@ -1,6 +1,6 @@
-#define BOOST_TEST_MODULE "test_lex_boolean"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
 using namespace toml;

tests/test_lex_datetime.cpp

@@ -1,6 +1,6 @@
-#define BOOST_TEST_MODULE "test_lex_datetime"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
 using namespace toml;

tests/test_lex_floating.cpp

@@ -1,9 +1,10 @@
-#define BOOST_TEST_MODULE "test_lex_floating"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
-#include <limits>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
+#include <limits>
+
 using namespace toml;
 using namespace detail;
 

tests/test_lex_integer.cpp

@@ -1,6 +1,6 @@
-#define BOOST_TEST_MODULE "test_lex_integer"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
 using namespace toml;

tests/test_lex_key_comment.cpp

@@ -1,6 +1,6 @@
-#define BOOST_TEST_MODULE "lex_key_comment_test"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
 using namespace toml;

tests/test_lex_string.cpp

@@ -1,6 +1,6 @@
-#define BOOST_TEST_MODULE "test_lex_string"
-#include <boost/test/unit_test.hpp>
 #include <toml/lexer.hpp>
+
+#include "unit_test.hpp"
 #include "test_lex_aux.hpp"
 
 using namespace toml;

tests/test_literals.cpp

@@ -1,11 +1,7 @@
-#define BOOST_TEST_MODULE "test_literals"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
 #include <map>
 
 BOOST_AUTO_TEST_CASE(test_file_as_literal)

tests/test_parse_array.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_array<toml::value>_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;
@@ -13,30 +8,30 @@ using namespace detail;
 
 BOOST_AUTO_TEST_CASE(test_oneline_array)
 {
-    TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[]", array());
+    TOML11_TEST_PARSE_EQUAL_VAT(parse_array<toml::value>, "[]", array());
     {
         array a(5);
         a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
         a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[3,1,4,1,5]", a);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<toml::value>, "[3,1,4,1,5]", a);
     }
     {
         array a(3);
         a[0] = toml::value("foo"); a[1] = toml::value("bar");
         a[2] = toml::value("baz");
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[\"foo\", \"bar\",  \"baz\"]", a);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<toml::value>, "[\"foo\", \"bar\",  \"baz\"]", a);
     }
     {
         array a(5);
         a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
         a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[3,1,4,1,5,]", a);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<toml::value>, "[3,1,4,1,5,]", a);
     }
     {
         array a(3);
         a[0] = toml::value("foo"); a[1] = toml::value("bar");
         a[2] = toml::value("baz");
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[\"foo\", \"bar\",  \"baz\",]", a);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<toml::value>, "[\"foo\", \"bar\",  \"baz\",]", a);
     }
 }
 
@@ -71,62 +66,153 @@ BOOST_AUTO_TEST_CASE(test_oneline_array_value)
 
 BOOST_AUTO_TEST_CASE(test_multiline_array)
 {
-    TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[\n#comment\n]", array());
+    TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value< discard_comments>>, "[\n#comment\n]", typename basic_value< discard_comments>::array_type());
+    TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<preserve_comments>>, "[\n#comment\n]", typename basic_value<preserve_comments>::array_type());
+
     {
-        array a(5);
-        a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
-        a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[3,\n1,\n4,\n1,\n5]", a);
+        typename basic_value<discard_comments>::array_type a(5);
+        a[0] = basic_value<discard_comments>(3);
+        a[1] = basic_value<discard_comments>(1);
+        a[2] = basic_value<discard_comments>(4);
+        a[3] = basic_value<discard_comments>(1);
+        a[4] = basic_value<discard_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<discard_comments>>, "[3,\n1,\n4,\n1,\n5]", a);
     }
     {
-        array a(3);
-        a[0] = toml::value("foo"); a[1] = toml::value("bar");
-        a[2] = toml::value("baz");
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[\"foo\",\n\"bar\",\n\"baz\"]", a);
+        typename basic_value<preserve_comments>::array_type a(5);
+        a[0] = basic_value<preserve_comments>(3);
+        a[1] = basic_value<preserve_comments>(1);
+        a[2] = basic_value<preserve_comments>(4);
+        a[3] = basic_value<preserve_comments>(1);
+        a[4] = basic_value<preserve_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<preserve_comments>>, "[3,\n1,\n4,\n1,\n5]", a);
     }
 
     {
-        array a(5);
-        a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
-        a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5]", a);
+        typename basic_value<discard_comments>::array_type a(5);
+        a[0] = basic_value<discard_comments>(3);
+        a[1] = basic_value<discard_comments>(1);
+        a[2] = basic_value<discard_comments>(4);
+        a[3] = basic_value<discard_comments>(1);
+        a[4] = basic_value<discard_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<discard_comments>>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5 #comment\n]", a);
     }
     {
-        array a(3);
-        a[0] = toml::value("foo"); a[1] = toml::value("b#r");
-        a[2] = toml::value("b#z");
-        TOML11_TEST_PARSE_EQUAL(parse_array<toml::value>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", a);
+        typename basic_value<preserve_comments>::array_type a(5);
+        a[0] = basic_value<preserve_comments>(3, {"comment"});
+        a[1] = basic_value<preserve_comments>(1, {"comment"});
+        a[2] = basic_value<preserve_comments>(4, {"comment"});
+        a[3] = basic_value<preserve_comments>(1, {"comment"});
+        a[4] = basic_value<preserve_comments>(5, {"comment"});
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<preserve_comments>>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5 #comment\n]", a);
+    }
+
+
+    {
+        typename basic_value<discard_comments>::array_type a(3);
+        a[0] = basic_value<discard_comments>("foo");
+        a[1] = basic_value<discard_comments>("bar");
+        a[2] = basic_value<discard_comments>("baz");
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<discard_comments>>, "[\"foo\",\n\"bar\",\n\"baz\"]", a);
+    }
+    {
+        typename basic_value<preserve_comments>::array_type a(3);
+        a[0] = basic_value<preserve_comments>("foo");
+        a[1] = basic_value<preserve_comments>("bar");
+        a[2] = basic_value<preserve_comments>("baz");
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<preserve_comments>>, "[\"foo\",\n\"bar\",\n\"baz\"]", a);
+    }
+
+    {
+        typename basic_value<discard_comments>::array_type a(3);
+        a[0] = basic_value<discard_comments>("foo");
+        a[1] = basic_value<discard_comments>("b#r");
+        a[2] = basic_value<discard_comments>("b#z");
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<discard_comments>>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", a);
+    }
+    {
+        typename basic_value<preserve_comments>::array_type a(3);
+        a[0] = basic_value<preserve_comments>("foo", {"comment"});
+        a[1] = basic_value<preserve_comments>("b#r", {"comment"});
+        a[2] = basic_value<preserve_comments>("b#z", {"comment"});
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_array<basic_value<preserve_comments>>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", a);
     }
 }
 
 BOOST_AUTO_TEST_CASE(test_multiline_array_value)
 {
-    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "[\n#comment\n]", toml::value(array()));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value< discard_comments>>, "[\n#comment\n]", basic_value< discard_comments>(typename basic_value< discard_comments>::array_type()));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>, "[\n#comment\n]", basic_value<preserve_comments>(typename basic_value<preserve_comments>::array_type()));
+
     {
-        array a(5);
-        a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
-        a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "[3,\n1,\n4,\n1,\n5]", toml::value(a));
+        typename basic_value<discard_comments>::array_type a(5);
+        a[0] = basic_value<discard_comments>(3);
+        a[1] = basic_value<discard_comments>(1);
+        a[2] = basic_value<discard_comments>(4);
+        a[3] = basic_value<discard_comments>(1);
+        a[4] = basic_value<discard_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<discard_comments>>, "[3,\n1,\n4,\n1,\n5]", basic_value<discard_comments>(a));
     }
     {
-        array a(3);
-        a[0] = toml::value("foo"); a[1] = toml::value("bar");
-        a[2] = toml::value("baz");
-        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "[\"foo\",\n\"bar\",\n\"baz\"]", toml::value(a));
+        typename basic_value<preserve_comments>::array_type a(5);
+        a[0] = basic_value<preserve_comments>(3);
+        a[1] = basic_value<preserve_comments>(1);
+        a[2] = basic_value<preserve_comments>(4);
+        a[3] = basic_value<preserve_comments>(1);
+        a[4] = basic_value<preserve_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>, "[3,\n1,\n4,\n1,\n5]", basic_value<preserve_comments>(a));
     }
 
     {
-        array a(5);
-        a[0] = toml::value(3); a[1] = toml::value(1); a[2] = toml::value(4);
-        a[3] = toml::value(1); a[4] = toml::value(5);
-        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5]", toml::value(a));
+        typename basic_value<discard_comments>::array_type a(5);
+        a[0] = basic_value<discard_comments>(3);
+        a[1] = basic_value<discard_comments>(1);
+        a[2] = basic_value<discard_comments>(4);
+        a[3] = basic_value<discard_comments>(1);
+        a[4] = basic_value<discard_comments>(5);
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<discard_comments>>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5 #comment\n]", basic_value<discard_comments>(a));
     }
     {
-        array a(3);
-        a[0] = toml::value("foo"); a[1] = toml::value("b#r");
-        a[2] = toml::value("b#z");
-        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", toml::value(a));
+        typename basic_value<preserve_comments>::array_type a(5);
+        a[0] = basic_value<preserve_comments>(3, {"comment"});
+        a[1] = basic_value<preserve_comments>(1, {"comment"});
+        a[2] = basic_value<preserve_comments>(4, {"comment"});
+        a[3] = basic_value<preserve_comments>(1, {"comment"});
+        a[4] = basic_value<preserve_comments>(5, {"comment"});
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>, "[3,#comment\n1,#comment\n4,#comment\n1,#comment\n5 #comment\n]", basic_value<preserve_comments>(a));
     }
+
+
+    {
+        typename basic_value<discard_comments>::array_type a(3);
+        a[0] = basic_value<discard_comments>("foo");
+        a[1] = basic_value<discard_comments>("bar");
+        a[2] = basic_value<discard_comments>("baz");
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<discard_comments>>, "[\"foo\",\n\"bar\",\n\"baz\"]", basic_value<discard_comments>(a));
+    }
+    {
+        typename basic_value<preserve_comments>::array_type a(3);
+        a[0] = basic_value<preserve_comments>("foo");
+        a[1] = basic_value<preserve_comments>("bar");
+        a[2] = basic_value<preserve_comments>("baz");
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>, "[\"foo\",\n\"bar\",\n\"baz\"]", basic_value<preserve_comments>(a));
+    }
+
+    {
+        typename basic_value<discard_comments>::array_type a(3);
+        a[0] = basic_value<discard_comments>("foo");
+        a[1] = basic_value<discard_comments>("b#r");
+        a[2] = basic_value<discard_comments>("b#z");
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<discard_comments>>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", basic_value<discard_comments>(a));
+    }
+    {
+        typename basic_value<preserve_comments>::array_type a(3);
+        a[0] = basic_value<preserve_comments>("foo", {"comment"});
+        a[1] = basic_value<preserve_comments>("b#r", {"comment"});
+        a[2] = basic_value<preserve_comments>("b#z", {"comment"});
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>, "[\"foo\",#comment\n\"b#r\",#comment\n\"b#z\"#comment\n]", basic_value<preserve_comments>(a));
+    }
+
 }
 
 BOOST_AUTO_TEST_CASE(test_heterogeneous_array)
@@ -176,14 +262,27 @@ BOOST_AUTO_TEST_CASE(test_heterogeneous_array)
 BOOST_AUTO_TEST_CASE(test_comments_after_comma)
 {
     {
-        array a;
-        a.push_back("foo");
-        a.push_back("bar");
-        a.push_back("baz");
-        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>,
+        typename basic_value<discard_comments>::array_type a(3);
+        a[0] = basic_value<discard_comments>("foo");
+        a[1] = basic_value<discard_comments>("bar");
+        a[2] = basic_value<discard_comments>("baz");
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<discard_comments>>,
             "[ \"foo\" # comment\n"
             ", \"bar\" # comment\n"
             ", \"baz\" # comment\n"
-            "]", toml::value(a));
+            "]", basic_value<discard_comments>(a));
     }
+
+    {
+        typename basic_value<preserve_comments>::array_type a(3);
+        a[0] = basic_value<preserve_comments>("foo", {" comment"});
+        a[1] = basic_value<preserve_comments>("bar", {" comment"});
+        a[2] = basic_value<preserve_comments>("baz", {" comment"});
+        TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<basic_value<preserve_comments>>,
+            "[ \"foo\" # comment\n"
+            ", \"bar\" # comment\n"
+            ", \"baz\" # comment\n"
+            "]", basic_value<preserve_comments>(a));
+    }
+
 }

tests/test_parse_aux.hpp

@@ -20,11 +20,27 @@ do {                                                                           \
 } while(false);                                                                \
 /**/
 
+#define TOML11_TEST_PARSE_EQUAL_VAT(psr, tkn, expct)                           \
+do {                                                                           \
+    const std::string token(tkn);                                              \
+    toml::detail::location loc("test", token);                                 \
+    const auto result = psr(loc, 0);                                           \
+    BOOST_TEST(result.is_ok());                                                \
+    if(result.is_ok()){                                                        \
+        BOOST_TEST(result.unwrap().first == expct);                            \
+    } else {                                                                   \
+        std::cerr << "parser " << #psr << " failed with input `";              \
+        std::cerr << token << "`.\n";                                          \
+        std::cerr << "reason: " << result.unwrap_err() << '\n';                \
+    }                                                                          \
+} while(false);                                                                \
+/**/
+
 #define TOML11_TEST_PARSE_EQUAL_VALUE(psr, tkn, expct)                         \
 do {                                                                           \
     const std::string token(tkn);                                              \
     toml::detail::location loc("test", token);                                 \
-    const auto result = psr(loc);                                              \
+    const auto result = psr(loc, 0);                                           \
     BOOST_TEST(result.is_ok());                                                \
     if(result.is_ok()){                                                        \
         BOOST_TEST(result.unwrap() == expct);                                  \
@@ -35,3 +51,4 @@ do {                                                                           \
     }                                                                          \
 } while(false);                                                                \
 /**/
+

tests/test_parse_boolean.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "test_parse_boolean"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;

tests/test_parse_datetime.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_datetime_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;
@@ -17,6 +12,11 @@ BOOST_AUTO_TEST_CASE(test_time)
     TOML11_TEST_PARSE_EQUAL(parse_local_time, "07:32:00.99",     toml::local_time(7, 32, 0, 990, 0));
     TOML11_TEST_PARSE_EQUAL(parse_local_time, "07:32:00.999",    toml::local_time(7, 32, 0, 999, 0));
     TOML11_TEST_PARSE_EQUAL(parse_local_time, "07:32:00.999999", toml::local_time(7, 32, 0, 999, 999));
+
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_time, "00:00:00.000000", toml::local_time( 0,  0,  0,   0,   0));
+    TOML11_TEST_PARSE_EQUAL(parse_local_time, "23:59:59.999999", toml::local_time(23, 59, 59, 999, 999));
+    TOML11_TEST_PARSE_EQUAL(parse_local_time, "23:59:60.999999", toml::local_time(23, 59, 60, 999, 999)); // leap second
 }
 
 BOOST_AUTO_TEST_CASE(test_time_value)
@@ -25,17 +25,125 @@ BOOST_AUTO_TEST_CASE(test_time_value)
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "07:32:00.99",     toml::value(toml::local_time(7, 32, 0, 990, 0)));
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "07:32:00.999",    toml::value(toml::local_time(7, 32, 0, 999, 0)));
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "07:32:00.999999", toml::value(toml::local_time(7, 32, 0, 999, 999)));
+
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "00:00:00.000000", toml::value(toml::local_time( 0,  0,  0,   0,   0)));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "23:59:59.999999", toml::value(toml::local_time(23, 59, 59, 999, 999)));
+
+    std::istringstream stream1(std::string("invalid-datetime = 24:00:00"));
+    std::istringstream stream2(std::string("invalid-datetime = 00:60:00"));
+    std::istringstream stream3(std::string("invalid-datetime = 00:00:61"));
+    BOOST_CHECK_THROW(toml::parse(stream1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream2), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream3), toml::syntax_error);
 }
 
 BOOST_AUTO_TEST_CASE(test_date)
 {
-    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "1979-05-27",
-                            toml::local_date(1979, toml::month_t::May, 27));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "1979-05-27", toml::local_date(1979, toml::month_t::May, 27));
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-01-01", toml::local_date(2000, toml::month_t::Jan,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-01-31", toml::local_date(2000, toml::month_t::Jan, 31));
+    std::istringstream stream1_1(std::string("invalid-datetime = 2000-01-00"));
+    std::istringstream stream1_2(std::string("invalid-datetime = 2000-01-32"));
+    BOOST_CHECK_THROW(toml::parse(stream1_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream1_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-02-01", toml::local_date(2000, toml::month_t::Feb,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-02-29", toml::local_date(2000, toml::month_t::Feb, 29));
+    std::istringstream stream2_1(std::string("invalid-datetime = 2000-02-00"));
+    std::istringstream stream2_2(std::string("invalid-datetime = 2000-02-30"));
+    BOOST_CHECK_THROW(toml::parse(stream2_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream2_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2001-02-28", toml::local_date(2001, toml::month_t::Feb, 28));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2004-02-29", toml::local_date(2004, toml::month_t::Feb, 29));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2100-02-28", toml::local_date(2100, toml::month_t::Feb, 28));
+    std::istringstream stream2_3(std::string("invalid-datetime = 2001-02-29"));
+    std::istringstream stream2_4(std::string("invalid-datetime = 2004-02-30"));
+    std::istringstream stream2_5(std::string("invalid-datetime = 2100-02-29"));
+    BOOST_CHECK_THROW(toml::parse(stream2_3), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream2_4), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream2_5), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-03-01", toml::local_date(2000, toml::month_t::Mar,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-03-31", toml::local_date(2000, toml::month_t::Mar, 31));
+    std::istringstream stream3_1(std::string("invalid-datetime = 2000-03-00"));
+    std::istringstream stream3_2(std::string("invalid-datetime = 2000-03-32"));
+    BOOST_CHECK_THROW(toml::parse(stream3_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream3_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-04-01", toml::local_date(2000, toml::month_t::Apr,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-04-30", toml::local_date(2000, toml::month_t::Apr, 30));
+    std::istringstream stream4_1(std::string("invalid-datetime = 2000-04-00"));
+    std::istringstream stream4_2(std::string("invalid-datetime = 2000-04-31"));
+    BOOST_CHECK_THROW(toml::parse(stream4_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream4_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-05-01", toml::local_date(2000, toml::month_t::May,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-05-31", toml::local_date(2000, toml::month_t::May, 31));
+    std::istringstream stream5_1(std::string("invalid-datetime = 2000-05-00"));
+    std::istringstream stream5_2(std::string("invalid-datetime = 2000-05-32"));
+    BOOST_CHECK_THROW(toml::parse(stream5_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream5_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-06-01", toml::local_date(2000, toml::month_t::Jun,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-06-30", toml::local_date(2000, toml::month_t::Jun, 30));
+    std::istringstream stream6_1(std::string("invalid-datetime = 2000-06-00"));
+    std::istringstream stream6_2(std::string("invalid-datetime = 2000-06-31"));
+    BOOST_CHECK_THROW(toml::parse(stream6_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream6_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-07-01", toml::local_date(2000, toml::month_t::Jul,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-07-31", toml::local_date(2000, toml::month_t::Jul, 31));
+    std::istringstream stream7_1(std::string("invalid-datetime = 2000-07-00"));
+    std::istringstream stream7_2(std::string("invalid-datetime = 2000-07-32"));
+    BOOST_CHECK_THROW(toml::parse(stream7_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream7_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-08-01", toml::local_date(2000, toml::month_t::Aug,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-08-31", toml::local_date(2000, toml::month_t::Aug, 31));
+    std::istringstream stream8_1(std::string("invalid-datetime = 2000-08-00"));
+    std::istringstream stream8_2(std::string("invalid-datetime = 2000-08-32"));
+    BOOST_CHECK_THROW(toml::parse(stream8_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream8_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-09-01", toml::local_date(2000, toml::month_t::Sep,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-09-30", toml::local_date(2000, toml::month_t::Sep, 30));
+    std::istringstream stream9_1(std::string("invalid-datetime = 2000-09-00"));
+    std::istringstream stream9_2(std::string("invalid-datetime = 2000-09-31"));
+    BOOST_CHECK_THROW(toml::parse(stream9_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream9_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-10-01", toml::local_date(2000, toml::month_t::Oct,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-10-31", toml::local_date(2000, toml::month_t::Oct, 31));
+    std::istringstream stream10_1(std::string("invalid-datetime = 2000-10-00"));
+    std::istringstream stream10_2(std::string("invalid-datetime = 2000-10-32"));
+    BOOST_CHECK_THROW(toml::parse(stream10_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream10_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-11-01", toml::local_date(2000, toml::month_t::Nov,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-11-30", toml::local_date(2000, toml::month_t::Nov, 30));
+    std::istringstream stream11_1(std::string("invalid-datetime = 2000-11-00"));
+    std::istringstream stream11_2(std::string("invalid-datetime = 2000-11-31"));
+    BOOST_CHECK_THROW(toml::parse(stream11_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream11_2), toml::syntax_error);
+
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-12-01", toml::local_date(2000, toml::month_t::Dec,  1));
+    TOML11_TEST_PARSE_EQUAL(parse_local_date,  "2000-12-31", toml::local_date(2000, toml::month_t::Dec, 31));
+    std::istringstream stream12_1(std::string("invalid-datetime = 2000-12-00"));
+    std::istringstream stream12_2(std::string("invalid-datetime = 2000-12-32"));
+    BOOST_CHECK_THROW(toml::parse(stream12_1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream12_2), toml::syntax_error);
+
+    std::istringstream stream13_1(std::string("invalid-datetime = 2000-13-01"));
+    BOOST_CHECK_THROW(toml::parse(stream13_1), toml::syntax_error);
+    std::istringstream stream0_1(std::string("invalid-datetime = 2000-00-01"));
+    BOOST_CHECK_THROW(toml::parse(stream0_1), toml::syntax_error);
 }
+
 BOOST_AUTO_TEST_CASE(test_date_value)
 {
-    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "1979-05-27",
-                            value(toml::local_date(1979, toml::month_t::May, 27)));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "1979-05-27", value(toml::local_date(1979, toml::month_t::May, 27)));
 }
 
 BOOST_AUTO_TEST_CASE(test_datetime)
@@ -107,6 +215,11 @@ BOOST_AUTO_TEST_CASE(test_offset_datetime)
     TOML11_TEST_PARSE_EQUAL(parse_offset_datetime, "1979-05-27T07:32:00.999999+09:00",
         toml::offset_datetime(toml::local_date(1979, toml::month_t::May, 27),
                               toml::local_time(7, 32, 0, 999, 999), toml::time_offset(9, 0)));
+
+    std::istringstream stream1(std::string("invalid-datetime = 2000-01-01T00:00:00+24:00"));
+    std::istringstream stream2(std::string("invalid-datetime = 2000-01-01T00:00:00+00:60"));
+    BOOST_CHECK_THROW(toml::parse(stream1), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(stream2), toml::syntax_error);
 }
 
 BOOST_AUTO_TEST_CASE(test_offset_datetime_value)

tests/test_parse_file.cpp

@@ -1,19 +1,15 @@
-#define BOOST_TEST_MODULE "test_parse_file"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <iostream>
-#include <fstream>
-#include <map>
+
+#include "unit_test.hpp"
+
 #include <deque>
+#include <fstream>
+#include <iostream>
+#include <map>
 
 BOOST_AUTO_TEST_CASE(test_example)
 {
-    const auto data = toml::parse("toml/tests/example.toml");
+    const auto data = toml::parse(testinput("example.toml"));
 
     BOOST_TEST(toml::find<std::string>(data, "title") == "TOML Example");
     const auto& owner = toml::find(data, "owner");
@@ -76,7 +72,7 @@ BOOST_AUTO_TEST_CASE(test_example)
 
 BOOST_AUTO_TEST_CASE(test_example_stream)
 {
-    std::ifstream ifs("toml/tests/example.toml", std::ios::binary);
+    std::ifstream ifs(testinput("example.toml"), std::ios::binary);
     const auto data = toml::parse(ifs);
 
     BOOST_TEST(toml::find<std::string>(data, "title") == "TOML Example");
@@ -142,9 +138,78 @@ BOOST_AUTO_TEST_CASE(test_example_stream)
     }
 }
 
+BOOST_AUTO_TEST_CASE(test_example_file_pointer)
+{
+    FILE * file = fopen(testinput("example.toml").c_str(), "rb");
+    const auto data = toml::parse(file, "toml/tests/example.toml");
+    fclose(file);
+
+    BOOST_TEST(toml::find<std::string>(data, "title") == "TOML Example");
+    const auto& owner = toml::find(data, "owner");
+    {
+        BOOST_TEST(toml::find<std::string>(owner, "name") == "Tom Preston-Werner");
+        BOOST_TEST(toml::find<std::string>(owner, "organization") == "GitHub");
+        BOOST_TEST(toml::find<std::string>(owner, "bio") ==
+                          "GitHub Cofounder & CEO\nLikes tater tots and beer.");
+        BOOST_TEST(toml::find<toml::offset_datetime>(owner, "dob") ==
+                          toml::offset_datetime(toml::local_date(1979, toml::month_t::May, 27),
+                                                toml::local_time(7, 32, 0), toml::time_offset(0, 0)));
+    }
+
+    const auto& database = toml::find(data, "database");
+    {
+        BOOST_TEST(toml::find<std::string>(database, "server") == "192.168.1.1");
+        const std::vector<int> expected_ports{8001, 8001, 8002};
+        BOOST_CHECK(toml::find<std::vector<int>>(database, "ports") == expected_ports);
+        BOOST_TEST(toml::find<int >(database, "connection_max") == 5000);
+        BOOST_TEST(toml::find<bool>(database, "enabled") == true);
+    }
+
+    const auto& servers = toml::find(data, "servers");
+    {
+        toml::table alpha = toml::find<toml::table>(servers, "alpha");
+        BOOST_TEST(toml::get<std::string>(alpha.at("ip")) == "10.0.0.1");
+        BOOST_TEST(toml::get<std::string>(alpha.at("dc")) == "eqdc10");
+
+        toml::table beta = toml::find<toml::table>(servers, "beta");
+        BOOST_TEST(toml::get<std::string>(beta.at("ip")) == "10.0.0.2");
+        BOOST_TEST(toml::get<std::string>(beta.at("dc")) == "eqdc10");
+        BOOST_TEST(toml::get<std::string>(beta.at("country")) == "\xE4\xB8\xAD\xE5\x9B\xBD");
+    }
+
+    const auto& clients = toml::find(data, "clients");
+    {
+        toml::array clients_data = toml::find<toml::array>(clients, "data");
+        std::vector<std::string> expected_name{"gamma", "delta"};
+        BOOST_CHECK(toml::get<std::vector<std::string>>(clients_data.at(0)) == expected_name);
+
+        std::vector<int> expected_number{1, 2};
+        BOOST_CHECK(toml::get<std::vector<int>>(clients_data.at(1)) == expected_number);
+
+        std::vector<std::string> expected_hosts{"alpha", "omega"};
+        BOOST_CHECK(toml::find<std::vector<std::string>>(clients, "hosts") == expected_hosts);
+    }
+
+    std::vector<toml::table> products =
+        toml::find<std::vector<toml::table>>(data, "products");
+    {
+        BOOST_TEST(toml::get<std::string>(products.at(0).at("name")) ==
+                          "Hammer");
+        BOOST_TEST(toml::get<std::int64_t>(products.at(0).at("sku")) ==
+                          738594937);
+
+        BOOST_TEST(toml::get<std::string>(products.at(1).at("name")) ==
+                          "Nail");
+        BOOST_TEST(toml::get<std::int64_t>(products.at(1).at("sku")) ==
+                          284758393);
+        BOOST_TEST(toml::get<std::string>(products.at(1).at("color")) ==
+                          "gray");
+    }
+}
+
 BOOST_AUTO_TEST_CASE(test_fruit)
 {
-    const auto data = toml::parse("toml/tests/fruit.toml");
+    const auto data = toml::parse(testinput("fruit.toml"));
     const auto blah = toml::find<toml::array>(toml::find(data, "fruit"), "blah");
     BOOST_TEST(toml::find<std::string>(blah.at(0), "name") == "apple");
     BOOST_TEST(toml::find<std::string>(blah.at(1), "name") == "banana");
@@ -162,7 +227,7 @@ BOOST_AUTO_TEST_CASE(test_fruit)
 
 BOOST_AUTO_TEST_CASE(test_hard_example)
 {
-    const auto data = toml::parse("toml/tests/hard_example.toml");
+    const auto data = toml::parse(testinput("hard_example.toml"));
     const auto the = toml::find(data, "the");
     BOOST_TEST(toml::find<std::string>(the, "test_string") ==
                       "You'll hate me after this - #");
@@ -189,7 +254,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example)
 }
 BOOST_AUTO_TEST_CASE(test_hard_example_comment)
 {
-    const auto data = toml::parse<toml::preserve_comments>("toml/tests/hard_example.toml");
+    const auto data = toml::parse<toml::preserve_comments>(testinput("hard_example.toml"));
     const auto the = toml::find(data, "the");
     BOOST_TEST(toml::find<std::string>(the, "test_string") ==
                       "You'll hate me after this - #");
@@ -218,7 +283,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example_comment)
 
 BOOST_AUTO_TEST_CASE(test_example_preserve_comment)
 {
-    const auto data = toml::parse<toml::preserve_comments>("toml/tests/example.toml");
+    const auto data = toml::parse<toml::preserve_comments>(testinput("example.toml"));
 
     BOOST_TEST(toml::find<std::string>(data, "title") == "TOML Example");
     const auto& owner = toml::find(data, "owner");
@@ -300,8 +365,8 @@ BOOST_AUTO_TEST_CASE(test_example_preserve_comment)
 
 BOOST_AUTO_TEST_CASE(test_example_preserve_stdmap_stddeque)
 {
-    const auto data = toml::parse<toml::preserve_comments, std::map, std::deque
-          >("toml/tests/example.toml");
+    const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>(
+            testinput("example.toml"));
 
     static_assert(std::is_same<typename decltype(data)::table_type,
             std::map<toml::key, typename std::remove_cv<decltype(data)>::type>
@@ -905,41 +970,40 @@ BOOST_AUTO_TEST_CASE(test_files_end_with_empty_lines)
     }
 }
 
+BOOST_AUTO_TEST_CASE(test_file_ends_without_lf)
+{
+    {
+        const std::string table(
+            "key = \"value\"\n"
+            "[table]\n"
+            "key = \"value\""
+            );
+        std::istringstream iss(table);
+        const auto data = toml::parse(iss,
+                "test_files_end_without_lf.toml");
+
+        BOOST_TEST(toml::find<std::string>(data, "key") == "value");
+        BOOST_TEST(toml::find<std::string>(toml::find(data, "table"), "key") == "value");
+    }
+}
 
 BOOST_AUTO_TEST_CASE(test_parse_function_compiles)
 {
-    // toml::parse("");
-    const auto string_literal = toml::parse("toml/tests/example.toml");
-
-    BOOST_TEST_MESSAGE("string_literal");
-
-    const char* fname_cstring = "toml/tests/example.toml";
-    // toml::parse(const char*);
-    const auto cstring = toml::parse(fname_cstring);
-
-    BOOST_TEST_MESSAGE("const char*");
-
-    // toml::parse(char*);
-    std::array<char, 24> fname_char_ptr;
-    std::strncpy(fname_char_ptr.data(), fname_cstring, 24);
-    const auto char_ptr = toml::parse(fname_char_ptr.data());
-
-    BOOST_TEST_MESSAGE("char*");
-
-    // toml::parse(const std::string&);
-    const std::string fname_string("toml/tests/example.toml");
-    const auto string = toml::parse(fname_string);
-    std::string fname_string_mut("toml/tests/example.toml");
-    // toml::parse(std::string&);
-    const auto string_mutref = toml::parse(fname_string_mut);
-    // toml::parse(std::string&&);
-    const auto string_rref = toml::parse(std::move(fname_string_mut));
-
-    BOOST_TEST_MESSAGE("strings");
-
+    using result_type = decltype(toml::parse("string literal"));
+    (void) [](const char* that) -> result_type { return toml::parse(that); };
+    (void) [](char* that) -> result_type { return toml::parse(that); };
+    (void) [](const std::string& that) -> result_type { return toml::parse(that); };
+    (void) [](std::string& that) -> result_type { return toml::parse(that); };
+    (void) [](std::string&& that) -> result_type { return toml::parse(that); };
 #ifdef TOML11_HAS_STD_FILESYSTEM
-    const std::filesystem::path fname_path(fname_string.begin(), fname_string.end());
-    const auto filesystem_path = toml::parse(fname_path);
-    BOOST_TEST_MESSAGE("path");
+    (void) [](const std::filesystem::path& that) -> result_type { return toml::parse(that); };
+    (void) [](std::filesystem::path& that) -> result_type { return toml::parse(that); };
+    (void) [](std::filesystem::path&& that) -> result_type { return toml::parse(that); };
 #endif
+    (void) [](std::FILE* that) -> result_type { return toml::parse(that, "mandatory.toml"); };
+}
+
+BOOST_AUTO_TEST_CASE(test_parse_nonexistent_file)
+{
+    BOOST_CHECK_THROW(toml::parse("nonexistent.toml"), std::ios_base::failure);
 }

tests/test_parse_floating.cpp

@@ -1,14 +1,10 @@
-#define BOOST_TEST_MODULE "parse_floating_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
-#include <cmath>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
+#include <cmath>
+
 using namespace toml;
 using namespace detail;
 
@@ -176,3 +172,10 @@ BOOST_AUTO_TEST_CASE(test_nan)
         BOOST_CHECK(std::isnan(r.unwrap().first));
     }
 }
+
+BOOST_AUTO_TEST_CASE(test_overflow)
+{
+    std::istringstream float_overflow (std::string("float-overflow  = 1.0e+1024"));
+    BOOST_CHECK_THROW(toml::parse(float_overflow ), toml::syntax_error);
+    // istringstream >> float does not set failbit in case of underflow.
+}

tests/test_parse_inline_table.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_inline_table_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;
@@ -13,19 +8,19 @@ using namespace detail;
 
 BOOST_AUTO_TEST_CASE(test_inline_table)
 {
-    TOML11_TEST_PARSE_EQUAL(parse_inline_table<toml::value>, "{}", table());
+    TOML11_TEST_PARSE_EQUAL_VAT(parse_inline_table<toml::value>, "{}", table());
     {
         table t;
         t["foo"] = toml::value(42);
         t["bar"] = toml::value("baz");
-        TOML11_TEST_PARSE_EQUAL(parse_inline_table<toml::value>, "{foo = 42, bar = \"baz\"}", t);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_inline_table<toml::value>, "{foo = 42, bar = \"baz\"}", t);
     }
     {
         table t;
         table t_sub;
         t_sub["name"] = toml::value("pug");
         t["type"] = toml::value(t_sub);
-        TOML11_TEST_PARSE_EQUAL(parse_inline_table<toml::value>, "{type.name = \"pug\"}", t);
+        TOML11_TEST_PARSE_EQUAL_VAT(parse_inline_table<toml::value>, "{type.name = \"pug\"}", t);
     }
 }
 

tests/test_parse_integer.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_integer_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;
@@ -89,4 +84,33 @@ BOOST_AUTO_TEST_CASE(test_bin_value)
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "0b010000",   value(16));
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "0b01_00_00", value(16));
     TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>, "0b111111",   value(63));
+
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>,
+        "0b1000_1000_1000_1000_1000_1000_1000_1000_1000_1000_1000_1000_1000_1000_1000",
+        //      1   0   0   0
+        //      0   C   8   4
+        value(0x0888888888888888));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>,
+        "0b01111111_11111111_11111111_11111111_11111111_11111111_11111111_11111111",
+        //      1   0   0   0
+        //      0   C   8   4
+        value(0x7FFFFFFFFFFFFFFF));
+    TOML11_TEST_PARSE_EQUAL_VALUE(parse_value<toml::value>,
+        "0b00000000_01111111_11111111_11111111_11111111_11111111_11111111_11111111_11111111",
+        //      1   0   0   0
+        //      0   C   8   4
+        value(0x7FFFFFFFFFFFFFFF));
+}
+
+BOOST_AUTO_TEST_CASE(test_integer_overflow)
+{
+    std::istringstream dec_overflow(std::string("dec-overflow = 9223372036854775808"));
+    std::istringstream hex_overflow(std::string("hex-overflow = 0x1_00000000_00000000"));
+    std::istringstream oct_overflow(std::string("oct-overflow = 0o1_000_000_000_000_000_000_000"));
+    //                                                           64       56       48       40       32       24       16        8
+    std::istringstream bin_overflow(std::string("bin-overflow = 0b10000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000"));
+    BOOST_CHECK_THROW(toml::parse(dec_overflow), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(hex_overflow), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(oct_overflow), toml::syntax_error);
+    BOOST_CHECK_THROW(toml::parse(bin_overflow), toml::syntax_error);
 }

tests/test_parse_key.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_key_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;

tests/test_parse_string.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_string_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;
@@ -217,6 +212,19 @@ BOOST_AUTO_TEST_CASE(test_ml_literal_string_value)
         value("'This,' she said, 'is just a pointless statement.'", string_t::literal));
 }
 
+BOOST_AUTO_TEST_CASE(test_simple_excape_sequences)
+{
+    TOML11_TEST_PARSE_EQUAL(parse_string,
+            R"("\"\\\b\f\n\r\t")",
+            string("\"\\\b\f\n\r\t", string_t::basic));
+#ifdef TOML11_USE_UNRELEASED_TOML_FEATURES
+    TOML11_TEST_PARSE_EQUAL(parse_string,
+            R"("\e")",
+            string("\x1b", string_t::basic));
+#endif
+}
+
+
 BOOST_AUTO_TEST_CASE(test_unicode_escape_sequence)
 {
 #if defined(_MSC_VER) || defined(__INTEL_COMPILER)

tests/test_parse_table.cpp

@@ -1,12 +1,7 @@
-#define BOOST_TEST_MODULE "parse_table_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
-#include <toml/parser.hpp>
 #include <toml/get.hpp>
+#include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;

tests/test_parse_table_key.cpp

@@ -1,11 +1,6 @@
-#define BOOST_TEST_MODULE "parse_table_key_test"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/parser.hpp>
+
+#include "unit_test.hpp"
 #include "test_parse_aux.hpp"
 
 using namespace toml;

tests/test_parse_unicode.cpp

@@ -1,17 +1,13 @@
-#define BOOST_TEST_MODULE "test_parse_unicode"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
-#include <iostream>
+
+#include "unit_test.hpp"
+
 #include <fstream>
+#include <iostream>
 
 BOOST_AUTO_TEST_CASE(test_hard_example_unicode)
 {
-    const auto data = toml::parse("toml/tests/hard_example_unicode.toml");
+    const auto data = toml::parse(testinput("hard_example_unicode.toml"));
 
     const auto the = toml::find<toml::table>(data, "the");
     BOOST_TEST(toml::get<std::string>(the.at("test_string")) ==

tests/test_result.cpp

@@ -1,8 +1,9 @@
-#define BOOST_TEST_MODULE "test_result"
-#include <boost/test/unit_test.hpp>
-#include <iostream>
 #include <toml/result.hpp>
 
+#include "unit_test.hpp"
+
+#include <iostream>
+
 BOOST_AUTO_TEST_CASE(test_construct)
 {
     {
@@ -437,5 +438,3 @@ BOOST_AUTO_TEST_CASE(test_and_or_other)
         BOOST_TEST("foo" == r1_gen().and_other(r2_gen()).unwrap_err());
     }
 }
-
-

tests/test_serialize_file.cpp

@@ -1,15 +1,14 @@
-#define BOOST_TEST_MODULE "test_serialize_file"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
 #include <deque>
-#include <map>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <map>
+#include <sstream>
+
+#include <clocale>
 
 template<typename Comment,
          template<typename ...> class Table,
@@ -46,7 +45,7 @@ bool has_comment_inside(const toml::basic_value<Comment, Table, Array>& v)
 
 BOOST_AUTO_TEST_CASE(test_example)
 {
-    const auto data = toml::parse("toml/tests/example.toml");
+    const auto data = toml::parse(testinput("example.toml"));
     {
         std::ofstream ofs("tmp1.toml");
         ofs << std::setw(80) << data;
@@ -68,7 +67,7 @@ BOOST_AUTO_TEST_CASE(test_example)
 BOOST_AUTO_TEST_CASE(test_example_map_dq)
 {
     const auto data = toml::parse<toml::discard_comments, std::map, std::deque>(
-            "toml/tests/example.toml");
+            testinput("example.toml"));
     {
         std::ofstream ofs("tmp1_map_dq.toml");
         ofs << std::setw(80) << data;
@@ -90,7 +89,7 @@ BOOST_AUTO_TEST_CASE(test_example_map_dq)
 
 BOOST_AUTO_TEST_CASE(test_example_with_comment)
 {
-    const auto data = toml::parse<toml::preserve_comments>("toml/tests/example.toml");
+    const auto data = toml::parse<toml::preserve_comments>(testinput("example.toml"));
     {
         std::ofstream ofs("tmp1_com.toml");
         ofs << std::setw(80) << data;
@@ -116,7 +115,7 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment)
 BOOST_AUTO_TEST_CASE(test_example_with_comment_nocomment)
 {
     {
-        const auto data = toml::parse<toml::preserve_comments>("toml/tests/example.toml");
+        const auto data = toml::parse<toml::preserve_comments>(testinput("example.toml"));
         {
             std::ofstream ofs("tmp1_com_nocomment.toml");
             ofs << std::setw(80) << toml::nocomment << data;
@@ -126,8 +125,8 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment_nocomment)
         BOOST_TEST(!has_comment_inside(serialized));
     }
     {
-        const auto data_nocomment = toml::parse("toml/tests/example.toml");
-        auto serialized = toml::parse("tmp1_com_nocomment.toml");
+        const auto data_nocomment = toml::parse<toml::discard_comments>(testinput("example.toml"));
+        auto serialized = toml::parse<toml::discard_comments>("tmp1_com_nocomment.toml");
         {
             auto& owner = toml::find(serialized, "owner");
             auto& bio   = toml::find<std::string>(owner, "bio");
@@ -145,7 +144,7 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment_nocomment)
 BOOST_AUTO_TEST_CASE(test_example_with_comment_map_dq)
 {
     const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>(
-            "toml/tests/example.toml");
+            testinput("example.toml"));
     {
         std::ofstream ofs("tmp1_com_map_dq.toml");
         ofs << std::setw(80) << data;
@@ -172,7 +171,7 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment_map_dq)
 BOOST_AUTO_TEST_CASE(test_example_with_comment_map_dq_nocomment)
 {
     {
-        const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>("toml/tests/example.toml");
+        const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>(testinput("example.toml"));
         {
             std::ofstream ofs("tmp1_com_map_dq_nocomment.toml");
             ofs << std::setw(80) << toml::nocomment << data;
@@ -181,8 +180,8 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment_map_dq_nocomment)
         BOOST_TEST(!has_comment_inside(serialized));
     }
     {
-        const auto data_nocomment = toml::parse("toml/tests/example.toml");
-        auto serialized = toml::parse("tmp1_com_map_dq_nocomment.toml");
+        const auto data_nocomment = toml::parse<toml::discard_comments>(testinput("example.toml"));
+        auto serialized = toml::parse<toml::discard_comments>("tmp1_com_map_dq_nocomment.toml");
         {
             auto& owner = toml::find(serialized, "owner");
             auto& bio   = toml::find<std::string>(owner, "bio");
@@ -198,7 +197,7 @@ BOOST_AUTO_TEST_CASE(test_example_with_comment_map_dq_nocomment)
 
 BOOST_AUTO_TEST_CASE(test_fruit)
 {
-    const auto data = toml::parse("toml/tests/fruit.toml");
+    const auto data = toml::parse(testinput("fruit.toml"));
     {
         std::ofstream ofs("tmp2.toml");
         ofs << std::setw(80) << data;
@@ -210,7 +209,7 @@ BOOST_AUTO_TEST_CASE(test_fruit)
 BOOST_AUTO_TEST_CASE(test_fruit_map_dq)
 {
     const auto data = toml::parse<toml::discard_comments, std::map, std::deque>(
-            "toml/tests/fruit.toml");
+            testinput("fruit.toml"));
     {
         std::ofstream ofs("tmp2.toml");
         ofs << std::setw(80) << data;
@@ -222,7 +221,7 @@ BOOST_AUTO_TEST_CASE(test_fruit_map_dq)
 
 BOOST_AUTO_TEST_CASE(test_fruit_with_comments)
 {
-    const auto data = toml::parse<toml::preserve_comments>("toml/tests/fruit.toml");
+    const auto data = toml::parse<toml::preserve_comments>(testinput("fruit.toml"));
     {
         std::ofstream ofs("tmp2_com.toml");
         ofs << std::setw(80) << data;
@@ -234,7 +233,7 @@ BOOST_AUTO_TEST_CASE(test_fruit_with_comments)
 BOOST_AUTO_TEST_CASE(test_fruit_with_comments_map_dq)
 {
     const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>(
-        "toml/tests/fruit.toml");
+            testinput("fruit.toml"));
     {
         std::ofstream ofs("tmp2_com.toml");
         ofs << std::setw(80) << data;
@@ -245,7 +244,7 @@ BOOST_AUTO_TEST_CASE(test_fruit_with_comments_map_dq)
 
 BOOST_AUTO_TEST_CASE(test_hard_example)
 {
-    const auto data = toml::parse("toml/tests/hard_example.toml");
+    const auto data = toml::parse(testinput("hard_example.toml"));
     {
         std::ofstream ofs("tmp3.toml");
         ofs << std::setw(80) << data;
@@ -257,7 +256,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example)
 BOOST_AUTO_TEST_CASE(test_hard_example_map_dq)
 {
     const auto data = toml::parse<toml::discard_comments, std::map, std::deque>(
-            "toml/tests/hard_example.toml");
+            testinput("hard_example.toml"));
     {
         std::ofstream ofs("tmp3.toml");
         ofs << std::setw(80) << data;
@@ -270,7 +269,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example_map_dq)
 BOOST_AUTO_TEST_CASE(test_hard_example_with_comment)
 {
     const auto data = toml::parse<toml::preserve_comments, std::map, std::deque>(
-            "toml/tests/hard_example.toml");
+            testinput("hard_example.toml"));
     {
         std::ofstream ofs("tmp3_com.toml");
         ofs << std::setw(80) << data;
@@ -303,3 +302,104 @@ BOOST_AUTO_TEST_CASE(test_format_key)
         BOOST_TEST("\"special-chars-\\\\-\\\"-\\b-\\f-\\r-\\n-\\t\"" == toml::format_key(key));
     }
 }
+
+// In toml11, an implicitly-defined value does not have any comments.
+// So, in the following file,
+// ```toml
+// # comment
+// [[array-of-tables]]
+// foo = "bar"
+// ```
+// The array named "array-of-tables" does not have the comment, but the first
+// element of the array has. That means that, the above file is equivalent to
+// the following.
+// ```toml
+// array-of-tables = [
+//     # comment
+//     {foo = "bar"},
+// ]
+// ```
+// If the array itself has a comment (value_has_comment_ == true), we should try
+// to make it inline.
+// ```toml
+// # comment about array
+// array-of-tables = [
+//   # comment about table element
+//   {foo = "bar"}
+// ]
+// ```
+// If it is formatted as a multiline table, the two comments becomes
+// indistinguishable.
+// ```toml
+// # comment about array
+// # comment about table element
+// [[array-of-tables]]
+// foo = "bar"
+// ```
+// So we need to try to make it inline, and it force-inlines regardless
+// of the line width limit.
+//     It may fail if the element of a table has comment. In that case,
+// the array-of-tables will be formatted as a multiline table.
+BOOST_AUTO_TEST_CASE(test_distinguish_comment)
+{
+    const std::string str = R"(# comment about array itself
+array_of_table = [
+    # comment about the first element (table)
+    {key = "value"},
+])";
+    std::istringstream iss(str);
+    const auto data = toml::parse<toml::preserve_comments>(iss);
+    const auto serialized = toml::format(data, /*width = */ 0);
+
+    std::istringstream reparse(serialized);
+    const auto parsed = toml::parse<toml::preserve_comments>(reparse);
+
+    BOOST_TEST(parsed.at("array_of_table").comments().size()  == 1u);
+    BOOST_TEST(parsed.at("array_of_table").comments().front() == " comment about array itself");
+    BOOST_TEST(parsed.at("array_of_table").at(0).comments().size()  == 1u);
+    BOOST_TEST(parsed.at("array_of_table").at(0).comments().front() == " comment about the first element (table)");
+}
+
+
+BOOST_AUTO_TEST_CASE(test_serialize_under_locale)
+{
+    // avoid null init (setlocale returns null when it failed)
+    std::string setloc(std::setlocale(LC_ALL, nullptr));
+
+    // fr_FR is a one of locales that uses `,` as a decimal separator.
+    if(const char* try_hyphen = std::setlocale(LC_ALL, "fr_FR.UTF-8"))
+    {
+        setloc = std::string(try_hyphen);
+    }
+    else if(const char* try_nohyphen = std::setlocale(LC_ALL, "fr_FR.utf8"))
+    {
+        setloc = std::string(try_nohyphen);
+    }
+    // In some envs, fr_FR locale has not been installed. Tests must work even in such a case.
+//     else
+//     {
+//         BOOST_TEST(false);
+//     }
+    BOOST_TEST_MESSAGE("current locale at the beginning of the test = " << setloc);
+
+    const std::string str = R"(
+pi        = 3.14159
+large_int = 1234567890
+)";
+    std::istringstream iss(str);
+    const auto ref = toml::parse(iss);
+    const auto serialized_str = toml::format(ref, /*width = */ 80);
+
+    BOOST_TEST_MESSAGE("serialized = " << serialized_str);
+
+    std::istringstream serialized_iss(serialized_str);
+    const auto serialized_ref = toml::parse(serialized_iss);
+
+    BOOST_TEST(serialized_ref.at("pi").as_floating() == ref.at("pi").as_floating());
+    BOOST_TEST(serialized_ref.at("large_int").as_integer() == ref.at("large_int").as_integer());
+
+    const std::string endloc(std::setlocale(LC_ALL, nullptr));
+    BOOST_TEST_MESSAGE("current locale at the end of the test = " << endloc);
+    // check if serializer change global locale
+    BOOST_TEST(setloc == endloc);
+}

tests/test_string.cpp

@@ -1,7 +1,7 @@
-#define BOOST_TEST_MODULE "test_string"
-#include <boost/test/unit_test.hpp>
 #include <toml.hpp>
 
+#include "unit_test.hpp"
+
 BOOST_AUTO_TEST_CASE(test_basic_string)
 {
     {
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(test_string_add_assign)
         str += str2;
         BOOST_TEST(str.str == "foobar");
     }
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
     // std::string_view
     {
         toml::string str("foo");
@@ -151,4 +151,3 @@ BOOST_AUTO_TEST_CASE(test_string_add_assign)
 
 
 }
-

tests/test_traits.cpp

@@ -1,21 +1,16 @@
-#define BOOST_TEST_MODULE "test_traits"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/types.hpp>
 
-#include <list>
-#include <forward_list>
-#include <deque>
+#include "unit_test.hpp"
+
 #include <array>
+#include <deque>
+#include <forward_list>
+#include <list>
 #include <map>
 #include <set>
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
-#include <string>
 
 struct dummy_type{};
 

tests/test_utility.cpp

@@ -1,13 +1,9 @@
-#define BOOST_TEST_MODULE "test_acceptor"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml/utility.hpp>
-#include <vector>
+
+#include "unit_test.hpp"
+
 #include <array>
+#include <vector>
 
 BOOST_AUTO_TEST_CASE(test_try_reserve)
 {

tests/test_value.cpp

@@ -1,15 +1,11 @@
-#define BOOST_TEST_MODULE "test_value"
-#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
-#include <boost/test/unit_test.hpp>
-#else
-#define BOOST_TEST_NO_LIB
-#include <boost/test/included/unit_test.hpp>
-#endif
 #include <toml.hpp>
+
+#include "unit_test.hpp"
+
 #include <map>
 #include <list>
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #include <string_view>
 #endif
 
@@ -423,7 +419,7 @@ BOOST_AUTO_TEST_CASE(test_value_string)
     BOOST_TEST(v2.as_boolean() == true);
     BOOST_TEST(v3.as_boolean() == true);
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
     std::string_view sv = "foo";
 
     toml::value v7(sv);

tests/unit_test.hpp

@@ -0,0 +1,23 @@
+#ifndef BOOST_TEST_MODULE
+#    error "Please #define BOOST_TEST_MODULE before you #include <unit_test.hpp>"
+#endif
+
+#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
+#    include <boost/test/unit_test.hpp>
+#else
+#    include <boost/test/included/unit_test.hpp>
+#endif
+
+#include <cstdlib>
+#include <string>
+
+static inline auto testinput(const std::string& basename) -> std::string
+{
+    const auto this_or_that = [](const char *const s, const char *const t) { return s ? s : t; };
+    std::string directory = this_or_that(std::getenv("TOMLDIR"), "toml");
+    if (!directory.empty() && directory.back() != '/')
+    {
+        directory.push_back('/');
+    }
+    return directory.append("tests/").append(basename);
+}

toml.hpp

@@ -25,21 +25,14 @@
 #ifndef TOML_FOR_MODERN_CPP
 #define TOML_FOR_MODERN_CPP
 
-#ifndef __cplusplus
-#    error "__cplusplus is not defined"
-#endif
-
-#if __cplusplus < 201103L && _MSC_VER < 1900
-#    error "toml11 requires C++11 or later."
-#endif
-
 #define TOML11_VERSION_MAJOR 3
-#define TOML11_VERSION_MINOR 5
+#define TOML11_VERSION_MINOR 8
 #define TOML11_VERSION_PATCH 0
 
 #include "toml/parser.hpp"
 #include "toml/literal.hpp"
 #include "toml/serializer.hpp"
 #include "toml/get.hpp"
+#include "toml/macros.hpp"
 
 #endif// TOML_FOR_MODERN_CPP

toml/color.hpp

@@ -17,11 +17,41 @@ namespace color_ansi
 {
 namespace detail
 {
+
 inline int colorize_index()
 {
     static const int index = std::ios_base::xalloc();
     return index;
 }
+
+// Control color mode globally
+class color_mode
+{
+  public:
+    inline void enable()
+    {
+        should_color_ = true;
+    }
+    inline void disable()
+    {
+        should_color_ = false;
+    }
+
+    inline bool should_color() const
+    {
+        return should_color_;
+    }
+
+    static color_mode& status()
+    {
+        static color_mode status_;
+        return status_;
+    }
+
+  private:
+    bool should_color_ = false;
+};
+
 } // detail
 
 inline std::ostream& colorize(std::ostream& os)
@@ -55,6 +85,21 @@ inline std::ostream& cyan   (std::ostream& os)
 {if(os.iword(detail::colorize_index()) == 1) {os << "\033[36m";} return os;}
 inline std::ostream& white  (std::ostream& os)
 {if(os.iword(detail::colorize_index()) == 1) {os << "\033[37m";} return os;}
+
+inline void enable()
+{
+    return detail::color_mode::status().enable();
+}
+inline void disable()
+{
+    return detail::color_mode::status().disable();
+}
+
+inline bool should_color()
+{
+    return detail::color_mode::status().should_color();
+}
+
 } // color_ansi
 
 // ANSI escape sequence is the only and default colorization method currently

toml/combinator.hpp

@@ -29,7 +29,7 @@ namespace detail
 // to output character as an error message.
 inline std::string show_char(const char c)
 {
-    // It supress an error that occurs only in Debug mode of MSVC++ on Windows.
+    // It suppresses an error that occurs only in Debug mode of MSVC++ on Windows.
     // I'm not completely sure but they check the value of char to be in the
     // range [0, 256) and some of the COMPLETELY VALID utf-8 character sometimes
     // has negative value (if char has sign). So here it re-interprets c as
@@ -154,7 +154,7 @@ struct sequence<Head, Tail...>
     invoke(location& loc)
     {
         const auto first = loc.iter();
-        const auto rslt = Head::invoke(loc);
+        auto rslt = Head::invoke(loc);
         if(rslt.is_err())
         {
             loc.reset(first);

toml/comments.hpp

@@ -4,11 +4,18 @@
 #define TOML11_COMMENTS_HPP
 #include <initializer_list>
 #include <iterator>
+#include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#ifdef TOML11_PRESERVE_COMMENTS_BY_DEFAULT
+#  define TOML11_DEFAULT_COMMENT_STRATEGY ::toml::preserve_comments
+#else
+#  define TOML11_DEFAULT_COMMENT_STRATEGY ::toml::discard_comments
+#endif
+
 // This file provides mainly two classes, `preserve_comments` and `discard_comments`.
 // Those two are a container that have the same interface as `std::vector<std::string>`
 // but bahaves in the opposite way. `preserve_comments` is just the same as
@@ -339,7 +346,7 @@ operator+(const empty_iterator<T, C>& lhs, typename empty_iterator<T, C>::differ
 //
 // Why this is chose as the default type is because the last version (2.x.y)
 // does not contain any comments in a value. To minimize the impact on the
-// efficiency, this is choosed as a default.
+// efficiency, this is chosen as a default.
 //
 // To reduce the memory footprint, later we can try empty base optimization (EBO).
 struct discard_comments
@@ -418,14 +425,14 @@ struct discard_comments
     // empty, so accessing through operator[], front/back, data causes address
     // error.
 
-    reference       operator[](const size_type)       noexcept {return *data();}
-    const_reference operator[](const size_type) const noexcept {return *data();}
+    reference       operator[](const size_type)       noexcept {never_call("toml::discard_comment::operator[]");}
+    const_reference operator[](const size_type) const noexcept {never_call("toml::discard_comment::operator[]");}
     reference       at(const size_type)       {throw std::out_of_range("toml::discard_comment is always empty.");}
     const_reference at(const size_type) const {throw std::out_of_range("toml::discard_comment is always empty.");}
-    reference       front()       noexcept {return *data();}
-    const_reference front() const noexcept {return *data();}
-    reference       back()        noexcept {return *data();}
-    const_reference back()  const noexcept {return *data();}
+    reference       front()       noexcept {never_call("toml::discard_comment::front");}
+    const_reference front() const noexcept {never_call("toml::discard_comment::front");}
+    reference       back()        noexcept {never_call("toml::discard_comment::back");}
+    const_reference back()  const noexcept {never_call("toml::discard_comment::back");}
 
     pointer         data()        noexcept {return nullptr;}
     const_pointer   data()  const noexcept {return nullptr;}
@@ -443,6 +450,18 @@ struct discard_comments
     const_reverse_iterator rend()    const noexcept {return const_iterator{};}
     const_reverse_iterator crbegin() const noexcept {return const_iterator{};}
     const_reverse_iterator crend()   const noexcept {return const_iterator{};}
+
+  private:
+
+    [[noreturn]] static void never_call(const char *const this_function)
+    {
+#ifdef __has_builtin
+#  if __has_builtin(__builtin_unreachable)
+        __builtin_unreachable();
+#  endif
+#endif
+        throw std::logic_error{this_function};
+    }
 };
 
 inline bool operator==(const discard_comments&, const discard_comments&) noexcept {return true;}

toml/datetime.hpp

@@ -21,22 +21,7 @@ namespace toml
 namespace detail
 {
 // TODO: find more sophisticated way to handle this
-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || defined(_POSIX_SOURCE)
-inline std::tm localtime_s(const std::time_t* src)
-{
-    std::tm dst;
-    const auto result = ::localtime_r(src, &dst);
-    if (!result) { throw std::runtime_error("localtime_r failed."); }
-    return dst;
-}
-inline std::tm gmtime_s(const std::time_t* src)
-{
-    std::tm dst;
-    const auto result = ::gmtime_r(src, &dst);
-    if (!result) { throw std::runtime_error("gmtime_r failed."); }
-    return dst;
-}
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 inline std::tm localtime_s(const std::time_t* src)
 {
     std::tm dst;
@@ -51,6 +36,21 @@ inline std::tm gmtime_s(const std::time_t* src)
     if (result) { throw std::runtime_error("gmtime_s failed."); }
     return dst;
 }
+#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || defined(_POSIX_SOURCE)
+inline std::tm localtime_s(const std::time_t* src)
+{
+    std::tm dst;
+    const auto result = ::localtime_r(src, &dst);
+    if (!result) { throw std::runtime_error("localtime_r failed."); }
+    return dst;
+}
+inline std::tm gmtime_s(const std::time_t* src)
+{
+    std::tm dst;
+    const auto result = ::gmtime_r(src, &dst);
+    if (!result) { throw std::runtime_error("gmtime_r failed."); }
+    return dst;
+}
 #else // fallback. not threadsafe
 inline std::tm localtime_s(const std::time_t* src)
 {
@@ -85,9 +85,9 @@ enum class month_t : std::uint8_t
 
 struct local_date
 {
-    std::int16_t year;   // A.D. (like, 2018)
-    std::uint8_t month;  // [0, 11]
-    std::uint8_t day;    // [1, 31]
+    std::int16_t year{};   // A.D. (like, 2018)
+    std::uint8_t month{};  // [0, 11]
+    std::uint8_t day{};    // [1, 31]
 
     local_date(int y, month_t m, int d)
         : year (static_cast<std::int16_t>(y)),
@@ -181,12 +181,12 @@ operator<<(std::basic_ostream<charT, traits>& os, const local_date& date)
 
 struct local_time
 {
-    std::uint8_t  hour;        // [0, 23]
-    std::uint8_t  minute;      // [0, 59]
-    std::uint8_t  second;      // [0, 60]
-    std::uint16_t millisecond; // [0, 999]
-    std::uint16_t microsecond; // [0, 999]
-    std::uint16_t nanosecond;  // [0, 999]
+    std::uint8_t  hour{};        // [0, 23]
+    std::uint8_t  minute{};      // [0, 59]
+    std::uint8_t  second{};      // [0, 60]
+    std::uint16_t millisecond{}; // [0, 999]
+    std::uint16_t microsecond{}; // [0, 999]
+    std::uint16_t nanosecond{};  // [0, 999]
 
     local_time(int h, int m, int s,
                int ms = 0, int us = 0, int ns = 0)
@@ -297,8 +297,8 @@ operator<<(std::basic_ostream<charT, traits>& os, const local_time& time)
 
 struct time_offset
 {
-    std::int8_t hour;   // [-12, 12]
-    std::int8_t minute; // [-59, 59]
+    std::int8_t hour{};   // [-12, 12]
+    std::int8_t minute{}; // [-59, 59]
 
     time_offset(int h, int m)
         : hour  (static_cast<std::int8_t>(h)),
@@ -364,8 +364,8 @@ operator<<(std::basic_ostream<charT, traits>& os, const time_offset& offset)
 
 struct local_datetime
 {
-    local_date date;
-    local_time time;
+    local_date date{};
+    local_time time{};
 
     local_datetime(local_date d, local_time t): date(d), time(t) {}
 
@@ -478,9 +478,9 @@ operator<<(std::basic_ostream<charT, traits>& os, const local_datetime& dt)
 
 struct offset_datetime
 {
-    local_date  date;
-    local_time  time;
-    time_offset offset;
+    local_date  date{};
+    local_time  time{};
+    time_offset offset{};
 
     offset_datetime(local_date d, local_time t, time_offset o)
         : date(d), time(t), offset(o)

toml/exception.hpp

@@ -2,14 +2,80 @@
 // Distributed under the MIT License.
 #ifndef TOML11_EXCEPTION_HPP
 #define TOML11_EXCEPTION_HPP
-#include <stdexcept>
+
+#include <array>
 #include <string>
+#include <stdexcept>
+
+#include <cstring>
 
 #include "source_location.hpp"
 
 namespace toml
 {
 
+namespace detail
+{
+
+inline std::string str_error(int errnum)
+{
+    // C++ standard strerror is not thread-safe.
+    // C11 provides thread-safe version of this function, `strerror_s`, but it
+    // is not available in C++.
+    // To avoid using std::strerror, we need to use platform-specific functions.
+    // If none of the conditions are met, it calls std::strerror as a fallback.
+#ifdef _MSC_VER // MSVC
+    constexpr std::size_t bufsize = 256;
+    std::array<char, bufsize> buf;
+    buf.fill('\0');
+    const auto result = strerror_s(buf.data(), bufsize, errnum);
+    if(result != 0)
+    {
+        return std::string("strerror_s failed");
+    }
+    else
+    {
+        return std::string(buf.data());
+    }
+#elif defined(_GNU_SOURCE) && !(defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200112L )
+    constexpr std::size_t bufsize = 256;
+    std::array<char, bufsize> buf;
+    buf.fill('\0');
+    const char* result = strerror_r(errnum, buf.data(), bufsize);
+    return std::string(result);
+#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) || ( defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200112L ) // macOS 
+    constexpr std::size_t bufsize = 256;
+    std::array<char, bufsize> buf;
+    buf.fill('\0');
+    const int result = strerror_r(errnum, buf.data(), bufsize);
+    if (result != 0)
+    {
+        return std::string("strerror_r failed");
+    }
+    else
+    {
+        return std::string(buf.data());
+    }
+#else // fallback
+    return std::strerror(errnum);
+#endif
+}
+
+} // detail
+
+struct file_io_error : public std::runtime_error
+{
+  public:
+    file_io_error(int errnum, const std::string& msg, const std::string& fname)
+        : std::runtime_error(msg + " \"" + fname + "\": " + detail::str_error(errnum)),
+          errno_(errnum)
+    {}
+    int get_errno() const noexcept {return errno_;}
+
+  private:
+    int errno_;
+};
+
 struct exception : public std::exception
 {
   public:

toml/from.hpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT License.
 #ifndef TOML11_FROM_HPP
 #define TOML11_FROM_HPP
-#include "traits.hpp"
 
 namespace toml
 {

toml/get.hpp

@@ -140,7 +140,7 @@ get(basic_value<C, M, V>&& v)
 // ============================================================================
 // std::string_view
 
-#if __cplusplus >= 201703L
+#if defined(TOML11_USING_STRING_VIEW) && TOML11_USING_STRING_VIEW>0
 template<typename T, typename C,
          template<typename ...> class M, template<typename ...> class V>
 inline detail::enable_if_t<std::is_same<T, std::string_view>::value, std::string_view>
@@ -215,6 +215,7 @@ template<typename T, typename C,
 detail::enable_if_t<detail::conjunction<
     detail::is_container<T>,                           // T is a container
     detail::negation<detail::has_push_back_method<T>>, // w/o push_back(...)
+    detail::negation<detail::has_specialized_from<T>>, // T does not have special conversion
     detail::negation<                                  // not toml::array
         detail::is_exact_toml_type<T, basic_value<C, M, V>>>
     >::value, T>
@@ -255,19 +256,37 @@ get(const basic_value<C, M, V>&);
 
 // toml::from<T>::from_toml(v)
 template<typename T, typename C,
-         template<typename ...> class M, template<typename ...> class V,
-         std::size_t S = sizeof(::toml::from<T>)>
-T get(const basic_value<C, M, V>&);
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::has_specialized_from<T>::value, T>
+get(const basic_value<C, M, V>&);
 
-// T(const toml::value&) and T is not toml::basic_value
+template<typename T, typename C,
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::has_specialized_from<T>::value, T>
+get(basic_value<C, M, V>&);
+
+// T(const toml::value&) and T is not toml::basic_value,
+// and it does not have `from<T>` nor `from_toml`.
 template<typename T, typename C,
          template<typename ...> class M, template<typename ...> class V>
 detail::enable_if_t<detail::conjunction<
     detail::negation<detail::is_basic_value<T>>,
-    std::is_constructible<T, const basic_value<C, M, V>&>
+    std::is_constructible<T, const basic_value<C, M, V>&>,
+    detail::negation<detail::has_from_toml_method<T, C, M, V>>,
+    detail::negation<detail::has_specialized_from<T>>
     >::value, T>
 get(const basic_value<C, M, V>&);
 
+template<typename T, typename C,
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::conjunction<
+    detail::negation<detail::is_basic_value<T>>,
+    std::is_constructible<T, basic_value<C, M, V>&>,
+    detail::negation<detail::has_from_toml_method<T, C, M, V>>,
+    detail::negation<detail::has_specialized_from<T>>
+    >::value, T>
+get(basic_value<C, M, V>&);
+
 // ============================================================================
 // array-like types; most likely STL container, like std::vector, etc.
 
@@ -321,6 +340,7 @@ template<typename T, typename C,
 detail::enable_if_t<detail::conjunction<
     detail::is_container<T>,                           // T is a container
     detail::negation<detail::has_push_back_method<T>>, // w/o push_back
+    detail::negation<detail::has_specialized_from<T>>, // T does not have special conversion
     detail::negation<                                  // T is not toml::array
         detail::is_exact_toml_type<T, basic_value<C, M, V>>>
     >::value, T>
@@ -338,8 +358,10 @@ get(const basic_value<C, M, V>& v)
                 {v.location(), "here"}
             }));
     }
-    std::transform(ar.cbegin(), ar.cend(), container.begin(),
-                   [](const value& x){return ::toml::get<value_type>(x);});
+    for(std::size_t i=0; i<ar.size(); ++i)
+    {
+        container[i] = ::toml::get<value_type>(ar[i]);
+    }
     return container;
 }
 
@@ -438,9 +460,16 @@ get(const basic_value<C, M, V>& v)
     return ud;
 }
 template<typename T, typename C,
-         template<typename ...> class M, template<typename ...> class V,
-         std::size_t>
-T get(const basic_value<C, M, V>& v)
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::has_specialized_from<T>::value, T>
+get(const basic_value<C, M, V>& v)
+{
+    return ::toml::from<T>::from_toml(v);
+}
+template<typename T, typename C,
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::has_specialized_from<T>::value, T>
+get(basic_value<C, M, V>& v)
 {
     return ::toml::from<T>::from_toml(v);
 }
@@ -448,14 +477,29 @@ T get(const basic_value<C, M, V>& v)
 template<typename T, typename C,
          template<typename ...> class M, template<typename ...> class V>
 detail::enable_if_t<detail::conjunction<
-    detail::negation<detail::is_basic_value<T>>,
-    std::is_constructible<T, const basic_value<C, M, V>&>
+    detail::negation<detail::is_basic_value<T>>,                // T is not a toml::value
+    std::is_constructible<T, const basic_value<C, M, V>&>,      // T is constructible from toml::value
+    detail::negation<detail::has_from_toml_method<T, C, M, V>>, // and T does not have T.from_toml(v);
+    detail::negation<detail::has_specialized_from<T>>           // and T does not have toml::from<T>{};
     >::value, T>
 get(const basic_value<C, M, V>& v)
 {
     return T(v);
 }
 
+template<typename T, typename C,
+         template<typename ...> class M, template<typename ...> class V>
+detail::enable_if_t<detail::conjunction<
+    detail::negation<detail::is_basic_value<T>>,                // T is not a toml::value
+    std::is_constructible<T, basic_value<C, M, V>&>,      // T is constructible from toml::value
+    detail::negation<detail::has_from_toml_method<T, C, M, V>>, // and T does not have T.from_toml(v);
+    detail::negation<detail::has_specialized_from<T>>           // and T does not have toml::from<T>{};
+    >::value, T>
+get(basic_value<C, M, V>& v)
+{
+    return T(v);
+}
+
 // ============================================================================
 // find
 
@@ -1031,6 +1075,50 @@ find_or(const basic_value<C, M, V>& v, const toml::key& ky, T&& opt)
     return get_or(tab.at(ky), std::forward<T>(opt));
 }
 
+// ---------------------------------------------------------------------------
+// recursive find-or with type deduction (find_or(value, keys, opt))
+
+template<typename Value, typename ... Ks,
+         typename detail::enable_if_t<(sizeof...(Ks) > 1), std::nullptr_t> = nullptr>
+         // here we need to add SFINAE in the template parameter to avoid
+         // infinite recursion in type deduction on gcc
+auto find_or(Value&& v, const toml::key& ky, Ks&& ... keys)
+    -> decltype(find_or(std::forward<Value>(v), ky, detail::last_one(std::forward<Ks>(keys)...)))
+{
+    if(!v.is_table())
+    {
+        return detail::last_one(std::forward<Ks>(keys)...);
+    }
+    auto&& tab = std::forward<Value>(v).as_table();
+    if(tab.count(ky) == 0)
+    {
+        return detail::last_one(std::forward<Ks>(keys)...);
+    }
+    return find_or(std::forward<decltype(tab)>(tab).at(ky), std::forward<Ks>(keys)...);
+}
+
+// ---------------------------------------------------------------------------
+// recursive find_or with explicit type specialization, find_or<int>(value, keys...)
+
+template<typename T, typename Value, typename ... Ks,
+         typename detail::enable_if_t<(sizeof...(Ks) > 1), std::nullptr_t> = nullptr>
+         // here we need to add SFINAE in the template parameter to avoid
+         // infinite recursion in type deduction on gcc
+auto find_or(Value&& v, const toml::key& ky, Ks&& ... keys)
+    -> decltype(find_or<T>(std::forward<Value>(v), ky, detail::last_one(std::forward<Ks>(keys)...)))
+{
+    if(!v.is_table())
+    {
+        return detail::last_one(std::forward<Ks>(keys)...);
+    }
+    auto&& tab = std::forward<Value>(v).as_table();
+    if(tab.count(ky) == 0)
+    {
+        return detail::last_one(std::forward<Ks>(keys)...);
+    }
+    return find_or(std::forward<decltype(tab)>(tab).at(ky), std::forward<Ks>(keys)...);
+}
+
 // ============================================================================
 // expect
 

toml/into.hpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT License.
 #ifndef TOML11_INTO_HPP
 #define TOML11_INTO_HPP
-#include "traits.hpp"
 
 namespace toml
 {

toml/lexer.hpp

@@ -5,7 +5,6 @@
 #include <istream>
 #include <sstream>
 #include <stdexcept>
-#include <fstream>
 
 #include "combinator.hpp"
 
@@ -119,8 +118,8 @@ using lex_local_time       = lex_partial_time;
 // ===========================================================================
 
 using lex_quotation_mark  = character<'"'>;
-using lex_basic_unescaped = exclude<either<in_range<0x00, 0x08>, // 0x09 (tab)
-                                           in_range<0x0a, 0x1F>, // is allowed
+using lex_basic_unescaped = exclude<either<in_range<0x00, 0x08>, // 0x09 (tab) is allowed
+                                           in_range<0x0A, 0x1F>,
                                            character<0x22>, character<0x5C>,
                                            character<0x7F>>>;
 
@@ -133,6 +132,9 @@ using lex_escape_seq_char = either<character<'"'>, character<'\\'>,
                                    character<'b'>, character<'f'>,
                                    character<'n'>, character<'r'>,
                                    character<'t'>,
+#ifdef TOML11_USE_UNRELEASED_TOML_FEATURES
+                                   character<'e'>, // ESC (0x1B)
+#endif
                                    lex_escape_unicode_short,
                                    lex_escape_unicode_long
                                    >;
@@ -166,7 +168,7 @@ using lex_basic_string = sequence<lex_quotation_mark,
 //     |                                                               ^- expected newline, but got '"'.
 // ```
 // As a quick workaround for this problem, `lex_ml_basic_string_delim` was
-// splitted into two, `lex_ml_basic_string_open` and `lex_ml_basic_string_close`.
+// split into two, `lex_ml_basic_string_open` and `lex_ml_basic_string_close`.
 // `lex_ml_basic_string_open` allows only `"""`. `_close` allows 3-5 `"`s.
 // In parse_ml_basic_string() function, the trailing `"`s will be attached to
 // the string body.
@@ -178,8 +180,8 @@ using lex_ml_basic_string_close = sequence<
         maybe<lex_quotation_mark>, maybe<lex_quotation_mark>
     >;
 
-using lex_ml_basic_unescaped    = exclude<either<in_range<0x00, 0x08>, // 0x09
-                                                 in_range<0x0a, 0x1F>, // is tab
+using lex_ml_basic_unescaped    = exclude<either<in_range<0x00, 0x08>, // 0x09 is tab
+                                                 in_range<0x0A, 0x1F>,
                                                  character<0x5C>, // backslash
                                                  character<0x7F>, // DEL
                                                  lex_ml_basic_string_delim>>;
@@ -196,8 +198,8 @@ using lex_ml_basic_string = sequence<lex_ml_basic_string_open,
                                      lex_ml_basic_body,
                                      lex_ml_basic_string_close>;
 
-using lex_literal_char = exclude<either<in_range<0x00, 0x08>,
-                                        in_range<0x10, 0x19>, character<0x27>>>;
+using lex_literal_char = exclude<either<in_range<0x00, 0x08>, in_range<0x0A, 0x1F>,
+                                        character<0x7F>, character<0x27>>>;
 using lex_apostrophe = character<'\''>;
 using lex_literal_string = sequence<lex_apostrophe,
                                     repeat<lex_literal_char, unlimited>,
@@ -212,7 +214,7 @@ using lex_ml_literal_string_close = sequence<
     >;
 
 using lex_ml_literal_char = exclude<either<in_range<0x00, 0x08>,
-                                           in_range<0x10, 0x1F>,
+                                           in_range<0x0A, 0x1F>,
                                            character<0x7F>,
                                            lex_ml_literal_string_delim>>;
 using lex_ml_literal_body = repeat<either<lex_ml_literal_char, lex_newline>,
@@ -225,12 +227,6 @@ using lex_string = either<lex_ml_basic_string,   lex_basic_string,
                           lex_ml_literal_string, lex_literal_string>;
 
 // ===========================================================================
-
-using lex_comment_start_symbol = character<'#'>;
-using lex_non_eol = either<character<'\t'>, exclude<in_range<0x00, 0x19>>>;
-using lex_comment = sequence<lex_comment_start_symbol,
-                             repeat<lex_non_eol, unlimited>>;
-
 using lex_dot_sep = sequence<maybe<lex_ws>, character<'.'>, maybe<lex_ws>>;
 
 using lex_unquoted_key = repeat<either<lex_alpha, lex_digit,
@@ -265,6 +261,34 @@ using lex_array_table       = sequence<lex_array_table_open,
                                        maybe<lex_ws>,
                                        lex_array_table_close>;
 
+using lex_utf8_1byte = in_range<0x00, 0x7F>;
+using lex_utf8_2byte = sequence<
+        in_range<'\xC2', '\xDF'>,
+        in_range<'\x80', '\xBF'>
+    >;
+using lex_utf8_3byte = sequence<either<
+        sequence<character<'\xE0'>, in_range<'\xA0', '\xBF'>>,
+        sequence<in_range<'\xE1', '\xEC'>, in_range<'\x80', '\xBF'>>,
+        sequence<character<'\xED'>, in_range<'\x80', '\x9F'>>,
+        sequence<in_range<'\xEE', '\xEF'>, in_range<'\x80', '\xBF'>>
+    >, in_range<'\x80', '\xBF'>>;
+using lex_utf8_4byte = sequence<either<
+        sequence<character<'\xF0'>, in_range<'\x90', '\xBF'>>,
+        sequence<in_range<'\xF1', '\xF3'>, in_range<'\x80', '\xBF'>>,
+        sequence<character<'\xF4'>, in_range<'\x80', '\x8F'>>
+    >, in_range<'\x80', '\xBF'>, in_range<'\x80', '\xBF'>>;
+using lex_utf8_code = either<
+        lex_utf8_1byte,
+        lex_utf8_2byte,
+        lex_utf8_3byte,
+        lex_utf8_4byte
+    >;
+
+using lex_comment_start_symbol = character<'#'>;
+using lex_non_eol_ascii = either<character<0x09>, in_range<0x20, 0x7E>>;
+using lex_comment = sequence<lex_comment_start_symbol, repeat<either<
+    lex_non_eol_ascii, lex_utf8_2byte, lex_utf8_3byte, lex_utf8_4byte>, unlimited>>;
+
 } // detail
 } // toml
 #endif // TOML_LEXER_HPP

toml/literal.hpp

@@ -12,8 +12,11 @@ inline namespace toml_literals
 {
 
 // implementation
-inline ::toml::value literal_internal_impl(::toml::detail::location loc)
+inline ::toml::basic_value<TOML11_DEFAULT_COMMENT_STRATEGY, std::unordered_map, std::vector>
+literal_internal_impl(::toml::detail::location loc)
 {
+    using value_type = ::toml::basic_value<
+        TOML11_DEFAULT_COMMENT_STRATEGY, std::unordered_map, std::vector>;
     // if there are some comments or empty lines, skip them.
     using skip_line = ::toml::detail::repeat<toml::detail::sequence<
             ::toml::detail::maybe<::toml::detail::lex_ws>,
@@ -50,7 +53,7 @@ inline ::toml::value literal_internal_impl(::toml::detail::location loc)
     // If it is neither a table-key or a array-of-table-key, it may be a value.
     if(!is_table_key && !is_aots_key)
     {
-        if(auto data = ::toml::detail::parse_value<::toml::value>(loc))
+        if(auto data = ::toml::detail::parse_value<value_type>(loc, 0))
         {
             return data.unwrap();
         }
@@ -67,7 +70,7 @@ inline ::toml::value literal_internal_impl(::toml::detail::location loc)
     // It is a valid toml file.
     // It should be parsed as if we parse a file with this content.
 
-    if(auto data = ::toml::detail::parse_toml_file<::toml::value>(loc))
+    if(auto data = ::toml::detail::parse_toml_file<value_type>(loc))
     {
         return data.unwrap();
     }
@@ -78,11 +81,13 @@ inline ::toml::value literal_internal_impl(::toml::detail::location loc)
 
 }
 
-inline ::toml::value operator"" _toml(const char* str, std::size_t len)
+inline ::toml::basic_value<TOML11_DEFAULT_COMMENT_STRATEGY, std::unordered_map, std::vector>
+operator"" _toml(const char* str, std::size_t len)
 {
     ::toml::detail::location loc(
             std::string("TOML literal encoded in a C++ code"),
             std::vector<char>(str, str + len));
+    // literal length does not include the null character at the end.
     return literal_internal_impl(std::move(loc));
 }
 
@@ -91,7 +96,8 @@ inline ::toml::value operator"" _toml(const char* str, std::size_t len)
 #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
 // value of u8"" literal has been changed from char to char8_t and char8_t is
 // NOT compatible to char
-inline ::toml::value operator"" _toml(const char8_t* str, std::size_t len)
+inline ::toml::basic_value<TOML11_DEFAULT_COMMENT_STRATEGY, std::unordered_map, std::vector>
+operator"" _toml(const char8_t* str, std::size_t len)
 {
     ::toml::detail::location loc(
             std::string("TOML literal encoded in a C++ code"),

toml/macros.hpp

@@ -0,0 +1,121 @@
+#ifndef TOML11_MACROS_HPP
+#define TOML11_MACROS_HPP
+
+#define TOML11_STRINGIZE_AUX(x) #x
+#define TOML11_STRINGIZE(x)     TOML11_STRINGIZE_AUX(x)
+
+#define TOML11_CONCATENATE_AUX(x, y) x##y
+#define TOML11_CONCATENATE(x, y)     TOML11_CONCATENATE_AUX(x, y)
+
+// ============================================================================
+// TOML11_DEFINE_CONVERSION_NON_INTRUSIVE
+
+#ifndef TOML11_WITHOUT_DEFINE_NON_INTRUSIVE
+
+// ----------------------------------------------------------------------------
+// TOML11_ARGS_SIZE
+
+#define TOML11_INDEX_RSEQ() \
+    32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, \
+    16, 15, 14, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  1, 0
+#define TOML11_ARGS_SIZE_IMPL(\
+    ARG1,  ARG2,  ARG3,  ARG4,  ARG5,  ARG6,  ARG7,  ARG8,  ARG9,  ARG10, \
+    ARG11, ARG12, ARG13, ARG14, ARG15, ARG16, ARG17, ARG18, ARG19, ARG20, \
+    ARG21, ARG22, ARG23, ARG24, ARG25, ARG26, ARG27, ARG28, ARG29, ARG30, \
+    ARG31, ARG32, N, ...) N
+#define TOML11_ARGS_SIZE_AUX(...) TOML11_ARGS_SIZE_IMPL(__VA_ARGS__)
+#define TOML11_ARGS_SIZE(...) TOML11_ARGS_SIZE_AUX(__VA_ARGS__, TOML11_INDEX_RSEQ())
+
+// ----------------------------------------------------------------------------
+// TOML11_FOR_EACH_VA_ARGS
+
+#define TOML11_FOR_EACH_VA_ARGS_AUX_1( FUNCTOR, ARG1     ) FUNCTOR(ARG1)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_2( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_1( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_3( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_2( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_4( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_3( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_5( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_4( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_6( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_5( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_7( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_6( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_8( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_7( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_9( FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_8( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_10(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_9( FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_11(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_10(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_12(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_11(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_13(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_12(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_14(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_13(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_15(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_14(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_16(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_15(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_17(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_16(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_18(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_17(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_19(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_18(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_20(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_19(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_21(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_20(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_22(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_21(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_23(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_22(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_24(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_23(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_25(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_24(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_26(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_25(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_27(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_26(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_28(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_27(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_29(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_28(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_30(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_29(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_31(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_30(FUNCTOR, __VA_ARGS__)
+#define TOML11_FOR_EACH_VA_ARGS_AUX_32(FUNCTOR, ARG1, ...) FUNCTOR(ARG1) TOML11_FOR_EACH_VA_ARGS_AUX_31(FUNCTOR, __VA_ARGS__)
+
+#define TOML11_FOR_EACH_VA_ARGS(FUNCTOR, ...)\
+    TOML11_CONCATENATE(TOML11_FOR_EACH_VA_ARGS_AUX_, TOML11_ARGS_SIZE(__VA_ARGS__))(FUNCTOR, __VA_ARGS__)
+
+// ----------------------------------------------------------------------------
+// TOML11_DEFINE_CONVERSION_NON_INTRUSIVE
+
+// use it in the following way.
+// ```cpp
+// namespace foo
+// {
+// struct Foo
+// {
+//     std::string s;
+//     double      d;
+//     int         i;
+// };
+// } // foo
+//
+// TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(foo::Foo, s, d, i)
+// ```
+// And then you can use `toml::find<foo::Foo>(file, "foo");`
+//
+#define TOML11_FIND_MEMBER_VARIABLE_FROM_VALUE(VAR_NAME)\
+    obj.VAR_NAME = toml::find<decltype(obj.VAR_NAME)>(v, TOML11_STRINGIZE(VAR_NAME));
+
+#define TOML11_ASSIGN_MEMBER_VARIABLE_TO_VALUE(VAR_NAME)\
+    v[TOML11_STRINGIZE(VAR_NAME)] = obj.VAR_NAME;
+
+#define TOML11_DEFINE_CONVERSION_NON_INTRUSIVE(NAME, ...)\
+    namespace toml {                                                                     \
+    template<>                                                                           \
+    struct from<NAME>                                                                    \
+    {                                                                                    \
+        template<typename C, template<typename ...> class T,                             \
+                 template<typename ...> class A>                                         \
+        static NAME from_toml(const basic_value<C, T, A>& v)                             \
+        {                                                                                \
+            NAME obj;                                                                    \
+            TOML11_FOR_EACH_VA_ARGS(TOML11_FIND_MEMBER_VARIABLE_FROM_VALUE, __VA_ARGS__) \
+            return obj;                                                                  \
+        }                                                                                \
+    };                                                                                   \
+    template<>                                                                           \
+    struct into<NAME>                                                                    \
+    {                                                                                    \
+        static value into_toml(const NAME& obj)                                          \
+        {                                                                                \
+            ::toml::value v = ::toml::table{};                                           \
+            TOML11_FOR_EACH_VA_ARGS(TOML11_ASSIGN_MEMBER_VARIABLE_TO_VALUE, __VA_ARGS__) \
+            return v;                                                                    \
+        }                                                                                \
+    };                                                                                   \
+    } /* toml */
+
+#endif// TOML11_WITHOUT_DEFINE_NON_INTRUSIVE
+
+#endif// TOML11_MACROS_HPP

toml/region.hpp

@@ -70,16 +70,16 @@ struct region_base
 struct location final : public region_base
 {
     using const_iterator  = typename std::vector<char>::const_iterator;
-    using difference_type = typename const_iterator::difference_type;
+    using difference_type = typename std::iterator_traits<const_iterator>::difference_type;
     using source_ptr      = std::shared_ptr<const std::vector<char>>;
 
-    location(std::string name, std::vector<char> cont)
+    location(std::string source_name, std::vector<char> cont)
       : source_(std::make_shared<std::vector<char>>(std::move(cont))),
-        line_number_(1), source_name_(std::move(name)), iter_(source_->cbegin())
+        line_number_(1), source_name_(std::move(source_name)), iter_(source_->cbegin())
     {}
-    location(std::string name, const std::string& cont)
+    location(std::string source_name, const std::string& cont)
       : source_(std::make_shared<std::vector<char>>(cont.begin(), cont.end())),
-        line_number_(1), source_name_(std::move(name)), iter_(source_->cbegin())
+        line_number_(1), source_name_(std::move(source_name)), iter_(source_->cbegin())
     {}
 
     location(const location&) = default;
@@ -92,7 +92,7 @@ struct location final : public region_base
     char front() const noexcept override {return *iter_;}
 
     // this const prohibits codes like `++(loc.iter())`.
-    const const_iterator iter()  const noexcept {return iter_;}
+    std::add_const<const_iterator>::type iter()  const noexcept {return iter_;}
 
     const_iterator begin() const noexcept {return source_->cbegin();}
     const_iterator end()   const noexcept {return source_->cend();}
@@ -227,8 +227,7 @@ struct region final : public region_base
     region& operator+=(const region& other)
     {
         // different regions cannot be concatenated
-        assert(this->begin() == other.begin() && this->end() == other.end() &&
-               this->last_   == other.first_);
+        assert(this->source_ == other.source_ && this->last_ == other.first_);
 
         this->last_ = other.last_;
         return *this;
@@ -343,9 +342,9 @@ struct region final : public region_base
                             }))
                     {
                         // unwrap the first '#' by std::next.
-                        auto str = make_string(std::next(comment_found), iter);
-                        if(str.back() == '\r') {str.pop_back();}
-                        com.push_back(std::move(str));
+                        auto s = make_string(std::next(comment_found), iter);
+                        if(!s.empty() && s.back() == '\r') {s.pop_back();}
+                        com.push_back(std::move(s));
                     }
                     else
                     {
@@ -396,9 +395,9 @@ struct region final : public region_base
                     }))
                 {
                     // unwrap the first '#' by std::next.
-                    auto str = make_string(std::next(comment_found), this->line_end());
-                    if(str.back() == '\r') {str.pop_back();}
-                    com.push_back(std::move(str));
+                    auto s = make_string(std::next(comment_found), this->line_end());
+                    if(!s.empty() && s.back() == '\r') {s.pop_back();}
+                    com.push_back(std::move(s));
                 }
             }
         }

toml/serializer.hpp

@@ -2,10 +2,19 @@
 // Distributed under the MIT License.
 #ifndef TOML11_SERIALIZER_HPP
 #define TOML11_SERIALIZER_HPP
+#include <cmath>
 #include <cstdio>
 
 #include <limits>
 
+#if defined(_WIN32)
+#include <locale.h>
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+#include <xlocale.h>
+#elif defined(__linux__)
+#include <locale.h>
+#endif
+
 #include "lexer.hpp"
 #include "value.hpp"
 
@@ -26,19 +35,24 @@ namespace toml
 // a `"` and escaping some special character is boring.
 template<typename charT, typename traits, typename Alloc>
 std::basic_string<charT, traits, Alloc>
-format_key(const std::basic_string<charT, traits, Alloc>& key)
+format_key(const std::basic_string<charT, traits, Alloc>& k)
 {
+    if(k.empty())
+    {
+        return std::string("\"\"");
+    }
+
     // check the key can be a bare (unquoted) key
-    detail::location loc(key, std::vector<char>(key.begin(), key.end()));
+    detail::location loc(k, std::vector<char>(k.begin(), k.end()));
     detail::lex_unquoted_key::invoke(loc);
     if(loc.iter() == loc.end())
     {
-        return key; // all the tokens are consumed. the key is unquoted-key.
+        return k; // all the tokens are consumed. the key is unquoted-key.
     }
 
     //if it includes special characters, then format it in a "quoted" key.
     std::basic_string<charT, traits, Alloc> serialized("\"");
-    for(const char c : key)
+    for(const char c : k)
     {
         switch(c)
         {
@@ -49,7 +63,19 @@ format_key(const std::basic_string<charT, traits, Alloc>& key)
             case '\f': {serialized += "\\f";  break;}
             case '\n': {serialized += "\\n";  break;}
             case '\r': {serialized += "\\r";  break;}
-            default  : {serialized += c;      break;}
+            default: {
+                if (c >= 0x00 && c < 0x20)
+                {
+                    std::array<char, 7> buf;
+                    std::snprintf(buf.data(), buf.size(), "\\u00%02x", static_cast<int>(c));
+                    serialized += buf.data();
+                }
+                else
+                {
+                    serialized += c;
+                }
+                break;
+            }
         }
     }
     serialized += "\"";
@@ -60,9 +86,12 @@ template<typename charT, typename traits, typename Alloc>
 std::basic_string<charT, traits, Alloc>
 format_keys(const std::vector<std::basic_string<charT, traits, Alloc>>& keys)
 {
-    std::basic_string<charT, traits, Alloc> serialized;
-    if(keys.empty()) {return serialized;}
+    if(keys.empty())
+    {
+        return std::string("\"\"");
+    }
 
+    std::basic_string<charT, traits, Alloc> serialized;
     for(const auto& ky : keys)
     {
         serialized += format_key(ky);
@@ -97,8 +126,10 @@ struct serializer
                const int         float_prec     = std::numeric_limits<toml::floating>::max_digits10,
                const bool        can_be_inlined = false,
                const bool        no_comment     = false,
-               std::vector<toml::key> ks        = {})
+               std::vector<toml::key> ks        = {},
+               const bool     value_has_comment = false)
         : can_be_inlined_(can_be_inlined), no_comment_(no_comment),
+          value_has_comment_(value_has_comment && !no_comment),
           float_prec_(float_prec), width_(w), keys_(std::move(ks))
     {}
     ~serializer() = default;
@@ -109,18 +140,93 @@ struct serializer
     }
     std::string operator()(const integer_type i) const
     {
-        return std::to_string(i);
+#if defined(_WIN32)
+        _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+        const std::string original_locale(setlocale(LC_NUMERIC, nullptr));
+        setlocale(LC_NUMERIC, "C");
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+        const auto c_locale = newlocale(LC_NUMERIC_MASK, "C", locale_t(0));
+        locale_t original_locale(0);
+        if(c_locale != locale_t(0))
+        {
+            original_locale = uselocale(c_locale);
+        }
+#endif
+
+        const auto str = std::to_string(i);
+
+#if defined(_WIN32)
+        setlocale(LC_NUMERIC, original_locale.c_str());
+        _configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+        if(original_locale != locale_t(0))
+        {
+            uselocale(original_locale);
+        }
+#endif
+        return str;
     }
     std::string operator()(const floating_type f) const
     {
+        if(std::isnan(f))
+        {
+            if(std::signbit(f))
+            {
+                return std::string("-nan");
+            }
+            else
+            {
+                return std::string("nan");
+            }
+        }
+        else if(!std::isfinite(f))
+        {
+            if(std::signbit(f))
+            {
+                return std::string("-inf");
+            }
+            else
+            {
+                return std::string("inf");
+            }
+        }
+
+        // set locale to "C".
+        // To make it thread-local, we use OS-specific features.
+        // If we set process-global locale, it can break other thread that also
+        // outputs something simultaneously.
+#if defined(_WIN32)
+        _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+        const std::string original_locale(setlocale(LC_NUMERIC, nullptr));
+        setlocale(LC_NUMERIC, "C");
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+        const auto c_locale = newlocale(LC_NUMERIC_MASK, "C", locale_t(0));
+        locale_t original_locale(0);
+        if(c_locale != locale_t(0))
+        {
+            original_locale = uselocale(c_locale);
+        }
+#endif
+
         const auto fmt = "%.*g";
         const auto bsz = std::snprintf(nullptr, 0, fmt, this->float_prec_, f);
         // +1 for null character(\0)
         std::vector<char> buf(static_cast<std::size_t>(bsz + 1), '\0');
         std::snprintf(buf.data(), buf.size(), fmt, this->float_prec_, f);
 
+        // restore the original locale
+#if defined(_WIN32)
+        setlocale(LC_NUMERIC, original_locale.c_str());
+        _configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+        if(original_locale != locale_t(0))
+        {
+            uselocale(original_locale);
+        }
+#endif
+
         std::string token(buf.begin(), std::prev(buf.end()));
-        if(token.back() == '.') // 1. => 1.0
+        if(!token.empty() && token.back() == '.') // 1. => 1.0
         {
             token += '0';
         }
@@ -144,8 +250,9 @@ struct serializer
     {
         if(s.kind == string_t::basic)
         {
-            if(std::find(s.str.cbegin(), s.str.cend(), '\n') != s.str.cend() ||
-               std::find(s.str.cbegin(), s.str.cend(), '\"') != s.str.cend())
+            if((std::find(s.str.cbegin(), s.str.cend(), '\n') != s.str.cend() ||
+                std::find(s.str.cbegin(), s.str.cend(), '\"') != s.str.cend()) &&
+               this->width_ != (std::numeric_limits<std::size_t>::max)())
             {
                 // if linefeed or double-quote is contained,
                 // make it multiline basic string.
@@ -244,92 +351,18 @@ struct serializer
 
     std::string operator()(const array_type& v) const
     {
-        if(!v.empty() && v.front().is_table())// v is an array of tables
-        {
-            // if it's not inlined, we need to add `[[table.key]]`.
-            // but if it can be inlined,
-            // ```
-            // table.key = [
-            //   {...},
-            //   # comment
-            //   {...},
-            // ]
-            // ```
-            if(this->can_be_inlined_)
-            {
-                std::string token;
-                if(!keys_.empty())
-                {
-                    token += format_key(keys_.back());
-                    token += " = ";
-                }
-                bool failed = false;
-                token += "[\n";
-                for(const auto& item : v)
-                {
-                    // if an element of the table has a comment, the table
-                    // cannot be inlined.
-                    if(this->has_comment_inside(item.as_table()))
-                    {
-                        failed = true;
-                        break;
-                    }
-                    if(!no_comment_)
-                    {
-                        for(const auto& c : item.comments())
-                        {
-                            token += '#';
-                            token += c;
-                            token += '\n';
-                        }
-                    }
-
-                    const auto t = this->make_inline_table(item.as_table());
-
-                    if(t.size() + 1 > width_ || // +1 for the last comma {...},
-                       std::find(t.cbegin(), t.cend(), '\n') != t.cend())
-                    {
-                        failed = true;
-                        break;
-                    }
-                    token += t;
-                    token += ",\n";
-                }
-                if(!failed)
-                {
-                    token += "]\n";
-                    return token;
-                }
-                // if failed, serialize them as [[array.of.tables]].
-            }
-
-            std::string token;
-            for(const auto& item : v)
-            {
-                if(!no_comment_)
-                {
-                    for(const auto& c : item.comments())
-                    {
-                        token += '#';
-                        token += c;
-                        token += '\n';
-                    }
-                }
-                token += "[[";
-                token += format_keys(keys_);
-                token += "]]\n";
-                token += this->make_multiline_table(item.as_table());
-            }
-            return token;
-        }
         if(v.empty())
         {
             return std::string("[]");
         }
+        if(this->is_array_of_tables(v))
+        {
+            return make_array_of_tables(v);
+        }
 
         // not an array of tables. normal array.
         // first, try to make it inline if none of the elements have a comment.
-        if(!this->has_comment_inside(v))
+        if( ! this->has_comment_inside(v))
         {
             const auto inl = this->make_inline_array(v);
             if(inl.size() < this->width_ &&
@@ -350,7 +383,7 @@ struct serializer
         token += "[\n";
         for(const auto& item : v)
         {
-            if(!item.comments().empty() && !no_comment_)
+            if( ! item.comments().empty() && !no_comment_)
             {
                 // if comment exists, the element must be the only element in the line.
                 // e.g. the following is not allowed.
@@ -376,15 +409,25 @@ struct serializer
                     token += '\n';
                 }
                 token += toml::visit(*this, item);
-                if(token.back() == '\n') {token.pop_back();}
+                if(!token.empty() && token.back() == '\n') {token.pop_back();}
                 token += ",\n";
                 continue;
             }
             std::string next_elem;
-            next_elem += toml::visit(*this, item);
+            if(item.is_table())
+            {
+                serializer ser(*this);
+                ser.can_be_inlined_ = true;
+                ser.width_ = (std::numeric_limits<std::size_t>::max)();
+                next_elem += toml::visit(ser, item);
+            }
+            else
+            {
+                next_elem += toml::visit(*this, item);
+            }
 
             // comma before newline.
-            if(next_elem.back() == '\n') {next_elem.pop_back();}
+            if(!next_elem.empty() && next_elem.back() == '\n') {next_elem.pop_back();}
 
             // if current line does not exceeds the width limit, continue.
             if(current_line.size() + next_elem.size() + 1 < this->width_)
@@ -411,7 +454,10 @@ struct serializer
         }
         if(!current_line.empty())
         {
-            if(current_line.back() != '\n') {current_line += '\n';}
+            if(!current_line.empty() && current_line.back() != '\n')
+            {
+                current_line += '\n';
+            }
             token += current_line;
         }
         token += "]\n";
@@ -467,7 +513,19 @@ struct serializer
                 case '\f': {retval += "\\f";  break;}
                 case '\n': {retval += "\\n";  break;}
                 case '\r': {retval += "\\r";  break;}
-                default  : {retval += c;      break;}
+                default  :
+                {
+                    if((0x00 <= c && c <= 0x08) || (0x0A <= c && c <= 0x1F) || c == 0x7F)
+                    {
+                        retval += "\\u00";
+                        retval += char(48 + (c / 16));
+                        retval += char((c % 16 < 10 ? 48 : 55) + (c % 16));
+                    }
+                    else
+                    {
+                        retval += c;
+                    }
+                }
             }
         }
         return retval;
@@ -501,7 +559,21 @@ struct serializer
                     }
                     break;
                 }
-                default: {retval += *i; break;}
+                default  :
+                {
+                    const auto c = *i;
+                    if((0x00 <= c && c <= 0x08) || (0x0A <= c && c <= 0x1F) || c == 0x7F)
+                    {
+                        retval += "\\u00";
+                        retval += char(48 + (c / 16));
+                        retval += char((c % 16 < 10 ? 48 : 55) + (c % 16));
+                    }
+                    else
+                    {
+                        retval += c;
+                    }
+                }
+
             }
         }
         // Only 1 or 2 consecutive `"`s are allowed in multiline basic string.
@@ -557,8 +629,10 @@ struct serializer
         for(const auto& item : v)
         {
             if(is_first) {is_first = false;} else {token += ',';}
-            token += visit(serializer((std::numeric_limits<std::size_t>::max)(),
-                                      this->float_prec_, true), item);
+            token += visit(serializer(
+                (std::numeric_limits<std::size_t>::max)(), this->float_prec_,
+                /* inlined */ true, /*no comment*/ false, /*keys*/ {},
+                /*has_comment*/ !item.comments().empty()), item);
         }
         token += ']';
         return token;
@@ -577,8 +651,10 @@ struct serializer
             if(is_first) {is_first = false;} else {token += ',';}
             token += format_key(kv.first);
             token += '=';
-            token += visit(serializer((std::numeric_limits<std::size_t>::max)(),
-                                      this->float_prec_, true), kv.second);
+            token += visit(serializer(
+                (std::numeric_limits<std::size_t>::max)(), this->float_prec_,
+                /* inlined */ true, /*no comment*/ false, /*keys*/ {},
+                /*has_comment*/ !kv.second.comments().empty()), kv.second);
         }
         token += '}';
         return token;
@@ -588,8 +664,16 @@ struct serializer
     {
         std::string token;
 
-        // print non-table stuff first. because after printing [foo.bar], the
-        // remaining non-table values will be assigned into [foo.bar], not [foo]
+        // print non-table elements first.
+        // ```toml
+        // [foo]         # a table we're writing now here
+        // key = "value" # <- non-table element, "key"
+        // # ...
+        // [foo.bar] # <- table element, "bar"
+        // ```
+        // because after printing [foo.bar], the remaining non-table values will
+        // be assigned into [foo.bar], not [foo]. Those values should be printed
+        // earlier.
         for(const auto& kv : v)
         {
             if(kv.second.is_table() || is_array_of_tables(kv.second))
@@ -597,21 +681,16 @@ struct serializer
                 continue;
             }
 
-            if(!kv.second.comments().empty() && !no_comment_)
-            {
-                for(const auto& c : kv.second.comments())
-                {
-                    token += '#';
-                    token += c;
-                    token += '\n';
-                }
-            }
+            token += write_comments(kv.second);
+
             const auto key_and_sep    = format_key(kv.first) + " = ";
             const auto residual_width = (this->width_ > key_and_sep.size()) ?
                                         this->width_ - key_and_sep.size() : 0;
             token += key_and_sep;
-            token += visit(serializer(residual_width, this->float_prec_, true),
-                           kv.second);
+            token += visit(serializer(residual_width, this->float_prec_,
+                /*can be inlined*/ true, /*no comment*/ false, /*keys*/ {},
+                /*has_comment*/ !kv.second.comments().empty()), kv.second);
+
             if(token.back() != '\n')
             {
                 token += '\n';
@@ -637,45 +716,172 @@ struct serializer
             ks.push_back(kv.first);
 
             auto tmp = visit(serializer(this->width_, this->float_prec_,
-                !multiline_table_printed, this->no_comment_, ks),
-                kv.second);
+                !multiline_table_printed, this->no_comment_, ks,
+                /*has_comment*/ !kv.second.comments().empty()), kv.second);
 
+            // If it is the first time to print a multi-line table, it would be
+            // helpful to separate normal key-value pair and subtables by a
+            // newline.
+            // (this checks if the current key-value pair contains newlines.
+            //  but it is not perfect because multi-line string can also contain
+            //  a newline. in such a case, an empty line will be written) TODO
             if((!multiline_table_printed) &&
                std::find(tmp.cbegin(), tmp.cend(), '\n') != tmp.cend())
             {
                 multiline_table_printed = true;
-            }
-            else
-            {
-                // still inline tables only.
-                tmp += '\n';
-            }
+                token += '\n'; // separate key-value pairs and subtables
 
-            if(!kv.second.comments().empty() && !no_comment_)
-            {
-                for(const auto& c : kv.second.comments())
+                token += write_comments(kv.second);
+                token += tmp;
+
+                // care about recursive tables (all tables in each level prints
+                // newline and there will be a full of newlines)
+                if(tmp.substr(tmp.size() - 2, 2) != "\n\n" &&
+                   tmp.substr(tmp.size() - 4, 4) != "\r\n\r\n" )
                 {
-                    token += '#';
-                    token += c;
                     token += '\n';
                 }
             }
-            token += tmp;
+            else
+            {
+                token += write_comments(kv.second);
+                token += tmp;
+                token += '\n';
+            }
         }
         return token;
     }
 
+    std::string make_array_of_tables(const array_type& v) const
+    {
+        // if it's not inlined, we need to add `[[table.key]]`.
+        // but if it can be inlined, we can format it as the following.
+        // ```
+        // table.key = [
+        //   {...},
+        //   # comment
+        //   {...},
+        // ]
+        // ```
+        // This function checks if inlinization is possible or not, and then
+        // format the array-of-tables in a proper way.
+        //
+        // Note about comments:
+        //
+        // If the array itself has a comment (value_has_comment_ == true), we
+        // should try to make it inline.
+        // ```toml
+        // # comment about array
+        // array = [
+        //   # comment about table element
+        //   {of = "table"}
+        // ]
+        // ```
+        // If it is formatted as a multiline table, the two comments becomes
+        // indistinguishable.
+        // ```toml
+        // # comment about array
+        // # comment about table element
+        // [[array]]
+        // of = "table"
+        // ```
+        // So we need to try to make it inline, and it force-inlines regardless
+        // of the line width limit.
+        //     It may fail if the element of a table has comment. In that case,
+        // the array-of-tables will be formatted as a multiline table.
+        if(this->can_be_inlined_ || this->value_has_comment_)
+        {
+            std::string token;
+            if(!keys_.empty())
+            {
+                token += format_key(keys_.back());
+                token += " = ";
+            }
+
+            bool failed = false;
+            token += "[\n";
+            for(const auto& item : v)
+            {
+                // if an element of the table has a comment, the table
+                // cannot be inlined.
+                if(this->has_comment_inside(item.as_table()))
+                {
+                    failed = true;
+                    break;
+                }
+                // write comments for the table itself
+                token += write_comments(item);
+
+                const auto t = this->make_inline_table(item.as_table());
+
+                if(t.size() + 1 > width_ || // +1 for the last comma {...},
+                   std::find(t.cbegin(), t.cend(), '\n') != t.cend())
+                {
+                    // if the value itself has a comment, ignore the line width limit
+                    if( ! this->value_has_comment_)
+                    {
+                        failed = true;
+                        break;
+                    }
+                }
+                token += t;
+                token += ",\n";
+            }
+
+            if( ! failed)
+            {
+                token += "]\n";
+                return token;
+            }
+            // if failed, serialize them as [[array.of.tables]].
+        }
+
+        std::string token;
+        for(const auto& item : v)
+        {
+            token += write_comments(item);
+            token += "[[";
+            token += format_keys(keys_);
+            token += "]]\n";
+            token += this->make_multiline_table(item.as_table());
+        }
+        return token;
+    }
+
+    std::string write_comments(const value_type& v) const
+    {
+        std::string retval;
+        if(this->no_comment_) {return retval;}
+
+        for(const auto& c : v.comments())
+        {
+            retval += '#';
+            retval += c;
+            retval += '\n';
+        }
+        return retval;
+    }
+
     bool is_array_of_tables(const value_type& v) const
     {
-        if(!v.is_array()) {return false;}
-        const auto& a = v.as_array();
-        return !a.empty() && a.front().is_table();
+        if(!v.is_array() || v.as_array().empty()) {return false;}
+        return is_array_of_tables(v.as_array());
+    }
+    bool is_array_of_tables(const array_type& v) const
+    {
+        // Since TOML v0.5.0, heterogeneous arrays are allowed. So we need to
+        // check all the element in an array to check if the array is an array
+        // of tables.
+        return std::all_of(v.begin(), v.end(), [](const value_type& elem) {
+                return elem.is_table();
+            });
     }
 
   private:
 
     bool        can_be_inlined_;
     bool        no_comment_;
+    bool        value_has_comment_;
     int         float_prec_;
     std::size_t width_;
     std::vector<toml::key> keys_;
@@ -699,7 +905,7 @@ format(const basic_value<C, M, V>& v, std::size_t w = 80u,
             oss << v.comments();
             oss << '\n'; // to split the file comment from the first element
         }
-        const auto serialized = visit(serializer<value_type>(w, fprec, no_comment, false), v);
+        const auto serialized = visit(serializer<value_type>(w, fprec, false, no_comment), v);
         oss << serialized;
         return oss.str();
     }
@@ -720,7 +926,7 @@ template<typename charT, typename traits>
 std::basic_ostream<charT, traits>&
 nocomment(std::basic_ostream<charT, traits>& os)
 {
-    // by default, it is zero. and by defalut, it shows comments.
+    // by default, it is zero. and by default, it shows comments.
     os.iword(detail::comment_index(os)) = 1;
     return os;
 }
@@ -729,7 +935,7 @@ template<typename charT, typename traits>
 std::basic_ostream<charT, traits>&
 showcomment(std::basic_ostream<charT, traits>& os)
 {
-    // by default, it is zero. and by defalut, it shows comments.
+    // by default, it is zero. and by default, it shows comments.
     os.iword(detail::comment_index(os)) = 0;
     return os;
 }
@@ -746,7 +952,7 @@ operator<<(std::basic_ostream<charT, traits>& os, const basic_value<C, M, V>& v)
     const int  fprec = static_cast<int>(os.precision());
     os.width(0);
 
-    // by defualt, iword is initialized byl 0. And by default, toml11 outputs
+    // by default, iword is initialized by 0. And by default, toml11 outputs
     // comments. So `0` means showcomment. 1 means nocommnet.
     const bool no_comment = (1 == os.iword(detail::comment_index(os)));
 

toml/source_location.hpp

@@ -3,6 +3,7 @@
 #ifndef TOML11_SOURCE_LOCATION_HPP
 #define TOML11_SOURCE_LOCATION_HPP
 #include <cstdint>
+#include <sstream>
 
 #include "region.hpp"
 
@@ -124,7 +125,7 @@ inline std::string format_underline(const std::string& message,
 
     std::ostringstream retval;
 
-    if(colorize)
+    if(color::should_color() || colorize)
     {
         retval << color::colorize; // turn on ANSI color
     }
@@ -136,12 +137,18 @@ inline std::string format_underline(const std::string& message,
     // if it is "[error]", it removes that part from the message shown.
     if(message.size() > 7 && message.substr(0, 7) == "[error]")
     {
-        retval << color::bold << color::red << "[error]" << color::reset
+        retval
+#ifndef TOML11_NO_ERROR_PREFIX
+               << color::bold << color::red << "[error]" << color::reset
+#endif
                << color::bold << message.substr(7) << color::reset << '\n';
     }
     else
     {
-        retval << color::bold << color::red << "[error] " << color::reset
+        retval
+#ifndef TOML11_NO_ERROR_PREFIX
+               << color::bold << color::red << "[error] " << color::reset
+#endif
                << color::bold << message << color::reset << '\n';
     }
 

toml/string.hpp

@@ -2,13 +2,17 @@
 // Distributed under the MIT License.
 #ifndef TOML11_STRING_HPP
 #define TOML11_STRING_HPP
+
+#include "version.hpp"
+
 #include <cstdint>
 
 #include <algorithm>
 #include <string>
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #if __has_include(<string_view>)
+#define TOML11_USING_STRING_VIEW 1
 #include <string_view>
 #endif
 #endif
@@ -53,7 +57,7 @@ struct string
     string& operator+=(const std::string& rhs) {str += rhs; return *this;}
     string& operator+=(const string&      rhs) {str += rhs.str; return *this;}
 
-#if __cplusplus >= 201703L
+#if defined(TOML11_USING_STRING_VIEW) && TOML11_USING_STRING_VIEW>0
     explicit string(std::string_view s): kind(string_t::basic), str(s){}
     string(std::string_view s, string_t k): kind(k), str(s){}
 

toml/traits.hpp

@@ -2,6 +2,11 @@
 // Distributed under the MIT License.
 #ifndef TOML11_TRAITS_HPP
 #define TOML11_TRAITS_HPP
+
+#include "from.hpp"
+#include "into.hpp"
+#include "version.hpp"
+
 #include <chrono>
 #include <forward_list>
 #include <string>
@@ -9,7 +14,7 @@
 #include <type_traits>
 #include <utility>
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 #if __has_include(<string_view>)
 #include <string_view>
 #endif // has_include(<string_view>)
@@ -84,6 +89,22 @@ struct has_into_toml_method_impl
     static std::false_type check(...);
 };
 
+struct has_specialized_from_impl
+{
+    template<typename T>
+    static std::false_type check(...);
+    template<typename T, std::size_t S = sizeof(::toml::from<T>)>
+    static std::true_type check(::toml::from<T>*);
+};
+struct has_specialized_into_impl
+{
+    template<typename T>
+    static std::false_type check(...);
+    template<typename T, std::size_t S = sizeof(::toml::into<T>)>
+    static std::true_type check(::toml::from<T>*);
+};
+
+
 /// Intel C++ compiler can not use decltype in parent class declaration, here
 /// is a hack to work around it. https://stackoverflow.com/a/23953090/4692076
 #ifdef __INTEL_COMPILER
@@ -114,6 +135,11 @@ template<typename T>
 struct has_into_toml_method
 : decltype(has_into_toml_method_impl::check<T>(nullptr)){};
 
+template<typename T>
+struct has_specialized_from : decltype(has_specialized_from_impl::check<T>(nullptr)){};
+template<typename T>
+struct has_specialized_into : decltype(has_specialized_into_impl::check<T>(nullptr)){};
+
 #ifdef __INTEL_COMPILER
 #undef decltype
 #endif
@@ -121,7 +147,7 @@ struct has_into_toml_method
 // ---------------------------------------------------------------------------
 // C++17 and/or/not
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
 
 using std::conjunction;
 using std::disjunction;
@@ -183,8 +209,10 @@ template<typename T>
 struct is_container : conjunction<
     negation<is_map<T>>,                         // not a map
     negation<std::is_same<T, std::string>>,      // not a std::string
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L
+#if __has_include(<string_view>)
     negation<std::is_same<T, std::string_view>>, // not a std::string_view
+#endif // has_include(<string_view>)
 #endif
     has_iterator<T>,                             // has T::iterator
     has_value_type<T>                            // has T::value_type
@@ -206,7 +234,7 @@ struct is_basic_value<::toml::basic_value<C, M, V>>: std::true_type{};
 // ---------------------------------------------------------------------------
 // C++14 index_sequence
 
-#if __cplusplus >= 201402L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201402L
 
 using std::index_sequence;
 using std::make_index_sequence;
@@ -236,12 +264,12 @@ struct index_sequence_maker<0>
 template<std::size_t N>
 using make_index_sequence = typename index_sequence_maker<N-1>::type;
 
-#endif // __cplusplus >= 2014
+#endif // cplusplus >= 2014
 
 // ---------------------------------------------------------------------------
 // C++14 enable_if_t
 
-#if __cplusplus >= 201402L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201402L
 
 using std::enable_if_t;
 
@@ -250,12 +278,12 @@ using std::enable_if_t;
 template<bool B, typename T>
 using enable_if_t = typename std::enable_if<B, T>::type;
 
-#endif // __cplusplus >= 2014
+#endif // cplusplus >= 2014
 
 // ---------------------------------------------------------------------------
 // return_type_of_t
 
-#if __cplusplus >= 201703L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201703L && defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable>=201703
 
 template<typename F, typename ... Args>
 using return_type_of_t = std::invoke_result_t<F, Args...>;

toml/types.hpp

@@ -21,9 +21,14 @@ class basic_value;
 using character = char;
 using key = std::string;
 
+#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ <= 4
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 using boolean        = bool;
 using integer        = std::int64_t;
-using floating       = double; // "float" is a keyward, cannot use it here.
+using floating       = double; // "float" is a keyword, cannot use it here.
 // the following stuffs are structs defined here, so aliases are not needed.
 // - string
 // - offset_datetime
@@ -32,12 +37,26 @@ using floating       = double; // "float" is a keyward, cannot use it here.
 // - local_date
 // - local_time
 
+#if defined(__GNUC__) && !defined(__clang__)
+#  pragma GCC diagnostic pop
+#endif
+
 // default toml::value and default array/table. these are defined after defining
 // basic_value itself.
 // using value = basic_value<discard_comments, std::unordered_map, std::vector>;
 // using array = typename value::array_type;
 // using table = typename value::table_type;
 
+// to avoid warnings about `value_t::integer` is "shadowing" toml::integer in
+// GCC -Wshadow=global.
+#if defined(__GNUC__) && !defined(__clang__)
+#  pragma GCC diagnostic push
+#  if 7 <= __GNUC__
+#    pragma GCC diagnostic ignored "-Wshadow=global"
+#  else // gcc-6 or older
+#    pragma GCC diagnostic ignored "-Wshadow"
+#  endif
+#endif
 enum class value_t : std::uint8_t
 {
     empty           =  0,
@@ -52,6 +71,9 @@ enum class value_t : std::uint8_t
     array           =  9,
     table           = 10,
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#  pragma GCC diagnostic pop
+#endif
 
 template<typename charT, typename traits>
 inline std::basic_ostream<charT, traits>&
@@ -147,4 +169,5 @@ template<typename T, typename V> struct is_exact_toml_type<T const volatile&, V>
 
 } // detail
 } // toml
+
 #endif// TOML11_TYPES_H

toml/utility.hpp

@@ -7,8 +7,9 @@
 #include <utility>
 
 #include "traits.hpp"
+#include "version.hpp"
 
-#if __cplusplus >= 201402L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201402L
 #  define TOML11_MARK_AS_DEPRECATED(msg) [[deprecated(msg)]]
 #elif defined(__GNUC__)
 #  define TOML11_MARK_AS_DEPRECATED(msg) __attribute__((deprecated(msg)))
@@ -21,7 +22,7 @@
 namespace toml
 {
 
-#if __cplusplus >= 201402L
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201402L
 
 using std::make_unique;
 
@@ -33,7 +34,7 @@ inline std::unique_ptr<T> make_unique(Ts&& ... args)
     return std::unique_ptr<T>(new T(std::forward<Ts>(args)...));
 }
 
-#endif // __cplusplus >= 2014
+#endif // TOML11_CPLUSPLUS_STANDARD_VERSION >= 2014
 
 namespace detail
 {
@@ -89,5 +90,61 @@ T from_string(const std::string& str, T opt)
     return v;
 }
 
+namespace detail
+{
+#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 201402L
+template<typename T>
+decltype(auto) last_one(T&& tail) noexcept
+{
+    return std::forward<T>(tail);
+}
+
+template<typename T, typename ... Ts>
+decltype(auto) last_one(T&& /*head*/, Ts&& ... tail) noexcept
+{
+    return last_one(std::forward<Ts>(tail)...);
+}
+#else // C++11
+// The following code
+// ```cpp
+//  1 | template<typename T, typename ... Ts>
+//  2 | auto last_one(T&& /*head*/, Ts&& ... tail)
+//  3 |  -> decltype(last_one(std::forward<Ts>(tail)...))
+//  4 | {
+//  5 |     return last_one(std::forward<Ts>(tail)...);
+//  6 | }
+// ```
+// does not work because the function `last_one(...)` is not yet defined at
+// line #3, so `decltype()` cannot deduce the type returned from `last_one`.
+// So we need to determine return type in a different way, like a meta func.
+
+template<typename T, typename ... Ts>
+struct last_one_in_pack
+{
+    using type = typename last_one_in_pack<Ts...>::type;
+};
+template<typename T>
+struct last_one_in_pack<T>
+{
+    using type = T;
+};
+template<typename ... Ts>
+using last_one_in_pack_t = typename last_one_in_pack<Ts...>::type;
+
+template<typename T>
+T&& last_one(T&& tail) noexcept
+{
+    return std::forward<T>(tail);
+}
+template<typename T, typename ... Ts>
+enable_if_t<(sizeof...(Ts) > 0), last_one_in_pack_t<Ts&& ...>>
+last_one(T&& /*head*/, Ts&& ... tail)
+{
+    return last_one(std::forward<Ts>(tail)...);
+}
+
+#endif
+} // detail
+
 }// toml
 #endif // TOML11_UTILITY

toml/value.hpp

@@ -66,9 +66,20 @@ throw_key_not_found_error(const Value& v, const key& ky)
     // ```
     // It actually points to the top-level table at the first character,
     // not `[table]`. But it is too confusing. To avoid the confusion, the error
-    // message should explicitly say "key not found in the top-level table".
+    // message should explicitly say "key not found in the top-level table",
+    // or "the parsed file is empty" if there is no content at all (0 bytes in file).
     const auto loc = v.location();
-    if(loc.line() == 1 && loc.region() == 1)
+    if(loc.line() == 1 && loc.region() == 0)
+    {
+        // First line with a zero-length region means "empty file".
+        // The region will be generated at `parse_toml_file` function
+        // if the file contains no bytes.
+        throw std::out_of_range(format_underline(concat_to_string(
+            "key \"", ky, "\" not found in the top-level table"), {
+                {loc, "the parsed file is empty"}
+            }));
+    }
+    else if(loc.line() == 1 && loc.region() == 1)
     {
         // Here it assumes that top-level table starts at the first character.
         // The region corresponds to the top-level table will be generated at
@@ -90,7 +101,7 @@ throw_key_not_found_error(const Value& v, const key& ky)
         // ```toml
         // a = {b = "c"}
         // ```
-        // toml11 consideres the inline table body as the table region. Here,
+        // toml11 considers the inline table body as the table region. Here,
         // `{b = "c"}` is the region of the table "a". The size of the region
         // is 9, not 1. The shotest inline table still has two characters, `{`
         // and `}`. The size cannot be 1.
@@ -99,7 +110,7 @@ throw_key_not_found_error(const Value& v, const key& ky)
         // ```toml
         // [a]
         // ```
-        // toml11 consideres the whole table key as the table region. Here,
+        // toml11 considers the whole table key as the table region. Here,
         // `[a]` is the table region. The size is 3, not 1.
         //
         throw std::out_of_range(format_underline(concat_to_string(
@@ -236,6 +247,7 @@ class basic_value
     }
     basic_value& operator=(const basic_value& v)
     {
+        if(this == std::addressof(v)) {return *this;}
         this->cleanup();
         this->region_info_ = v.region_info_;
         this->comments_ = v.comments_;
@@ -258,6 +270,7 @@ class basic_value
     }
     basic_value& operator=(basic_value&& v)
     {
+        if(this == std::addressof(v)) {return *this;}
         this->cleanup();
         this->region_info_ = std::move(v.region_info_);
         this->comments_ = std::move(v.comments_);
@@ -281,9 +294,9 @@ class basic_value
 
     // overwrite comments ----------------------------------------------------
 
-    basic_value(const basic_value& v, std::vector<std::string> comments)
+    basic_value(const basic_value& v, std::vector<std::string> com)
         : type_(v.type()), region_info_(v.region_info_),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         switch(v.type())
         {
@@ -301,9 +314,9 @@ class basic_value
         }
     }
 
-    basic_value(basic_value&& v, std::vector<std::string> comments)
+    basic_value(basic_value&& v, std::vector<std::string> com)
         : type_(v.type()), region_info_(std::move(v.region_info_)),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         switch(this->type_) // here this->type_ is already initialized
         {
@@ -359,9 +372,9 @@ class basic_value
     template<typename C,
              template<typename ...> class T,
              template<typename ...> class A>
-    basic_value(const basic_value<C, T, A>& v, std::vector<std::string> comments)
+    basic_value(const basic_value<C, T, A>& v, std::vector<std::string> com)
         : type_(v.type()), region_info_(v.region_info_),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         switch(v.type())
         {
@@ -443,10 +456,10 @@ class basic_value
         assigner(this->boolean_, b);
         return *this;
     }
-    basic_value(boolean b, std::vector<std::string> comments)
+    basic_value(boolean b, std::vector<std::string> com)
         : type_(value_t::boolean),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->boolean_, b);
     }
@@ -478,10 +491,10 @@ class basic_value
     template<typename T, typename std::enable_if<detail::conjunction<
         std::is_integral<T>, detail::negation<std::is_same<T, boolean>>>::value,
         std::nullptr_t>::type = nullptr>
-    basic_value(T i, std::vector<std::string> comments)
+    basic_value(T i, std::vector<std::string> com)
         : type_(value_t::integer),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->integer_, static_cast<integer>(i));
     }
@@ -511,10 +524,10 @@ class basic_value
 
     template<typename T, typename std::enable_if<
         std::is_floating_point<T>::value, std::nullptr_t>::type = nullptr>
-    basic_value(T f, std::vector<std::string> comments)
+    basic_value(T f, std::vector<std::string> com)
         : type_(value_t::floating),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->floating_, f);
     }
@@ -535,10 +548,10 @@ class basic_value
         assigner(this->string_, s);
         return *this;
     }
-    basic_value(toml::string s, std::vector<std::string> comments)
+    basic_value(toml::string s, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, std::move(s));
     }
@@ -563,17 +576,17 @@ class basic_value
     {
         assigner(this->string_, toml::string(std::move(s), kind));
     }
-    basic_value(std::string s, std::vector<std::string> comments)
+    basic_value(std::string s, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(std::move(s)));
     }
-    basic_value(std::string s, string_t kind, std::vector<std::string> comments)
+    basic_value(std::string s, string_t kind, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(std::move(s), kind));
     }
@@ -598,22 +611,22 @@ class basic_value
     {
         assigner(this->string_, toml::string(std::string(s), kind));
     }
-    basic_value(const char* s, std::vector<std::string> comments)
+    basic_value(const char* s, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(std::string(s)));
     }
-    basic_value(const char* s, string_t kind, std::vector<std::string> comments)
+    basic_value(const char* s, string_t kind, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(std::string(s), kind));
     }
 
-#if __cplusplus >= 201703L
+#if defined(TOML11_USING_STRING_VIEW) && TOML11_USING_STRING_VIEW>0
     basic_value(std::string_view s)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{}))
@@ -628,10 +641,10 @@ class basic_value
         assigner(this->string_, toml::string(s));
         return *this;
     }
-    basic_value(std::string_view s, std::vector<std::string> comments)
+    basic_value(std::string_view s, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(s));
     }
@@ -641,10 +654,10 @@ class basic_value
     {
         assigner(this->string_, toml::string(s, kind));
     }
-    basic_value(std::string_view s, string_t kind, std::vector<std::string> comments)
+    basic_value(std::string_view s, string_t kind, std::vector<std::string> com)
         : type_(value_t::string),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->string_, toml::string(s, kind));
     }
@@ -666,10 +679,10 @@ class basic_value
         assigner(this->local_date_, ld);
         return *this;
     }
-    basic_value(const local_date& ld, std::vector<std::string> comments)
+    basic_value(const local_date& ld, std::vector<std::string> com)
         : type_(value_t::local_date),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->local_date_, ld);
     }
@@ -682,10 +695,10 @@ class basic_value
     {
         assigner(this->local_time_, lt);
     }
-    basic_value(const local_time& lt, std::vector<std::string> comments)
+    basic_value(const local_time& lt, std::vector<std::string> com)
         : type_(value_t::local_time),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->local_time_, lt);
     }
@@ -707,10 +720,10 @@ class basic_value
     }
     template<typename Rep, typename Period>
     basic_value(const std::chrono::duration<Rep, Period>& dur,
-                std::vector<std::string> comments)
+                std::vector<std::string> com)
         : type_(value_t::local_time),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->local_time_, local_time(dur));
     }
@@ -732,10 +745,10 @@ class basic_value
     {
         assigner(this->local_datetime_, ldt);
     }
-    basic_value(const local_datetime& ldt, std::vector<std::string> comments)
+    basic_value(const local_datetime& ldt, std::vector<std::string> com)
         : type_(value_t::local_datetime),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->local_datetime_, ldt);
     }
@@ -756,10 +769,10 @@ class basic_value
     {
         assigner(this->offset_datetime_, odt);
     }
-    basic_value(const offset_datetime& odt, std::vector<std::string> comments)
+    basic_value(const offset_datetime& odt, std::vector<std::string> com)
         : type_(value_t::offset_datetime),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->offset_datetime_, odt);
     }
@@ -778,10 +791,10 @@ class basic_value
         assigner(this->offset_datetime_, offset_datetime(tp));
     }
     basic_value(const std::chrono::system_clock::time_point& tp,
-                std::vector<std::string> comments)
+                std::vector<std::string> com)
         : type_(value_t::offset_datetime),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->offset_datetime_, offset_datetime(tp));
     }
@@ -802,10 +815,10 @@ class basic_value
     {
         assigner(this->array_, ary);
     }
-    basic_value(const array_type& ary, std::vector<std::string> comments)
+    basic_value(const array_type& ary, std::vector<std::string> com)
         : type_(value_t::array),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->array_, ary);
     }
@@ -833,10 +846,10 @@ class basic_value
     template<typename T, typename std::enable_if<
             std::is_convertible<T, value_type>::value,
         std::nullptr_t>::type = nullptr>
-    basic_value(std::initializer_list<T> list, std::vector<std::string> comments)
+    basic_value(std::initializer_list<T> list, std::vector<std::string> com)
         : type_(value_t::array),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         array_type ary(list.begin(), list.end());
         assigner(this->array_, std::move(ary));
@@ -876,10 +889,10 @@ class basic_value
             detail::negation<std::is_same<T, array_type>>,
             detail::is_container<T>
         >::value, std::nullptr_t>::type = nullptr>
-    basic_value(const T& list, std::vector<std::string> comments)
+    basic_value(const T& list, std::vector<std::string> com)
         : type_(value_t::array),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         static_assert(std::is_convertible<typename T::value_type, value_type>::value,
             "elements of a container should be convertible to toml::value");
@@ -915,10 +928,10 @@ class basic_value
     {
         assigner(this->table_, tab);
     }
-    basic_value(const table_type& tab, std::vector<std::string> comments)
+    basic_value(const table_type& tab, std::vector<std::string> com)
         : type_(value_t::table),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         assigner(this->table_, tab);
     }
@@ -943,10 +956,10 @@ class basic_value
     }
 
     basic_value(std::initializer_list<std::pair<key, basic_value>> list,
-                std::vector<std::string> comments)
+                std::vector<std::string> com)
         : type_(value_t::table),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         table_type tab;
         for(const auto& elem : list) {tab[elem.first] = elem.second;}
@@ -982,10 +995,10 @@ class basic_value
             detail::negation<std::is_same<Map, table_type>>,
             detail::is_map<Map>
         >::value, std::nullptr_t>::type = nullptr>
-    basic_value(const Map& mp, std::vector<std::string> comments)
+    basic_value(const Map& mp, std::vector<std::string> com)
         : type_(value_t::table),
           region_info_(std::make_shared<region_base>(region_base{})),
-          comments_(std::move(comments))
+          comments_(std::move(com))
     {
         table_type tab;
         for(const auto& elem : mp) {tab[elem.first] = elem.second;}
@@ -1017,8 +1030,8 @@ class basic_value
 
     template<typename T, typename std::enable_if<
         detail::has_into_toml_method<T>::value, std::nullptr_t>::type = nullptr>
-    basic_value(const T& ud, std::vector<std::string> comments)
-        : basic_value(ud.into_toml(), std::move(comments))
+    basic_value(const T& ud, std::vector<std::string> com)
+        : basic_value(ud.into_toml(), std::move(com))
     {}
     template<typename T, typename std::enable_if<
         detail::has_into_toml_method<T>::value, std::nullptr_t>::type = nullptr>
@@ -1033,8 +1046,8 @@ class basic_value
     template<typename T, std::size_t S = sizeof(::toml::into<T>)>
     basic_value(const T& ud): basic_value(::toml::into<T>::into_toml(ud)) {}
     template<typename T, std::size_t S = sizeof(::toml::into<T>)>
-    basic_value(const T& ud, std::vector<std::string> comments)
-        : basic_value(::toml::into<T>::into_toml(ud), std::move(comments))
+    basic_value(const T& ud, std::vector<std::string> com)
+        : basic_value(::toml::into<T>::into_toml(ud), std::move(com))
     {}
     template<typename T, std::size_t S = sizeof(::toml::into<T>)>
     basic_value& operator=(const T& ud)
@@ -1047,10 +1060,10 @@ class basic_value
     //
     // Those constructors take detail::region that contains parse result.
 
-    basic_value(boolean b, detail::region reg)
+    basic_value(boolean b, detail::region reg, std::vector<std::string> cm)
         : type_(value_t::boolean),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->boolean_, b);
     }
@@ -1058,68 +1071,75 @@ class basic_value
         detail::conjunction<
             std::is_integral<T>, detail::negation<std::is_same<T, boolean>>
         >::value, std::nullptr_t>::type = nullptr>
-    basic_value(T i, detail::region reg)
+    basic_value(T i, detail::region reg, std::vector<std::string> cm)
         : type_(value_t::integer),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->integer_, static_cast<integer>(i));
     }
     template<typename T, typename std::enable_if<
         std::is_floating_point<T>::value, std::nullptr_t>::type = nullptr>
-    basic_value(T f, detail::region reg)
+    basic_value(T f, detail::region reg, std::vector<std::string> cm)
         : type_(value_t::floating),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->floating_, static_cast<floating>(f));
     }
-    basic_value(toml::string s, detail::region reg)
+    basic_value(toml::string s, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::string),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->string_, std::move(s));
     }
-    basic_value(const local_date& ld, detail::region reg)
+    basic_value(const local_date& ld, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::local_date),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->local_date_, ld);
     }
-    basic_value(const local_time& lt, detail::region reg)
+    basic_value(const local_time& lt, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::local_time),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->local_time_, lt);
     }
-    basic_value(const local_datetime& ldt, detail::region reg)
+    basic_value(const local_datetime& ldt, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::local_datetime),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->local_datetime_, ldt);
     }
-    basic_value(const offset_datetime& odt, detail::region reg)
+    basic_value(const offset_datetime& odt, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::offset_datetime),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->offset_datetime_, odt);
     }
-    basic_value(const array_type& ary, detail::region reg)
+    basic_value(const array_type& ary, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::array),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->array_, ary);
     }
-    basic_value(const table_type& tab, detail::region reg)
+    basic_value(const table_type& tab, detail::region reg,
+                std::vector<std::string> cm)
         : type_(value_t::table),
           region_info_(std::make_shared<detail::region>(std::move(reg))),
-          comments_(region_info_->comments())
+          comments_(std::move(cm))
     {
         assigner(this->table_, tab);
     }
@@ -1127,8 +1147,10 @@ class basic_value
     template<typename T, typename std::enable_if<
         detail::is_exact_toml_type<T, value_type>::value,
         std::nullptr_t>::type = nullptr>
-    basic_value(std::pair<T, detail::region> parse_result)
-        : basic_value(std::move(parse_result.first), std::move(parse_result.second))
+    basic_value(std::pair<T, detail::region> parse_result, std::vector<std::string> com)
+        : basic_value(std::move(parse_result.first),
+                      std::move(parse_result.second),
+                      std::move(com))
     {}
 
     // type checking and casting ============================================
@@ -1692,9 +1714,9 @@ class basic_value
     {
         switch(this->type_)
         {
-            case value_t::string  : {string_.~string();       return;}
-            case value_t::array   : {array_.~array_storage(); return;}
-            case value_t::table   : {table_.~table_storage(); return;}
+            case value_t::string : {string_.~string();       return;}
+            case value_t::array  : {array_.~array_storage(); return;}
+            case value_t::table  : {table_.~table_storage(); return;}
             default              : return;
         }
     }
@@ -1730,7 +1752,8 @@ class basic_value
 };
 
 // default toml::value and default array/table.
-using value = basic_value<discard_comments, std::unordered_map, std::vector>;
+// TOML11_DEFAULT_COMMENT_STRATEGY is defined in comments.hpp
+using value = basic_value<TOML11_DEFAULT_COMMENT_STRATEGY, std::unordered_map, std::vector>;
 using array = typename value::array_type;
 using table = typename value::table_type;
 

toml/version.hpp

@@ -0,0 +1,42 @@
+#ifndef TOML11_VERSION_HPP
+#define TOML11_VERSION_HPP
+
+// This file checks C++ version.
+
+#ifndef __cplusplus
+#    error "__cplusplus is not defined"
+#endif
+
+// Since MSVC does not define `__cplusplus` correctly unless you pass
+// `/Zc:__cplusplus` when compiling, the workaround macros are added.
+// Those enables you to define version manually or to use MSVC specific
+// version macro automatically.
+//
+// The value of `__cplusplus` macro is defined in the C++ standard spec, but
+// MSVC ignores the value, maybe because of backward compatibility. Instead,
+// MSVC defines _MSVC_LANG that has the same value as __cplusplus defined in
+// the C++ standard. First we check the manual version definition, and then
+// we check if _MSVC_LANG is defined. If neither, use normal `__cplusplus`.
+//
+// FYI: https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-170
+//      https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170
+//
+#if   defined(TOML11_ENFORCE_CXX11)
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION 201103L
+#elif defined(TOML11_ENFORCE_CXX14)
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION 201402L
+#elif defined(TOML11_ENFORCE_CXX17)
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION 201703L
+#elif defined(TOML11_ENFORCE_CXX20)
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION 202002L
+#elif defined(_MSVC_LANG) && defined(_MSC_VER) && 1910 <= _MSC_VER
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION _MSVC_LANG
+#else
+#  define TOML11_CPLUSPLUS_STANDARD_VERSION __cplusplus
+#endif
+
+#if TOML11_CPLUSPLUS_STANDARD_VERSION < 201103L && _MSC_VER < 1900
+#    error "toml11 requires C++11 or later."
+#endif
+
+#endif// TOML11_VERSION_HPP