.bazelignore

@@ -1 +0,0 @@
-test/gtest-1.11.0

.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    groups:
-      github-actions:
-        patterns:
-          - "*"
-

.github/workflows/build.yml

@@ -1,141 +0,0 @@
-name: Github PR
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-permissions: read-all
-defaults:
-  run:
-    shell: bash
-jobs:
-  cmake-build:
-      strategy:
-        fail-fast: false
-        matrix:
-          os: [ubuntu-latest, windows-latest, macos-latest]
-          cxx_standard: [11, 17, 20]
-          build: [static, shared]
-          googletest: [build, system]
-          generator: ["Default Generator", "MinGW Makefiles"]
-          exclude:
-          - os: ubuntu-latest
-            cxx_standard: 11
-            googletest: system
-          - os: macos-latest
-            build: shared
-          - os: macos-latest
-            generator: "MinGW Makefiles"
-          - os: ubuntu-latest
-            generator: "MinGW Makefiles"
-          - os: macos-latest
-            googletest: system
-          - os: windows-latest
-            googletest: system
-      env:
-        YAML_BUILD_SHARED_LIBS: ${{ matrix.build == 'shared' && 'ON' || 'OFF' }}
-        YAML_USE_SYSTEM_GTEST: ${{ matrix.googletest == 'system' && 'ON' || 'OFF' }}
-        CMAKE_GENERATOR: >-
-          ${{format(matrix.generator != 'Default Generator' && '-G "{0}"' || '', matrix.generator)}}
-        CMAKE_INSTALL_PREFIX: "${{ github.workspace }}/install-prefix"
-        CMAKE_BUILD_TYPE: Debug
-        CMAKE_CXX_FLAGS_DEBUG: ${{ matrix.googletest == 'build' && '-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC' || '-g' }} 
-      runs-on: ${{ matrix.os }}
-      steps:
-
-        - uses: awalsh128/cache-apt-pkgs-action@latest
-          if: matrix.os == 'ubuntu-latest'
-          with:
-            packages: googletest libgmock-dev libgtest-dev
-            version: 1.0
-
-        - uses: actions/checkout@v4
-
-        - name: Configure
-          run: |
-            cmake \
-              ${{ env.CMAKE_GENERATOR }} \
-              -S "${{ github.workspace }}" \
-              -B build \
-              -D CMAKE_CXX_STANDARD=${{ matrix.cxx_standard }} \
-              -D CMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_PREFIX }}" \
-              -D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
-              -D CMAKE_CXX_FLAGS_DEBUG="${{ env.CMAKE_CXX_FLAGS_DEBUG }}" \
-              -D YAML_BUILD_SHARED_LIBS=${{ env.YAML_BUILD_SHARED_LIBS }} \
-              -D YAML_USE_SYSTEM_GTEST=${{ env.YAML_USE_SYSTEM_GTEST }} \
-              -D YAML_CPP_BUILD_TESTS=ON
-
-        - name: Build
-          run: |
-            cmake \
-              --build build \
-              --config ${{ env.CMAKE_BUILD_TYPE }} \
-              --verbose \
-              --parallel
-
-        - name: Run Tests
-          shell: bash
-          run: |
-            ctest \
-              --test-dir build \
-              --build-config ${{ env.CMAKE_BUILD_TYPE }} \
-              --output-on-failure \
-              --verbose
-
-        - name: Install
-          run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }}
-
-        - name: Configure CMake package test
-          run: |
-            cmake \
-              ${{ env.CMAKE_GENERATOR }} \
-              -S "${{ github.workspace }}/test/cmake" \
-              -B consumer-build \
-              -D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
-              -D CMAKE_PREFIX_PATH="${{ env.CMAKE_INSTALL_PREFIX }}"
-
-        - name: Build CMake package test
-          run: |
-            cmake \
-              --build consumer-build \
-              --config ${{ env.CMAKE_BUILD_TYPE }} \
-              --verbose
-
-  bazel-build:
-      strategy:
-        matrix:
-          os: [ubuntu-latest, windows-latest, macos-latest]
-      runs-on: ${{ matrix.os }}
-      steps:
-        - uses: actions/checkout@v4
-
-        - name: Build
-          run: |
-            cd "${{ github.workspace }}"
-            bazel build :all
-
-        - name: Test
-          run: |
-            cd "${{ github.workspace }}"
-            bazel test test
-
-  bzlmod-build:
-      strategy:
-        matrix:
-          os: [ubuntu-latest, windows-latest, macos-latest]
-      runs-on: ${{ matrix.os }}
-      steps:
-        - uses: actions/checkout@v4
-
-        - name: Build
-          shell: bash
-          run: |
-            cd "${{ github.workspace }}"
-            bazel build --enable_bzlmod :all
-
-        - name: Test
-          shell: bash
-          run: |
-            cd "${{ github.workspace }}"
-            bazel test --enable_bzlmod test

.github/workflows/bzlmod-archive.yml

@@ -1,19 +0,0 @@
-name: Bazel Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  # A release archive is required for bzlmod
-  # See: https://blog.bazel.build/2023/02/15/github-archive-checksum.html
-  bazel-release-archive:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - run: git archive $GITHUB_REF -o "yaml-cpp-${GITHUB_REF:10}.tar.gz"
-      - run: gh release upload ${GITHUB_REF:10} "yaml-cpp-${GITHUB_REF:10}.tar.gz"
-        env:
-          GH_TOKEN: ${{ github.token }}

.gitignore

@@ -1,3 +1 @@
 build/
-/tags
-/bazel-*

.travis.yml

@@ -0,0 +1,28 @@
+language: c++
+os:
+  - linux
+  - osx
+compiler:
+  - clang
+  - gcc
+before_install:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y \
+      && sudo apt-get update -qq \
+      && if [ "$CXX" == "g++" ]; then
+        sudo apt-get install -qq g++-4.7 && export CXX="g++-4.7" CC="gcc-4.7"
+      fi
+    fi
+before_script:
+  - mkdir build
+  - cd build
+  - cmake ..
+script:
+  - make
+  - test/run-tests
+
+matrix:
+  exclude:
+  - os: linux
+    compiler: clang

BUILD.bazel

@@ -1,21 +0,0 @@
-yaml_cpp_defines = select({
-    # On Windows, ensure static linking is used.
-    "@platforms//os:windows": ["YAML_CPP_STATIC_DEFINE", "YAML_CPP_NO_CONTRIB"],
-    "//conditions:default": [],
-})
-
-cc_library(
-    name = "yaml-cpp_internal",
-    visibility = ["//:__subpackages__"],
-    strip_include_prefix = "src",
-    hdrs = glob(["src/**/*.h"]),
-)
-
-cc_library(
-    name = "yaml-cpp",
-    visibility = ["//visibility:public"],
-    includes = ["include"],
-    hdrs = glob(["include/**/*.h"]),
-    srcs = glob(["src/**/*.cpp", "src/**/*.h"]),
-    defines = yaml_cpp_defines,
-)

CMakeLists.txt

@@ -1,213 +1,365 @@
-# 3.5 is actually available almost everywhere, but this a good minimum.
+###
-# 3.14 as the upper policy limit avoids CMake deprecation warnings.
+### CMake settings
-cmake_minimum_required(VERSION 3.4...3.14)
+###
-
+## Due to Mac OSX we need to keep compatibility with CMake 2.6
-# enable MSVC_RUNTIME_LIBRARY target property
+# see http://www.cmake.org/Wiki/CMake_Policies
-# see https://cmake.org/cmake/help/latest/policy/CMP0091.html
+cmake_minimum_required(VERSION 2.6)
-if(POLICY CMP0091)
+# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0012
-  cmake_policy(SET CMP0091 NEW)
+if(POLICY CMP0012)
+	cmake_policy(SET CMP0012 OLD)
+endif()
+# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0015
+if(POLICY CMP0015)
+	cmake_policy(SET CMP0015 OLD)
+endif()
+# see https://cmake.org/cmake/help/latest/policy/CMP0042.html
+if(POLICY CMP0042)
+	# Enable MACOSX_RPATH by default.
+	cmake_policy(SET CMP0042 NEW)
 endif()
 
-project(YAML_CPP VERSION 0.8.0 LANGUAGES CXX)
-
-set(YAML_CPP_MAIN_PROJECT OFF)
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-  set(YAML_CPP_MAIN_PROJECT ON)
-endif()
-
-include(CMakePackageConfigHelpers)
-include(CMakeDependentOption)
 include(CheckCXXCompilerFlag)
-include(GNUInstallDirs)
-include(CTest)
 
-option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" ON)
+
+###
+### Project settings
+###
+project(YAML_CPP)
+
+set(YAML_CPP_VERSION_MAJOR "0")
+set(YAML_CPP_VERSION_MINOR "6")
+set(YAML_CPP_VERSION_PATCH "0")
+set(YAML_CPP_VERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}.${YAML_CPP_VERSION_PATCH}")
+
+enable_testing()
+
+
+###
+### Project options
+###
+## Project stuff
+option(YAML_CPP_BUILD_TESTS "Enable testing" ON)
 option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON)
-option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ${BUILD_SHARED_LIBS})
+option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" ON)
-option(YAML_CPP_INSTALL "Enable generation of yaml-cpp install targets" ${YAML_CPP_MAIN_PROJECT})
-option(YAML_CPP_FORMAT_SOURCE "Format source" ${YAML_CPP_MAIN_PROJECT})
-option(YAML_CPP_DISABLE_UNINSTALL  "Disable uninstallation of yaml-cpp" OFF)
-option(YAML_USE_SYSTEM_GTEST "Use system googletest if found" OFF)
-option(YAML_ENABLE_PIC "Use Position-Independent Code " ON)
 
-cmake_dependent_option(YAML_CPP_BUILD_TESTS
+## Build options
-  "Enable yaml-cpp tests" OFF
+# --> General
-  "BUILD_TESTING;YAML_CPP_MAIN_PROJECT" OFF)
+# see http://www.cmake.org/cmake/help/cmake2.6docs.html#variable:BUILD_SHARED_LIBS
-cmake_dependent_option(YAML_MSVC_SHARED_RT
+#     http://www.cmake.org/cmake/help/cmake2.6docs.html#command:add_library
-  "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON
+option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
-  "CMAKE_SYSTEM_NAME MATCHES Windows" OFF)
-set(YAML_CPP_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp"
-  CACHE STRING "Path to install the CMake package to")
- 
-if (YAML_CPP_FORMAT_SOURCE)
-    find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format)
-endif()
 
-if (YAML_BUILD_SHARED_LIBS)
+# --> Apple
-  set(yaml-cpp-type SHARED)
+option(APPLE_UNIVERSAL_BIN "Apple: Build universal binary" OFF)
-  set(yaml-cpp-label-postfix "shared")
+
+# --> Microsoft Visual C++
+# see http://msdn.microsoft.com/en-us/library/aa278396(v=VS.60).aspx
+#     http://msdn.microsoft.com/en-us/library/2kzt1wy3(v=VS.71).aspx
+option(MSVC_SHARED_RT "MSVC: Build with shared runtime libs (/MD)" ON)
+option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (/ML until VS .NET 2003)" OFF)
+
+###
+### Sources, headers, directories and libs
+###
+
+# From http://www.cmake.org/pipermail/cmake/2010-March/035992.html:
+# function to collect all the sources from sub-directories
+# into a single list
+function(add_sources)
+  get_property(is_defined GLOBAL PROPERTY SRCS_LIST DEFINED)
+  if(NOT is_defined)
+    define_property(GLOBAL PROPERTY SRCS_LIST
+      BRIEF_DOCS "List of source files"
+      FULL_DOCS "List of all source files in the entire project")
+  endif()
+  # make absolute paths
+  set(SRCS)
+  foreach(s IN LISTS ARGN)
+    if(NOT IS_ABSOLUTE "${s}")
+      get_filename_component(s "${s}" ABSOLUTE)
+    endif()
+    list(APPEND SRCS "${s}")
+  endforeach()
+  # append to global list
+  set_property(GLOBAL APPEND PROPERTY SRCS_LIST "${SRCS}")
+endfunction(add_sources)
+
+set(header_directory "include/yaml-cpp/")
+
+file(GLOB sources "src/[a-zA-Z]*.cpp")
+file(GLOB_RECURSE public_headers "include/yaml-cpp/[a-zA-Z]*.h")
+file(GLOB private_headers "src/[a-zA-Z]*.h")
+
+if(YAML_CPP_BUILD_CONTRIB)
+	file(GLOB contrib_sources "src/contrib/[a-zA-Z]*.cpp")
+	file(GLOB contrib_public_headers "include/yaml-cpp/contrib/[a-zA-Z]*.h")
+	file(GLOB contrib_private_headers "src/contrib/[a-zA-Z]*.h")
 else()
-  set(yaml-cpp-type STATIC)
+	add_definitions(-DYAML_CPP_NO_CONTRIB)
-  set(yaml-cpp-label-postfix "static")
 endif()
 
-set(build-shared $<BOOL:${YAML_BUILD_SHARED_LIBS}>)
+set(library_sources
-set(build-windows-dll $<AND:$<BOOL:${CMAKE_HOST_WIN32}>,${build-shared}>)
+  ${sources}
-set(not-msvc $<NOT:$<CXX_COMPILER_ID:MSVC>>)
+  ${public_headers}
-set(msvc-shared_rt $<BOOL:${YAML_MSVC_SHARED_RT}>)
+  ${private_headers}
+  ${contrib_sources}
+  ${contrib_public_headers}
+  ${contrib_private_headers}
+)
+add_sources(${library_sources})
 
-if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
+if(VERBOSE)
-  set(CMAKE_MSVC_RUNTIME_LIBRARY
+	message(STATUS "sources: ${sources}")
-    MultiThreaded$<$<CONFIG:Debug>:Debug>$<${msvc-shared_rt}:DLL>)
+	message(STATUS "public_headers: ${public_headers}")
+	message(STATUS "private_headers: ${private_headers}")
+	message(STATUS "contrib_sources: ${contrib_sources}")
+	message(STATUS "contrib_public_headers: ${contrib_public_headers}")
+	message(STATUS "contrib_private_headers: ${contrib_private_headers}")
 endif()
 
-set(contrib-pattern "src/contrib/*.cpp")
+include_directories(${YAML_CPP_SOURCE_DIR}/src)
-set(src-pattern "src/*.cpp")
+include_directories(${YAML_CPP_SOURCE_DIR}/include)
-if (CMAKE_VERSION VERSION_GREATER 3.12)
+
-  list(INSERT contrib-pattern 0 CONFIGURE_DEPENDS)
+
-  list(INSERT src-pattern 0 CONFIGURE_DEPENDS)
+
+###
+### General compilation settings
+###
+set(yaml_c_flags ${CMAKE_C_FLAGS})
+set(yaml_cxx_flags ${CMAKE_CXX_FLAGS})
+
+if(BUILD_SHARED_LIBS)
+	set(LABEL_SUFFIX "shared")
+else()
+	set(LABEL_SUFFIX "static")
 endif()
 
-file(GLOB yaml-cpp-contrib-sources ${contrib-pattern})
+if(APPLE)
-file(GLOB yaml-cpp-sources ${src-pattern})
+	if(APPLE_UNIVERSAL_BIN)
-
+		set(CMAKE_OSX_ARCHITECTURES ppc;i386)
-set(msvc-rt $<TARGET_PROPERTY:MSVC_RUNTIME_LIBRARY>)
+	endif()
-
-set(msvc-rt-mtd-static $<STREQUAL:${msvc-rt},MultiThreadedDebug>)
-set(msvc-rt-mt-static $<STREQUAL:${msvc-rt},MultiThreaded>)
-
-set(msvc-rt-mtd-dll $<STREQUAL:${msvc-rt},MultiThreadedDebugDLL>)
-set(msvc-rt-mt-dll $<STREQUAL:${msvc-rt},MultiThreadedDLL>)
-
-set(backport-msvc-runtime $<VERSION_LESS:${CMAKE_VERSION},3.15>)
-
-add_library(yaml-cpp ${yaml-cpp-type} "")
-add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
-
-set_property(TARGET yaml-cpp
-  PROPERTY
-    MSVC_RUNTIME_LIBRARY ${CMAKE_MSVC_RUNTIME_LIBRARY})
-set_property(TARGET yaml-cpp
-  PROPERTY
-    CXX_STANDARD_REQUIRED ON)
-
-if (NOT YAML_BUILD_SHARED_LIBS)
-      set_property(TARGET yaml-cpp PROPERTY POSITION_INDEPENDENT_CODE ${YAML_ENABLE_PIC})
 endif()
 
-target_include_directories(yaml-cpp
+if(IPHONE)
-  PUBLIC
+	set(CMAKE_OSX_SYSROOT "iphoneos4.2")
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+	set(CMAKE_OSX_ARCHITECTURES "armv6;armv7")
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  PRIVATE
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-
-if (NOT DEFINED CMAKE_CXX_STANDARD)
-  set_target_properties(yaml-cpp
-    PROPERTIES
-      CXX_STANDARD 11)
 endif()
 
-if(YAML_CPP_MAIN_PROJECT)
+if(WIN32)
-  target_compile_options(yaml-cpp
+	if(BUILD_SHARED_LIBS)
-    PRIVATE
+		add_definitions(-D${PROJECT_NAME}_DLL)	# use or build Windows DLL
-      $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long>
+	endif()
-      $<${not-msvc}:-pedantic -pedantic-errors>)
+	if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+		set(CMAKE_INSTALL_PREFIX "C:/")
+	endif()
 endif()
 
-target_compile_options(yaml-cpp
+# GCC or Clang or Intel Compiler specialities
-  PRIVATE
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
-    $<$<AND:${backport-msvc-runtime},${msvc-rt-mtd-static}>:-MTd>
+   CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
-    $<$<AND:${backport-msvc-runtime},${msvc-rt-mt-static}>:-MT>
+   CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    $<$<AND:${backport-msvc-runtime},${msvc-rt-mtd-dll}>:-MDd>
-    $<$<AND:${backport-msvc-runtime},${msvc-rt-mt-dll}>:-MD>
 
-    # /wd4127 = disable warning C4127 "conditional expression is constant"
+	### General stuff
-    # http://msdn.microsoft.com/en-us/library/6t66728h.aspx
+	if(WIN32)
-    # /wd4355 = disable warning C4355 "'this' : used in base member initializer list
+		set(CMAKE_SHARED_LIBRARY_PREFIX "")	# DLLs do not have a "lib" prefix
-    # http://msdn.microsoft.com/en-us/library/3c594ae3.aspx
+		set(CMAKE_IMPORT_LIBRARY_PREFIX "")	# same for DLL import libs
-    $<$<CXX_COMPILER_ID:MSVC>:/W3 /wd4127 /wd4355>)
+		set(CMAKE_LINK_DEF_FILE_FLAG "")	# CMake workaround (2.8.3)
+	endif()
 
-target_compile_definitions(yaml-cpp
+	### Project stuff
-  PUBLIC
+	if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-    $<$<NOT:$<BOOL:${YAML_BUILD_SHARED_LIBS}>>:YAML_CPP_STATIC_DEFINE>
+		set(CMAKE_BUILD_TYPE Release)
-  PRIVATE
+	endif()
-    $<${build-windows-dll}:${PROJECT_NAME}_DLL>
+	#
-    $<$<NOT:$<BOOL:${YAML_CPP_BUILD_CONTRIB}>>:YAML_CPP_NO_CONTRIB>)
+	set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+	set(CMAKE_CXX_FLAGS_DEBUG "-g")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
+	#
+	set(GCC_EXTRA_OPTIONS "")
+	#
+	if(BUILD_SHARED_LIBS)
+		set(GCC_EXTRA_OPTIONS "${GCC_EXTRA_OPTIONS} -fPIC")
+	endif()
+	#
+	set(FLAG_TESTED "-Wextra")
+	check_cxx_compiler_flag(${FLAG_TESTED} FLAG_WEXTRA)
+	if(FLAG_WEXTRA)
+		set(GCC_EXTRA_OPTIONS "${GCC_EXTRA_OPTIONS} ${FLAG_TESTED}")
+	endif()
+	#
+	set(yaml_cxx_flags "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long -std=c++11 ${yaml_cxx_flags}")
 
-target_sources(yaml-cpp
+	### Make specific
-  PRIVATE
+	if(${CMAKE_BUILD_TOOL} MATCHES make OR ${CMAKE_BUILD_TOOL} MATCHES gmake)
-    $<$<BOOL:${YAML_CPP_BUILD_CONTRIB}>:${yaml-cpp-contrib-sources}>
+		add_custom_target(debuggable $(MAKE) clean
-    ${yaml-cpp-sources})
+			COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}
-
+			COMMENT "Adjusting settings for debug compilation"
-if (NOT DEFINED CMAKE_DEBUG_POSTFIX)
+			VERBATIM)
-  set(CMAKE_DEBUG_POSTFIX "d")
+		add_custom_target(releasable $(MAKE) clean
+			COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
+			COMMENT "Adjusting settings for release compilation"
+			VERBATIM)
+	endif()
 endif()
 
+# Microsoft VisualC++ specialities
+if(MSVC)
+	### General stuff
+	# a) Change MSVC runtime library settings (/MD[d], /MT[d], /ML[d] (single-threaded until VS 2003))
+	#    plus set lib suffix for later use and project label accordingly
+	# see http://msdn.microsoft.com/en-us/library/aa278396(v=VS.60).aspx
+	#     http://msdn.microsoft.com/en-us/library/2kzt1wy3(v=VS.71).aspx
+	set(LIB_RT_SUFFIX "md")	# CMake defaults to /MD for MSVC
+	set(LIB_RT_OPTION "/MD")
+	#
+	if(NOT MSVC_SHARED_RT)	# User wants to have static runtime libraries (/MT, /ML)
+		if(MSVC_STHREADED_RT)	# User wants to have old single-threaded static runtime libraries
+			set(LIB_RT_SUFFIX "ml")
+			set(LIB_RT_OPTION "/ML")
+			if(NOT ${MSVC_VERSION} LESS 1400)
+				message(FATAL_ERROR "Single-threaded static runtime libraries (/ML) only available until VS .NET 2003 (7.1).")
+			endif()
+		else()
+			set(LIB_RT_SUFFIX "mt")
+			set(LIB_RT_OPTION "/MT")
+		endif()
+
+		# correct linker options
+		foreach(flag_var  CMAKE_C_FLAGS  CMAKE_CXX_FLAGS)
+			foreach(config_name  ""  DEBUG  RELEASE  MINSIZEREL  RELWITHDEBINFO)
+				set(var_name "${flag_var}")
+				if(NOT "${config_name}" STREQUAL "")
+					set(var_name "${var_name}_${config_name}")
+				endif()
+				string(REPLACE "/MD" "${LIB_RT_OPTION}" ${var_name} "${${var_name}}")
+				set(${var_name} "${${var_name}}" CACHE STRING "" FORCE)
+			endforeach()
+		endforeach()
+	endif()
+	#
+	set(LABEL_SUFFIX "${LABEL_SUFFIX} ${LIB_RT_SUFFIX}")
+
+	# b) Change prefix for static libraries
+	set(CMAKE_STATIC_LIBRARY_PREFIX "lib")	# to distinguish static libraries from DLL import libs
+
+	# c) Correct suffixes for static libraries
+	if(NOT BUILD_SHARED_LIBS)
+		### General stuff
+		set(LIB_TARGET_SUFFIX "${LIB_SUFFIX}${LIB_RT_SUFFIX}")
+	endif()
+
+	### Project stuff
+	# /W3 = set warning level; see http://msdn.microsoft.com/en-us/library/thxezb7y.aspx
+	# /wd4127 = disable warning C4127 "conditional expression is constant"; see http://msdn.microsoft.com/en-us/library/6t66728h.aspx
+	# /wd4355 = disable warning C4355 "'this' : used in base member initializer list"; http://msdn.microsoft.com/en-us/library/3c594ae3.aspx
+	set(yaml_cxx_flags "/W3 /wd4127 /wd4355 ${yaml_cxx_flags}")
+endif()
+
+
+###
+### General install settings
+###
+set(INCLUDE_INSTALL_ROOT_DIR include)
+
+set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT_DIR}/yaml-cpp)
+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+
+set(_INSTALL_DESTINATIONS
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+###
+### Library
+###
+add_library(yaml-cpp ${library_sources})
+set_target_properties(yaml-cpp PROPERTIES
+  COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}"
+)
+
 set_target_properties(yaml-cpp PROPERTIES
-  VERSION "${PROJECT_VERSION}"
+	VERSION "${YAML_CPP_VERSION}"
-  SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+	SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}"
-  PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
+	PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}"
-  DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+)
 
-set(EXPORT_TARGETS yaml-cpp::yaml-cpp)
+if(IPHONE)
-configure_package_config_file(
+	set_target_properties(yaml-cpp PROPERTIES
-  "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
+		XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "3.0"
-  "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+	)
-  INSTALL_DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}"
-  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR)
-unset(EXPORT_TARGETS)
-
-write_basic_package_version_file(
-  "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-  COMPATIBILITY AnyNewerVersion)
-
-configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
-
-if (YAML_CPP_INSTALL)
-  install(TARGETS yaml-cpp
-    EXPORT yaml-cpp-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-                FILES_MATCHING PATTERN "*.h")
-  install(EXPORT yaml-cpp-targets
-    NAMESPACE yaml-cpp::
-    DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}")
-  install(FILES
-      "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-      "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-    DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}")
-  install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
+if(MSVC)
+	if(NOT BUILD_SHARED_LIBS)
+		# correct library names
+		set_target_properties(yaml-cpp PROPERTIES
+			DEBUG_POSTFIX "${LIB_TARGET_SUFFIX}d"
+			RELEASE_POSTFIX "${LIB_TARGET_SUFFIX}"
+			MINSIZEREL_POSTFIX "${LIB_TARGET_SUFFIX}"
+			RELWITHDEBINFO_POSTFIX "${LIB_TARGET_SUFFIX}"
+		)
+	endif()
+endif()
+
+install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS})
+install(
+	DIRECTORY ${header_directory}
+	DESTINATION ${INCLUDE_INSTALL_DIR}
+	FILES_MATCHING PATTERN "*.h"
+)
+
+export(
+    TARGETS yaml-cpp
+    FILE "${PROJECT_BINARY_DIR}/yaml-cpp-targets.cmake")
+export(PACKAGE yaml-cpp)
+set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets")
+
+set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
+	"${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY)
+
+if(WIN32 AND NOT CYGWIN)
+	set(INSTALL_CMAKE_DIR CMake)
+else()
+	set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp)
+endif()
+
+file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}")
+set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
+	"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in
+	"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY)
+
+install(FILES
+	"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake"
+	"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+	DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR})
+
+if(UNIX)
+	set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc)
+	configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY)
+	install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+endif()
+
+
+###
+### Extras
+###
 if(YAML_CPP_BUILD_TESTS)
-  add_subdirectory(test)
+	add_subdirectory(test)
 endif()
-
 if(YAML_CPP_BUILD_TOOLS)
-  add_subdirectory(util)
+	add_subdirectory(util)
 endif()
 
-if (YAML_CPP_FORMAT_SOURCE AND YAML_CPP_CLANG_FORMAT_EXE)
+### Formatting
-  add_custom_target(format
+get_property(all_sources GLOBAL PROPERTY SRCS_LIST)
-    COMMAND clang-format --style=file -i $<TARGET_PROPERTY:yaml-cpp,SOURCES>
+add_custom_target(format
-    COMMAND_EXPAND_LISTS
+	COMMAND clang-format --style=file -i ${all_sources}
-    COMMENT "Running clang-format"
+	COMMENT "Running clang-format"
-    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+	VERBATIM)
-    VERBATIM)
-endif()
-
-# uninstall target
-if(YAML_CPP_INSTALL AND NOT YAML_CPP_DISABLE_UNINSTALL AND NOT TARGET uninstall)
-  configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-
-  add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-endif()

CONTRIBUTING.md

@@ -17,9 +17,9 @@ Commit messages should be in the imperative mood, as described in the [Git contr
 
 # Tests
 
-Please verify the tests pass by configuring CMake with `-D YAML_CPP_BUILD_TESTS=ON` and running the target `test/yaml-cpp-tests`.
+Please verify the tests pass by running the target `tests/run_tests`.
 
-If you are adding functionality, add tests accordingly. Note that the "spec tests" are reserved for examples directly from the YAML spec, so if you have new examples, put them in other test files.
+If you are adding functionality, add tests accordingly.
 
 # Pull request process
 

MODULE.bazel

@@ -1,14 +0,0 @@
-"""
-yaml-cpp is a YAML parser and emitter in c++ matching the YAML specification.
-"""
-
-module(
-    name = "yaml-cpp",
-    compatibility_level = 1,
-    version = "0.8.0",
-)
-
-bazel_dep(name = "platforms", version = "0.0.7")
-bazel_dep(name = "rules_cc", version = "0.0.8")
-
-bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)

MODULE.bazel.lock

@@ -1,114 +0,0 @@
-{
-  "lockFileVersion": 11,
-  "registryFileHashes": {
-    "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
-    "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
-    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/source.json": "06cc0842d241da0c5edc755edb3c7d0d008d304330e57ecf2d6449fb0b633a82",
-    "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
-    "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.4.1/MODULE.bazel": "a0dcb779424be33100dcae821e9e27e4f2901d9dfd5333efe5ac6a8d7ab75e1d",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
-    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
-    "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f",
-    "https://bcr.bazel.build/modules/googletest/1.14.0/source.json": "2478949479000fdd7de9a3d0107ba2c85bb5f961c3ecb1aa448f52549ce310b5",
-    "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
-    "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37",
-    "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615",
-    "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814",
-    "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
-    "https://bcr.bazel.build/modules/platforms/0.0.9/source.json": "cd74d854bf16a9e002fb2ca7b1a421f4403cda29f824a765acd3a8c56f8d43e6",
-    "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
-    "https://bcr.bazel.build/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b",
-    "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
-    "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
-    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
-    "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1",
-    "https://bcr.bazel.build/modules/rules_java/7.6.5/source.json": "a805b889531d1690e3c72a7a7e47a870d00323186a9904b36af83aa3d053ee8d",
-    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
-    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35",
-    "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
-    "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
-    "https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a",
-    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
-    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/source.json": "c2557066e0c0342223ba592510ad3d812d4963b9024831f7f66fd0584dd8c66c",
-    "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
-    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
-    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9",
-    "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
-    "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
-    "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
-    "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
-    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
-    "https://bcr.bazel.build/modules/stardoc/0.5.1/source.json": "a96f95e02123320aa015b956f29c00cb818fa891ef823d55148e1a362caacf29",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
-    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
-    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d"
-  },
-  "selectedYankedVersions": {},
-  "moduleExtensions": {
-    "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "PjIds3feoYE8SGbbIq2SFTZy3zmxeO2tQevJZNDo7iY=",
-        "usagesDigest": "+hz7IHWN6A1oVJJWNDB6yZRG+RYhF76wAYItpAeIUIg=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_apple_cc_toolchains": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf_toolchains",
-            "attributes": {}
-          },
-          "local_config_apple_cc": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "apple_support~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@platforms//host:extension.bzl%host_platform": {
-      "general": {
-        "bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=",
-        "usagesDigest": "pCYpDQmqMbmiiPI1p2Kd3VLm5T48rRAht5WdW0X2GlA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "host_platform": {
-            "bzlFile": "@@platforms//host:extension.bzl",
-            "ruleClassName": "host_platform_repo",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    }
-  }
-}

README.md

@@ -1,86 +1,51 @@
-# yaml-cpp ![Build Status](https://github.com/jbeder/yaml-cpp/actions/workflows/build.yml/badge.svg) [![Documentation](https://codedocs.xyz/jbeder/yaml-cpp.svg)](https://codedocs.xyz/jbeder/yaml-cpp/)
+# yaml-cpp [![Build Status](https://travis-ci.org/jbeder/yaml-cpp.svg?branch=master)](https://travis-ci.org/jbeder/yaml-cpp) [![Documentation](https://codedocs.xyz/jbeder/yaml-cpp.svg)](https://codedocs.xyz/jbeder/yaml-cpp/)
 
-`yaml-cpp` is a [YAML](http://www.yaml.org/) parser and emitter in C++ matching the [YAML 1.2 spec](http://www.yaml.org/spec/1.2/spec.html).
+yaml-cpp is a [YAML](http://www.yaml.org/) parser and emitter in C++ matching the [YAML 1.2 spec](http://www.yaml.org/spec/1.2/spec.html).
 
-## Usage
+To get a feel for how it can be used, see the [Tutorial](https://github.com/jbeder/yaml-cpp/wiki/Tutorial) or [How to Emit YAML](https://github.com/jbeder/yaml-cpp/wiki/How-To-Emit-YAML). For the old API (version < 0.5.0), see [How To Parse A Document](https://github.com/jbeder/yaml-cpp/wiki/How-To-Parse-A-Document-(Old-API)).
 
-See [Tutorial](https://github.com/jbeder/yaml-cpp/wiki/Tutorial) and [How to Emit YAML](https://github.com/jbeder/yaml-cpp/wiki/How-To-Emit-YAML) for reference. For the old API (until 0.5.0), see [How To Parse A Document](https://github.com/jbeder/yaml-cpp/wiki/How-To-Parse-A-Document-(Old-API)).
+# Problems? #
-
-## Any Problems?
 
 If you find a bug, post an [issue](https://github.com/jbeder/yaml-cpp/issues)! If you have questions about how to use yaml-cpp, please post it on http://stackoverflow.com and tag it [`yaml-cpp`](http://stackoverflow.com/questions/tagged/yaml-cpp).
 
-## How to Build
+# How to Build #
 
-`yaml-cpp` uses [CMake](http://www.cmake.org) to support cross-platform building. Install [CMake](http://www.cmake.org) _(Resources -> Download)_ before proceeding. The basic steps to build are:
+yaml-cpp uses [CMake](http://www.cmake.org) to support cross-platform building. The basic steps to build are:
 
-**Note:** If you don't use the provided installer for your platform, make sure that you add `CMake`'s bin folder to your path.
+1. Download and install [CMake](http://www.cmake.org) (Resources -> Download).
 
-#### 1. Navigate into the source directory, create build folder and run `CMake`:
+**Note:** If you don't use the provided installer for your platform, make sure that you add CMake's bin folder to your path.
 
-```sh
+2. Navigate into the source directory, and type:
+
+```
 mkdir build
 cd build
-cmake [-G generator] [-DYAML_BUILD_SHARED_LIBS=on|OFF] ..
 ```
 
-  * The `generator` option is the build system you'd like to use. Run `cmake` without arguments to see a full list of available generators.
+3. Run CMake. The basic syntax is:
-    * On Windows, you might use "Visual Studio 12 2013" (VS 2013 32-bits), or "Visual Studio 14 2015 Win64" (VS 2015 64-bits).
-    * On OS X, you might use "Xcode".
-    * On a UNIX-like system, omit the option (for a Makefile).
 
-  * `yaml-cpp` builds a static library by default, you may want to build a shared library by specifying `-DYAML_BUILD_SHARED_LIBS=ON`.
+```
+cmake [-G generator] [-DBUILD_SHARED_LIBS=ON|OFF] ..
+```
 
-  * [Debug mode of the GNU standard C++
+  * The `generator` is whatever type of build system you'd like to use. To see a full list of generators on your platform, just run `cmake` (with no arguments). For example:
-    library](https://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html)
+    * On Windows, you might use "Visual Studio 12 2013" to generate a Visual Studio 2013 solution or "Visual Studio 14 2015 Win64" to generate a 64-bit Visual Studio 2015 solution.
-    can be used when both `yaml-cpp` and client code is compiled with the
+    * On OS X, you might use "Xcode" to generate an Xcode project
-    `_GLIBCXX_DEBUG` flag (e.g. by calling CMake with `-D
+    * On a UNIX-y system, simply omit the option to generate a makefile
-    CMAKE_CXX_FLAGS_DEBUG='-g -D_GLIBCXX_DEBUG'` option).
 
-    Note that for `yaml-cpp` unit tests to run successfully, the _GoogleTest_
+  * yaml-cpp defaults to building a static library, but you may build a shared library by specifying `-DBUILD_SHARED_LIBS=ON`.
-    library also must be built with this flag, i.e. the system one cannot be
-    used (the _YAML_USE_SYSTEM_GTEST_ CMake option must be _OFF_, which is the
-    default).
 
   * For more options on customizing the build, see the [CMakeLists.txt](https://github.com/jbeder/yaml-cpp/blob/master/CMakeLists.txt) file.
 
-#### 2. Build it!
+4. Build it!
-  * The command you'll need to run depends on the generator you chose earlier.
 
-**Note:** To clean up, just remove the `build` directory.
+5. To clean up, just remove the `build` directory.
 
-## How to Integrate it within your project using CMake
+# Recent Release #
 
-You can use for example FetchContent :
+[yaml-cpp 0.5.3](https://github.com/jbeder/yaml-cpp/releases/tag/release-0.5.3) has been released! This is a bug fix release. It also will be the last release that uses Boost; futures releases will require C++11 instead.
-
-```cmake
-include(FetchContent)
-
-FetchContent_Declare(
-  yaml-cpp
-  GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-  GIT_TAG <tag_name> # Can be a tag (yaml-cpp-x.x.x), a commit hash, or a branch name (master)
-)
-FetchContent_MakeAvailable(yaml-cpp)
-
-target_link_libraries(YOUR_LIBRARY PUBLIC yaml-cpp::yaml-cpp) # The library or executable that require yaml-cpp library
-```
-
-## Recent Releases
-
-[yaml-cpp 0.8.0](https://github.com/jbeder/yaml-cpp/releases/tag/yaml-cpp-0.8.0) released!
 
 [yaml-cpp 0.3.0](https://github.com/jbeder/yaml-cpp/releases/tag/release-0.3.0) is still available if you want the old API.
 
-**The old API will stop receiving bugfixes in 2026.** The 0.3.x versions provide the old API, and 0.5.x and above all provide the new API.
+**The old API will continue to be supported, and will still receive bugfixes!** The 0.3.x and 0.4.x versions will be old API releases, and 0.5.x and above will all be new API releases.
-
-# API Documentation 
-
-The autogenerated API reference is hosted on [CodeDocs](https://codedocs.xyz/jbeder/yaml-cpp/index.html)
-
-# Third Party Integrations
-
-The following projects are not officially supported:
-
-- [Qt wrapper](https://gist.github.com/brcha/d392b2fe5f1e427cc8a6)
-- [UnrealEngine Wrapper](https://github.com/jwindgassen/UnrealYAML)

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Security updates are applied only to the latest release.
-
-## Reporting a Vulnerability
-
-If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
-
-Please disclose it at [security advisory](https://github.com/jbeder/yaml-cpp/security/advisories/new).
-
-This project is maintained by a team of volunteers on a reasonable-effort basis. As such, vulnerabilities will be disclosed in a best effort base.

cmake_uninstall.cmake.in

@@ -1,21 +0,0 @@
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    exec_program(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    if(NOT "${rm_retval}" STREQUAL 0)
-      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-    endif()
-  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-  endif()
-endforeach()

docs/Breaking-Changes.md

@@ -1,52 +0,0 @@
-# The following is a list of breaking changes to yaml-cpp, by version #
-
-# New API #
-
-## HEAD ##
-
-  * Throws an exception when trying to parse a negative number as an unsigned integer.
-  * Supports the `as<int8_t>`/`as<uint8_t>`, which throws an exception when the value exceeds the range of `int8_t`/`uint8_t`.
-
-## 0.6.0 ##
-
-  * Requires C++11.
-
-## 0.5.3 ##
-
-_none_
-
-## 0.5.2 ##
-
-_none_
-
-## 0.5.1 ##
-
-  * `Node::clear` was replaced by `Node::reset`, which takes an optional node, similar to smart pointers.
-
-## 0.5.0 ##
-
-Initial version of the new API.
-
-# Old API #
-
-## 0.3.0 ##
-
-_none_
-
-## 0.2.7 ##
-
-  * `YAML::Binary` now takes `const unsigned char *` for the binary data (instead of `const char *`).
-
-## 0.2.6 ##
-
-  * `Node::GetType()` is now `Node::Type()`, and returns an enum `NodeType::value`, where:
-> > ` struct NodeType { enum value { Null, Scalar, Sequence, Map }; }; `
-  * `Node::GetTag()` is now `Node::Tag()`
-  * `Node::Identity()` is removed, and `Node::IsAlias()` and `Node::IsReferenced()` have been merged into `Node::IsAliased()`. The reason: there's no reason to distinguish an alias node from its anchor - whichever happens to be emitted first will be the anchor, and the rest will be aliases.
-  * `Node::Read<T>` is now `Node::to<T>`. This wasn't a documented function, so it shouldn't break anything.
-  * `Node`'s comparison operators (for example, `operator == (const Node&, const T&)`) have all been removed. These weren't documented either (they were just used for the tests), so this shouldn't break anything either.
-  * The emitter no longer produces the document start by default - if you want it, you can supply it with the manipulator `YAML::BeginDoc`.
-
-## 0.2.5 ##
-
-This wiki was started with v0.2.5.

docs/How-To-Emit-YAML.md

@@ -1,226 +0,0 @@
-## Contents ##
-
-
-
-# Basic Emitting #
-
-The model for emitting YAML is `std::ostream` manipulators. A `YAML::Emitter` objects acts as an output stream, and its output can be retrieved through the `c_str()` function (as in `std::string`). For a simple example:
-
-```cpp
-#include "yaml-cpp/yaml.h"
-
-int main()
-{
-   YAML::Emitter out;
-   out << "Hello, World!";
-   
-   std::cout << "Here's the output YAML:\n" << out.c_str(); // prints "Hello, World!"
-   return 0;
-}
-```
-
-# Simple Lists and Maps #
-
-A `YAML::Emitter` object acts as a state machine, and we use manipulators to move it between states. Here's a simple sequence:
-
-```cpp
-YAML::Emitter out;
-out << YAML::BeginSeq;
-out << "eggs";
-out << "bread";
-out << "milk";
-out << YAML::EndSeq;
-```
-
-produces
-
-```yaml
-- eggs
-- bread
-- milk
-```
-
-A simple map:
-
-```cpp
-YAML::Emitter out;
-out << YAML::BeginMap;
-out << YAML::Key << "name";
-out << YAML::Value << "Ryan Braun";
-out << YAML::Key << "position";
-out << YAML::Value << "LF";
-out << YAML::EndMap;
-```
-
-produces
-
-```yaml
-name: Ryan Braun
-position: LF
-```
-
-These elements can, of course, be nested:
-
-```cpp
-YAML::Emitter out;
-out << YAML::BeginMap;
-out << YAML::Key << "name";
-out << YAML::Value << "Barack Obama";
-out << YAML::Key << "children";
-out << YAML::Value << YAML::BeginSeq << "Sasha" << "Malia" << YAML::EndSeq;
-out << YAML::EndMap;
-```
-
-produces
-
-```yaml
-name: Barack Obama
-children:
-  - Sasha
-  - Malia
-```
-
-# Using Manipulators #
-
-To deviate from standard formatting, you can use manipulators to modify the output format. For example,
-
-```cpp
-YAML::Emitter out;
-out << YAML::Literal << "A\n B\n  C";
-```
-
-produces
-
-```yaml
-|
-A
- B
-  C
-```
-and
-
-```cpp
-YAML::Emitter out;
-out << YAML::Flow;
-out << YAML::BeginSeq << 2 << 3 << 5 << 7 << 11 << YAML::EndSeq;
-```
-
-produces
-
-```yaml
-[2, 3, 5, 7, 11]
-```
-
-Comments act like manipulators:
-
-```cpp
-YAML::Emitter out;
-out << YAML::BeginMap;
-out << YAML::Key << "method";
-out << YAML::Value << "least squares";
-out << YAML::Comment("should we change this method?");
-out << YAML::EndMap;
-```
-
-produces
-
-```yaml
-method: least squares  # should we change this method?
-```
-
-And so do aliases/anchors:
-
-```cpp
-YAML::Emitter out;
-out << YAML::BeginSeq;
-out << YAML::Anchor("fred");
-out << YAML::BeginMap;
-out << YAML::Key << "name" << YAML::Value << "Fred";
-out << YAML::Key << "age" << YAML::Value << "42";
-out << YAML::EndMap;
-out << YAML::Alias("fred");
-out << YAML::EndSeq;
-```
-
-produces
-
-```yaml
-- &fred
-  name: Fred
-  age: 42
-- *fred
-```
-
-# STL Containers, and Other Overloads #
-We overload `operator <<` for `std::vector`, `std::list`, and `std::map`, so you can write stuff like:
-
-{% raw %}
-```cpp
-std::vector <int> squares = {1, 4, 9, 16};
-
-std::map <std::string, int> ages = {{"Daniel", 26}, {"Jesse", 24}};
-
-YAML::Emitter out;
-out << YAML::BeginSeq;
-out << YAML::Flow << squares;
-out << ages;
-out << YAML::EndSeq;
-```
-{% endraw %}
-
-produces
-
-```yaml
-- [1, 4, 9, 16]
--
-  Daniel: 26
-  Jesse: 24
-```
-
-Of course, you can overload `operator <<` for your own types:
-
-```cpp
-struct Vec3 { int x; int y; int z; };
-YAML::Emitter& operator << (YAML::Emitter& out, const Vec3& v) {
-	out << YAML::Flow;
-	out << YAML::BeginSeq << v.x << v.y << v.z << YAML::EndSeq;
-	return out;
-}
-```
-and it'll play nicely with everything else.
-
-# Using Existing Nodes #
-
-We also overload `operator << ` for `YAML::Node`s in both APIs, so you can output existing Nodes. Of course, Nodes in the old API are read-only, so it's tricky to emit them if you want to modify them. So use the new API!
-
-# Output Encoding #
-
-The output is always UTF-8. By default, yaml-cpp will output as much as it can without escaping any characters. If you want to restrict the output to ASCII, use the manipulator `YAML::EscapeNonAscii`:
-
-```cpp
-emitter.SetOutputCharset(YAML::EscapeNonAscii);
-```
-
-# Lifetime of Manipulators #
-
-Manipulators affect the **next** output item in the stream. If that item is a `BeginSeq` or `BeginMap`, the manipulator lasts until the corresponding `EndSeq` or `EndMap`. (However, within that sequence or map, you can override the manipulator locally, etc.; in effect, there's a "manipulator stack" behind the scenes.)
-
-If you want to permanently change a setting, there are global setters corresponding to each manipulator, e.g.:
-
-```cpp
-YAML::Emitter out;
-out.SetIndent(4);
-out.SetMapStyle(YAML::Flow);
-```
-
-# When Something Goes Wrong #
-
-If something goes wrong when you're emitting a document, it must be something like forgetting a `YAML::EndSeq`, or a misplaced `YAML::Key`. In this case, emitting silently fails (no more output is emitted) and an error flag is set. For example:
-
-```cpp
-YAML::Emitter out;
-assert(out.good());
-out << YAML::Key;
-assert(!out.good());
-std::cout << "Emitter error: " << out.GetLastError() << "\n";
-```

docs/How-To-Parse-A-Document-(Old-API).md

@@ -1,265 +0,0 @@
-_The following describes the old API. For the new API, see the [Tutorial](https://github.com/jbeder/yaml-cpp/wiki/Tutorial)._
-
-## Contents ##
-
-
-# Basic Parsing #
-
-The parser accepts streams, not file names, so you need to first load the file. Since a YAML file can contain many documents, you can grab them one-by-one. A simple way to parse a YAML file might be:
-
-```
-#include <fstream>
-#include "yaml-cpp/yaml.h"
-
-int main()
-{
-    std::ifstream fin("test.yaml");
-    YAML::Parser parser(fin);
-
-    YAML::Node doc;
-    while(parser.GetNextDocument(doc)) {
-       // ...
-    }
-
-    return 0;
-}
-```
-
-# Reading From the Document #
-
-Suppose we have a document consisting only of a scalar. We can read that scalar like this:
-
-```
-YAML::Node doc;    // let's say we've already parsed this document
-std::string scalar;
-doc >> scalar;
-std::cout << "That scalar was: " << scalar << std::endl;
-```
-
-How about sequences? Let's say our document now consists only of a sequences of scalars. We can use an iterator:
-
-```
-YAML::Node doc;    // already parsed
-for(YAML::Iterator it=doc.begin();it!=doc.end();++it) {
-    std::string scalar;
-    *it >> scalar;
-    std::cout << "Found scalar: " << scalar << std::endl;
-}
-```
-
-... or we can just loop through:
-
-```
-YAML::Node doc;    // already parsed
-for(unsigned i=0;i<doc.size();i++) {
-    std::string scalar;
-    doc[i] >> scalar;
-    std::cout << "Found scalar: " << scalar << std::endl;
-}
-```
-
-And finally maps. For now, let's say our document is a map with all keys/values being scalars. Again, we can iterate:
-
-```
-YAML::Node doc;    // already parsed
-for(YAML::Iterator it=doc.begin();it!=doc.end();++it) {
-    std::string key, value;
-    it.first() >> key;
-    it.second() >> value;
-    std::cout << "Key: " << key << ", value: " << value << std::endl;
-}
-```
-
-Note that dereferencing a map iterator is undefined; instead, use the `first` and `second` methods to get the key and value nodes, respectively.
-
-Alternatively, we can pick off the values one-by-one, if we know the keys:
-
-```
-YAML::Node doc;    // already parsed
-std::string name;
-doc["name"] >> name;
-int age;
-doc["age"] >> age;
-std::cout << "Found entry with name '" << name << "' and age '" << age << "'\n";
-```
-
-One thing to be keep in mind: reading a map by key (as immediately above) requires looping through all entries until we find the right key, which is an O(n) operation. So if you're reading the entire map this way, it'll be O(n^2). For small n, this isn't a big deal, but I wouldn't recommend reading maps with a very large number of entries (>100, say) this way.
-
-## Optional Keys ##
-
-If you try to access a key that doesn't exist, `yaml-cpp` throws an exception (see [When Something Goes Wrong](https://github.com/jbeder/yaml-cpp/wiki/How-To-Parse-A-Document-(Old-API)#When_Something_Goes_Wrong). If you have optional keys, it's often easier to use `FindValue` instead of `operator[]`:
-
-```
-YAML::Node doc;    // already parsed
-if(const YAML::Node *pName = doc.FindValue("name")) {
-    std::string name;
-    *pName >> name;
-    std::cout << "Key 'name' exists, with value '" << name << "'\n";
-} else {
-    std::cout << "Key 'name' doesn't exist\n";
-}
-```
-
-# Getting More Complicated #
-
-The above three methods can be combined to read from an arbitrary document. But we can make life a lot easier. Suppose we're reading 3-vectors (i.e., vectors with three components), so we've got a structure looking like this:
-
-```
-struct Vec3 {
-    float x, y, z;
-};
-```
-
-We can read this in one operation by overloading the extraction (>>) operator:
-
-```
-void operator >> (const YAML::Node& node, Vec3& v)
-{
-    node[0] >> v.x;
-    node[1] >> v.y;
-    node[2] >> v.z;
-}
-
-// now it's a piece of cake to read it
-YAML::Node doc;    // already parsed
-Vec3 v;
-doc >> v;
-std::cout << "Here's the vector: (" << v.x << ", " << v.y << ", " << v.z << ")\n";
-```
-
-# A Complete Example #
-
-Here's a complete example of how to parse a complex YAML file:
-
-`monsters.yaml`
-
-```
-- name: Ogre
-  position: [0, 5, 0]
-  powers:
-    - name: Club
-      damage: 10
-    - name: Fist
-      damage: 8
-- name: Dragon
-  position: [1, 0, 10]
-  powers:
-    - name: Fire Breath
-      damage: 25
-    - name: Claws
-      damage: 15
-- name: Wizard
-  position: [5, -3, 0]
-  powers:
-    - name: Acid Rain
-      damage: 50
-    - name: Staff
-      damage: 3
-```
-
-`main.cpp`
-
-```
-#include "yaml-cpp/yaml.h"
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <vector>
-
-// our data types
-struct Vec3 {
-   float x, y, z;
-};
-
-struct Power {
-   std::string name;
-   int damage;
-};
-
-struct Monster {
-   std::string name;
-   Vec3 position;
-   std::vector <Power> powers;
-};
-
-// now the extraction operators for these types
-void operator >> (const YAML::Node& node, Vec3& v) {
-   node[0] >> v.x;
-   node[1] >> v.y;
-   node[2] >> v.z;
-}
-
-void operator >> (const YAML::Node& node, Power& power) {
-   node["name"] >> power.name;
-   node["damage"] >> power.damage;
-}
-
-void operator >> (const YAML::Node& node, Monster& monster) {
-   node["name"] >> monster.name;
-   node["position"] >> monster.position;
-   const YAML::Node& powers = node["powers"];
-   for(unsigned i=0;i<powers.size();i++) {
-      Power power;
-      powers[i] >> power;
-      monster.powers.push_back(power);
-   }
-}
-
-int main()
-{
-   std::ifstream fin("monsters.yaml");
-   YAML::Parser parser(fin);
-   YAML::Node doc;
-   parser.GetNextDocument(doc);
-   for(unsigned i=0;i<doc.size();i++) {
-      Monster monster;
-      doc[i] >> monster;
-      std::cout << monster.name << "\n";
-   }
-
-   return 0;
-}
-```
-
-# When Something Goes Wrong #
-
-... we throw an exception (all exceptions are derived from `YAML::Exception`). If there's a parsing exception (i.e., a malformed YAML document), we throw a `YAML::ParserException`:
-
-```
-try {
-    std::ifstream fin("test.yaml");
-    YAML::Parser parser(fin);
-    YAML::Node doc;
-    parser.GetNextDocument(doc);
-    // do stuff
-} catch(YAML::ParserException& e) {
-    std::cout << e.what() << "\n";
-}
-```
-
-If you make a programming error (say, trying to read a scalar from a sequence node, or grabbing a key that doesn't exist), we throw some kind of `YAML::RepresentationException`. To prevent this, you can check what kind of node something is:
-
-```
-    YAML::Node node;
-    YAML::NodeType::value type = node.Type();  // should be:
-                                               // YAML::NodeType::Null
-                                               // YAML::NodeType::Scalar
-                                               // YAML::NodeType::Sequence
-                                               // YAML::NodeType::Map
-```
-
-# Note about copying `YAML::Node` #
-
-Currently `YAML::Node` is non-copyable, so you need to do something like
-
-```
-    const YAML::Node& node = doc["whatever"];
-```
-
-This is intended behavior. If you want to copy a node, use the `Clone` function:
-
-```
-    std::auto_ptr<YAML::Node> pCopy = myOtherNode.Clone();
-```
-
-The intent is that if you'd like to keep a `YAML::Node` around for longer than the document will stay in scope, you can clone it and store it as long as you like.

docs/Strings.md

@@ -1,18 +0,0 @@
-# Encodings and `yaml-cpp` #
-
-`yaml-cpp` will parse any file as specified by the [YAML 1.2 spec](http://www.yaml.org/spec/1.2/spec.html#id2570322). Internally, it stores all strings in UTF-8, and representation is done with UTF-8. This means that in
-
-```
-std::string str;
-node >> str;
-```
-
-`str` will be UTF-8. Similarly, if you're accessing a map by string key, you need to pass the key in UTF-8. If your application uses a different encoding, you need to convert to and from UTF-8 to work with `yaml-cpp`. (It's possible we'll add some small conversion functions, but for now it's restricted.)
-
----
-
-For convenience, Richard Weeks has kindly provided a google gadget that converts Unicode to a string literal. It's a Google Gadget, so unfortunately it does not work on GitHub. Patches welcome to port it to a usable format here:
-
-```
-<wiki:gadget url="http://hosting.gmodules.com/ig/gadgets/file/111180078345548400783/c-style-utf8-encoder.xml"/>
-```

docs/Tutorial.md

@@ -1,201 +0,0 @@
-# Introduction #
-
-A typical example, loading a configuration file, might look like this:
-
-```cpp
-YAML::Node config = YAML::LoadFile("config.yaml");
-
-if (config["lastLogin"]) {
-  std::cout << "Last logged in: " << config["lastLogin"].as<DateTime>() << "\n";
-}
-
-const std::string username = config["username"].as<std::string>();
-const std::string password = config["password"].as<std::string>();
-login(username, password);
-config["lastLogin"] = getCurrentDateTime();
-
-std::ofstream fout("config.yaml");
-fout << config;
-```
-
-# Basic Parsing and Node Editing #
-
-All nodes in a YAML document (including the root) are represented by `YAML::Node`. You can check what kind it is:
-
-```cpp
-YAML::Node node = YAML::Load("[1, 2, 3]");
-assert(node.Type() == YAML::NodeType::Sequence);
-assert(node.IsSequence());  // a shortcut!
-```
-
-Collection nodes (sequences and maps) act somewhat like STL vectors and maps:
-
-```cpp
-YAML::Node primes = YAML::Load("[2, 3, 5, 7, 11]");
-for (std::size_t i=0;i<primes.size();i++) {
-  std::cout << primes[i].as<int>() << "\n";
-}
-// or:
-for (YAML::const_iterator it=primes.begin();it!=primes.end();++it) {
-  std::cout << it->as<int>() << "\n";
-}
-
-primes.push_back(13);
-assert(primes.size() == 6);
-```
-
-and
-
-```cpp
-YAML::Node lineup = YAML::Load("{1B: Prince Fielder, 2B: Rickie Weeks, LF: Ryan Braun}");
-for(YAML::const_iterator it=lineup.begin();it!=lineup.end();++it) {
-  std::cout << "Playing at " << it->first.as<std::string>() << " is " << it->second.as<std::string>() << "\n";
-}
-
-lineup["RF"] = "Corey Hart";
-lineup["C"] = "Jonathan Lucroy";
-assert(lineup.size() == 5);
-```
-
-Querying for keys does **not** create them automatically (this makes handling optional map entries very easy)
-
-```cpp
-YAML::Node node = YAML::Load("{name: Brewers, city: Milwaukee}");
-if (node["name"]) {
-  std::cout << node["name"].as<std::string>() << "\n";
-}
-if (node["mascot"]) {
-  std::cout << node["mascot"].as<std::string>() << "\n";
-}
-assert(node.size() == 2); // the previous call didn't create a node
-```
-
-If you're not sure what kind of data you're getting, you can query the type of a node:
-
-```cpp
-switch (node.Type()) {
-  case Null: // ...
-  case Scalar: // ...
-  case Sequence: // ...
-  case Map: // ...
-  case Undefined: // ...
-}
-```
-
-or ask directly whether it's a particular type, e.g.:
-
-```cpp
-if (node.IsSequence()) {
-  // ...
-}
-```
-
-# Building Nodes #
-
-You can build `YAML::Node` from scratch:
-
-```cpp
-YAML::Node node;  // starts out as null
-node["key"] = "value";  // it now is a map node
-node["seq"].push_back("first element");  // node["seq"] automatically becomes a sequence
-node["seq"].push_back("second element");
-
-node["mirror"] = node["seq"][0];  // this creates an alias
-node["seq"][0] = "1st element";  // this also changes node["mirror"]
-node["mirror"] = "element #1";  // and this changes node["seq"][0] - they're really the "same" node
-
-node["self"] = node;  // you can even create self-aliases
-node[node["mirror"]] = node["seq"];  // and strange loops :)
-```
-
-The above node is now:
-
-```yaml
-&1
-key: value
-&2 seq: [&3 "element #1", second element]
-mirror: *3
-self: *1
-*3 : *2
-```
-
-# How Sequences Turn Into Maps #
-
-Sequences can be turned into maps by asking for non-integer keys. For example,
-
-```cpp
-YAML::Node node  = YAML::Load("[1, 2, 3]");
-node[1] = 5;  // still a sequence, [1, 5, 3]
-node.push_back(-3) // still a sequence, [1, 5, 3, -3]
-node["key"] = "value"; // now it's a map! {0: 1, 1: 5, 2: 3, 3: -3, key: value}
-```
-
-Indexing a sequence node by an index that's not in its range will _usually_ turn it into a map, but if the index is one past the end of the sequence, then the sequence will grow by one to accommodate it. (That's the **only** exception to this rule.) For example,
-
-```cpp
-YAML::Node node = YAML::Load("[1, 2, 3]");
-node[3] = 4; // still a sequence, [1, 2, 3, 4]
-node[10] = 10;  // now it's a map! {0: 1, 1: 2, 2: 3, 3: 4, 10: 10}
-```
-
-# Converting To/From Native Data Types #
-
-Yaml-cpp has built-in conversion to and from most built-in data types, as well as `std::vector`, `std::list`, and `std::map`. The following examples demonstrate when those conversions are used:
-
-```cpp
-YAML::Node node = YAML::Load("{pi: 3.14159, [0, 1]: integers}");
-
-// this needs the conversion from Node to double
-double pi = node["pi"].as<double>();
-
-// this needs the conversion from double to Node
-node["e"] = 2.71828;
-
-// this needs the conversion from Node to std::vector<int> (*not* the other way around!)
-std::vector<int> v;
-v.push_back(0);
-v.push_back(1);
-std::string str = node[v].as<std::string>();
-```
-
-To use yaml-cpp with your own data types, you need to specialize the YAML::convert<> template class. For example, suppose you had a simple `Vec3` class:
-
-```cpp
-struct Vec3 { double x, y, z; /* etc - make sure you have overloaded operator== */ };
-```
-
-You could write
-
-```cpp
-namespace YAML {
-template<>
-struct convert<Vec3> {
-  static Node encode(const Vec3& rhs) {
-    Node node;
-    node.push_back(rhs.x);
-    node.push_back(rhs.y);
-    node.push_back(rhs.z);
-    return node;
-  }
-
-  static bool decode(const Node& node, Vec3& rhs) {
-    if(!node.IsSequence() || node.size() != 3) {
-      return false;
-    }
-
-    rhs.x = node[0].as<double>();
-    rhs.y = node[1].as<double>();
-    rhs.z = node[2].as<double>();
-    return true;
-  }
-};
-}
-```
-
-Then you could use `Vec3` wherever you could use any other type:
-
-```cpp
-YAML::Node node = YAML::Load("start: [1, 3, 0]");
-Vec3 v = node["start"].as<Vec3>();
-node["end"] = Vec3(2, -1, 0);
-```

docs/_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-slate

docs/index.md

@@ -1 +0,0 @@
-To learn how to use the library, see the [Tutorial](https://github.com/jbeder/yaml-cpp/wiki/Tutorial) and [How To Emit YAML](https://github.com/jbeder/yaml-cpp/wiki/How-To-Emit-YAML)

include/yaml-cpp/anchor.h

@@ -10,7 +10,7 @@
 #include <cstddef>
 
 namespace YAML {
-using anchor_t = std::size_t;
+typedef std::size_t anchor_t;
 const anchor_t NullAnchor = 0;
 }
 

include/yaml-cpp/binary.h

@@ -19,13 +19,9 @@ YAML_CPP_API std::vector<unsigned char> DecodeBase64(const std::string &input);
 
 class YAML_CPP_API Binary {
  public:
+  Binary() : m_unownedData(0), m_unownedSize(0) {}
   Binary(const unsigned char *data_, std::size_t size_)
-      : m_data{}, m_unownedData(data_), m_unownedSize(size_) {}
+      : m_unownedData(data_), m_unownedSize(size_) {}
-  Binary() : Binary(nullptr, 0) {}
-  Binary(const Binary &) = default;
-  Binary(Binary &&) = default;
-  Binary &operator=(const Binary &) = default;
-  Binary &operator=(Binary &&) = default;
 
   bool owned() const { return !m_unownedData; }
   std::size_t size() const { return owned() ? m_data.size() : m_unownedSize; }
@@ -39,7 +35,7 @@ class YAML_CPP_API Binary {
       rhs.clear();
       rhs.resize(m_unownedSize);
       std::copy(m_unownedData, m_unownedData + m_unownedSize, rhs.begin());
-      m_unownedData = nullptr;
+      m_unownedData = 0;
       m_unownedSize = 0;
     } else {
       m_data.swap(rhs);
@@ -66,6 +62,6 @@ class YAML_CPP_API Binary {
   const unsigned char *m_unownedData;
   std::size_t m_unownedSize;
 };
-}  // namespace YAML
+}
 
 #endif  // BASE64_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/contrib/anchordict.h

@@ -22,7 +22,6 @@ namespace YAML {
 template <class T>
 class AnchorDict {
  public:
-  AnchorDict() : m_data{} {}
   void Register(anchor_t anchor, T value) {
     if (anchor > m_data.size()) {
       m_data.resize(anchor);
@@ -35,6 +34,6 @@ class AnchorDict {
  private:
   std::vector<T> m_data;
 };
-}  // namespace YAML
+}
 
 #endif  // ANCHORDICT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/contrib/graphbuilder.h

@@ -15,7 +15,7 @@ class Parser;
 
 // GraphBuilderInterface
 // . Abstraction of node creation
-// . pParentNode is always nullptr or the return value of one of the NewXXX()
+// . pParentNode is always NULL or the return value of one of the NewXXX()
 //   functions.
 class GraphBuilderInterface {
  public:
@@ -73,9 +73,9 @@ class GraphBuilder : public GraphBuilderInterface {
   typedef typename Impl::Map Map;
 
   GraphBuilder(Impl &impl) : m_impl(impl) {
-    Map *pMap = nullptr;
+    Map *pMap = NULL;
-    Sequence *pSeq = nullptr;
+    Sequence *pSeq = NULL;
-    Node *pNode = nullptr;
+    Node *pNode = NULL;
 
     // Type consistency checks
     pNode = pMap;

include/yaml-cpp/depthguard.h

@@ -1,77 +0,0 @@
-#ifndef DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-#define DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000
-
-#if defined(_MSC_VER) ||                                            \
-    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "exceptions.h"
-
-namespace YAML {
-
-/**
- * @brief The DeepRecursion class
- *  An exception class which is thrown by DepthGuard. Ideally it should be
- * a member of DepthGuard. However, DepthGuard is a templated class which means
- * that any catch points would then need to know the template parameters. It is
- * simpler for clients to not have to know at the catch point what was the
- * maximum depth.
- */
-class DeepRecursion : public ParserException {
-public:
-  virtual ~DeepRecursion() = default;
-
-  DeepRecursion(int depth, const Mark& mark_, const std::string& msg_);
-
-  // Returns the recursion depth when the exception was thrown
-  int depth() const {
-    return m_depth;
-  }
-
-private:
-  int m_depth = 0;
-};
-
-/**
- * @brief The DepthGuard class
- *  DepthGuard takes a reference to an integer. It increments the integer upon
- * construction of DepthGuard and decrements the integer upon destruction.
- *
- * If the integer would be incremented past max_depth, then an exception is
- * thrown. This is ideally geared toward guarding against deep recursion.
- *
- * @param max_depth
- *  compile-time configurable maximum depth.
- */
-template <int max_depth = 2000>
-class DepthGuard final {
-public:
-  DepthGuard(int & depth_, const Mark& mark_, const std::string& msg_) : m_depth(depth_) {
-    ++m_depth;
-    if ( max_depth <= m_depth ) {
-        throw DeepRecursion{m_depth, mark_, msg_};
-    }
-  }
-
-  DepthGuard(const DepthGuard & copy_ctor) = delete;
-  DepthGuard(DepthGuard && move_ctor) = delete;
-  DepthGuard & operator=(const DepthGuard & copy_assign) = delete;
-  DepthGuard & operator=(DepthGuard && move_assign) = delete;
-
-  ~DepthGuard() {
-    --m_depth;
-  }
-
-  int current_depth() const {
-    return m_depth;
-  }
-
-private:
-    int & m_depth;
-};
-
-} // namespace YAML
-
-#endif // DEPTH_GUARD_H_00000000000000000000000000000000000000000000000000000000

include/yaml-cpp/dll.h

@@ -1,59 +1,33 @@
 #ifndef DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-// Definition YAML_CPP_STATIC_DEFINE using to building YAML-CPP as static
+#if defined(_MSC_VER) ||                                            \
-// library (definition created by CMake or defined manually)
+    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-
+     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
-// Definition yaml_cpp_EXPORTS using to building YAML-CPP as dll/so library
+#pragma once
-// (definition created by CMake or defined manually)
-
-#ifdef YAML_CPP_STATIC_DEFINE
-#  define YAML_CPP_API
-#  define YAML_CPP_NO_EXPORT
-#else
-#  if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
-#    ifndef YAML_CPP_API
-#      ifdef yaml_cpp_EXPORTS
-         /* We are building this library */
-#        define YAML_CPP_API __declspec(dllexport)
-#      else
-         /* We are using this library */
-#        define YAML_CPP_API __declspec(dllimport)
-#      endif
-#    endif
-#    ifndef YAML_CPP_NO_EXPORT
-#      define YAML_CPP_NO_EXPORT
-#    endif
-#  else /* No _MSC_VER */
-#    ifndef YAML_CPP_API
-#      ifdef yaml_cpp_EXPORTS
-         /* We are building this library */
-#        define YAML_CPP_API __attribute__((visibility("default")))
-#      else
-         /* We are using this library */
-#        define YAML_CPP_API __attribute__((visibility("default")))
-#      endif
-#    endif
-#    ifndef YAML_CPP_NO_EXPORT
-#      define YAML_CPP_NO_EXPORT __attribute__((visibility("hidden")))
-#    endif
-#  endif /* _MSC_VER */
-#endif   /* YAML_CPP_STATIC_DEFINE */
-
-#ifndef YAML_CPP_DEPRECATED
-#  ifdef _MSC_VER
-#    define YAML_CPP_DEPRECATED __declspec(deprecated)
-#  else
-#    define YAML_CPP_DEPRECATED __attribute__ ((__deprecated__))
-#  endif
 #endif
 
-#ifndef YAML_CPP_DEPRECATED_EXPORT
+// The following ifdef block is the standard way of creating macros which make
-#  define YAML_CPP_DEPRECATED_EXPORT YAML_CPP_API YAML_CPP_DEPRECATED
+// exporting from a DLL simpler. All files within this DLL are compiled with the
-#endif
+// yaml_cpp_EXPORTS symbol defined on the command line. This symbol should not
+// be defined on any project that uses this DLL. This way any other project
+// whose source files include this file see YAML_CPP_API functions as being
+// imported from a DLL, whereas this DLL sees symbols defined with this macro as
+// being exported.
+#undef YAML_CPP_API
 
-#ifndef YAML_CPP_DEPRECATED_NO_EXPORT
+#ifdef YAML_CPP_DLL      // Using or Building YAML-CPP DLL (definition defined
-#  define YAML_CPP_DEPRECATED_NO_EXPORT YAML_CPP_NO_EXPORT YAML_CPP_DEPRECATED
+                         // manually)
-#endif
+#ifdef yaml_cpp_EXPORTS  // Building YAML-CPP DLL (definition created by CMake
+                         // or defined manually)
+//	#pragma message( "Defining YAML_CPP_API for DLL export" )
+#define YAML_CPP_API __declspec(dllexport)
+#else  // yaml_cpp_EXPORTS
+//	#pragma message( "Defining YAML_CPP_API for DLL import" )
+#define YAML_CPP_API __declspec(dllimport)
+#endif  // yaml_cpp_EXPORTS
+#else   // YAML_CPP_DLL
+#define YAML_CPP_API
+#endif  // YAML_CPP_DLL
 
-#endif /* DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66 */
+#endif  // DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/emitfromevents.h

@@ -23,23 +23,22 @@ class Emitter;
 class EmitFromEvents : public EventHandler {
  public:
   EmitFromEvents(Emitter& emitter);
-  ~EmitFromEvents() override = default;
 
-  void OnDocumentStart(const Mark& mark) override;
+  virtual void OnDocumentStart(const Mark& mark);
-  void OnDocumentEnd() override;
+  virtual void OnDocumentEnd();
 
-  void OnNull(const Mark& mark, anchor_t anchor) override;
+  virtual void OnNull(const Mark& mark, anchor_t anchor);
-  void OnAlias(const Mark& mark, anchor_t anchor) override;
+  virtual void OnAlias(const Mark& mark, anchor_t anchor);
-  void OnScalar(const Mark& mark, const std::string& tag,
+  virtual void OnScalar(const Mark& mark, const std::string& tag,
-                        anchor_t anchor, const std::string& value) override;
+                        anchor_t anchor, const std::string& value);
 
-  void OnSequenceStart(const Mark& mark, const std::string& tag,
+  virtual void OnSequenceStart(const Mark& mark, const std::string& tag,
-                               anchor_t anchor, EmitterStyle::value style) override;
+                               anchor_t anchor, EmitterStyle::value style);
-  void OnSequenceEnd() override;
+  virtual void OnSequenceEnd();
 
-  void OnMapStart(const Mark& mark, const std::string& tag,
+  virtual void OnMapStart(const Mark& mark, const std::string& tag,
-                          anchor_t anchor, EmitterStyle::value style) override;
+                          anchor_t anchor, EmitterStyle::value style);
-  void OnMapEnd() override;
+  virtual void OnMapEnd();
 
  private:
   void BeginNode();

include/yaml-cpp/emitter.h

@@ -7,26 +7,18 @@
 #pragma once
 #endif
 
-#include <cmath>
 #include <cstddef>
-#include <cstring>
-#include <limits>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <type_traits>
-
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-#include <string_view>
-#endif
 
 #include "yaml-cpp/binary.h"
 #include "yaml-cpp/dll.h"
 #include "yaml-cpp/emitterdef.h"
 #include "yaml-cpp/emittermanip.h"
+#include "yaml-cpp/noncopyable.h"
 #include "yaml-cpp/null.h"
 #include "yaml-cpp/ostream_wrapper.h"
-#include "yaml-cpp/fptostring.h"
 
 namespace YAML {
 class Binary;
@@ -36,12 +28,10 @@ struct _Null;
 namespace YAML {
 class EmitterState;
 
-class YAML_CPP_API Emitter {
+class YAML_CPP_API Emitter : private noncopyable {
  public:
   Emitter();
   explicit Emitter(std::ostream& stream);
-  Emitter(const Emitter&) = delete;
-  Emitter& operator=(const Emitter&) = delete;
   ~Emitter();
 
   // output
@@ -56,7 +46,6 @@ class YAML_CPP_API Emitter {
   bool SetOutputCharset(EMITTER_MANIP value);
   bool SetStringFormat(EMITTER_MANIP value);
   bool SetBoolFormat(EMITTER_MANIP value);
-  bool SetNullFormat(EMITTER_MANIP value);
   bool SetIntBase(EMITTER_MANIP value);
   bool SetSeqFormat(EMITTER_MANIP value);
   bool SetMapFormat(EMITTER_MANIP value);
@@ -65,7 +54,6 @@ class YAML_CPP_API Emitter {
   bool SetPostCommentIndent(std::size_t n);
   bool SetFloatPrecision(std::size_t n);
   bool SetDoublePrecision(std::size_t n);
-  void RestoreGlobalModifiedSettings();
 
   // local setters
   Emitter& SetLocalValue(EMITTER_MANIP value);
@@ -73,7 +61,6 @@ class YAML_CPP_API Emitter {
   Emitter& SetLocalPrecision(const _Precision& precision);
 
   // overloads of write
-  Emitter& Write(const char* str, std::size_t size);
   Emitter& Write(const std::string& str);
   Emitter& Write(bool b);
   Emitter& Write(char ch);
@@ -132,7 +119,6 @@ class YAML_CPP_API Emitter {
   void SpaceOrIndentTo(bool requireSpace, std::size_t indent);
 
   const char* ComputeFullBoolName(bool b) const;
-  const char* ComputeNullName() const;
   bool CanEmitNewline() const;
 
  private:
@@ -148,7 +134,6 @@ inline Emitter& Emitter::WriteIntegralType(T value) {
   PrepareNode(EmitterNodeType::Scalar);
 
   std::stringstream stream;
-  stream.imbue(std::locale("C"));
   PrepareIntegralStream(stream);
   stream << value;
   m_stream << stream.str();
@@ -166,29 +151,8 @@ inline Emitter& Emitter::WriteStreamable(T value) {
   PrepareNode(EmitterNodeType::Scalar);
 
   std::stringstream stream;
-  stream.imbue(std::locale("C"));
   SetStreamablePrecision<T>(stream);
-
+  stream << value;
-  bool special = false;
-  if (std::is_floating_point<T>::value) {
-    if ((std::numeric_limits<T>::has_quiet_NaN ||
-         std::numeric_limits<T>::has_signaling_NaN) &&
-        std::isnan(value)) {
-      special = true;
-      stream << ".nan";
-    } else if (std::numeric_limits<T>::has_infinity && std::isinf(value)) {
-      special = true;
-      if (std::signbit(value)) {
-        stream << "-.inf";
-      } else {
-        stream << ".inf";
-      }
-    }
-  }
-
-  if (!special) {
-    stream << FpToString(value, stream.precision());
-  }
   m_stream << stream.str();
 
   StartedScalar();
@@ -207,13 +171,8 @@ inline void Emitter::SetStreamablePrecision<double>(std::stringstream& stream) {
 }
 
 // overloads of insertion
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-inline Emitter& operator<<(Emitter& emitter, const std::string_view& v) {
-  return emitter.Write(v.data(), v.size());
-}
-#endif
 inline Emitter& operator<<(Emitter& emitter, const std::string& v) {
-  return emitter.Write(v.data(), v.size());
+  return emitter.Write(v);
 }
 inline Emitter& operator<<(Emitter& emitter, bool v) {
   return emitter.Write(v);
@@ -244,7 +203,7 @@ inline Emitter& operator<<(Emitter& emitter, const Binary& b) {
 }
 
 inline Emitter& operator<<(Emitter& emitter, const char* v) {
-  return emitter.Write(v, std::strlen(v));
+  return emitter.Write(std::string(v));
 }
 
 inline Emitter& operator<<(Emitter& emitter, int v) {
@@ -290,6 +249,6 @@ inline Emitter& operator<<(Emitter& emitter, _Indent indent) {
 inline Emitter& operator<<(Emitter& emitter, _Precision precision) {
   return emitter.SetLocalPrecision(precision);
 }
-}  // namespace YAML
+}
 
 #endif  // EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/emittermanip.h

@@ -19,7 +19,6 @@ enum EMITTER_MANIP {
   // output character set
   EmitNonAscii,
   EscapeNonAscii,
-  EscapeAsJson,
 
   // string manipulators
   // Auto, // duplicate
@@ -27,12 +26,6 @@ enum EMITTER_MANIP {
   DoubleQuoted,
   Literal,
 
-  // null manipulators
-  LowerNull,
-  UpperNull,
-  CamelNull,
-  TildeNull,
-
   // bool manipulators
   YesNoBool,      // yes, no
   TrueFalseBool,  // true, false
@@ -81,14 +74,14 @@ struct _Alias {
   std::string content;
 };
 
-inline _Alias Alias(const std::string& content) { return _Alias(content); }
+inline _Alias Alias(const std::string content) { return _Alias(content); }
 
 struct _Anchor {
   _Anchor(const std::string& content_) : content(content_) {}
   std::string content;
 };
 
-inline _Anchor Anchor(const std::string& content) { return _Anchor(content); }
+inline _Anchor Anchor(const std::string content) { return _Anchor(content); }
 
 struct _Tag {
   struct Type {
@@ -103,11 +96,11 @@ struct _Tag {
   Type::value type;
 };
 
-inline _Tag VerbatimTag(const std::string& content) {
+inline _Tag VerbatimTag(const std::string content) {
   return _Tag("", content, _Tag::Type::Verbatim);
 }
 
-inline _Tag LocalTag(const std::string& content) {
+inline _Tag LocalTag(const std::string content) {
   return _Tag("", content, _Tag::Type::PrimaryHandle);
 }
 
@@ -115,7 +108,7 @@ inline _Tag LocalTag(const std::string& prefix, const std::string content) {
   return _Tag(prefix, content, _Tag::Type::NamedHandle);
 }
 
-inline _Tag SecondaryTag(const std::string& content) {
+inline _Tag SecondaryTag(const std::string content) {
   return _Tag("", content, _Tag::Type::NamedHandle);
 }
 
@@ -124,7 +117,7 @@ struct _Comment {
   std::string content;
 };
 
-inline _Comment Comment(const std::string& content) { return _Comment(content); }
+inline _Comment Comment(const std::string content) { return _Comment(content); }
 
 struct _Precision {
   _Precision(int floatPrecision_, int doublePrecision_)

include/yaml-cpp/emitterstyle.h

@@ -8,10 +8,9 @@
 #endif
 
 namespace YAML {
-namespace EmitterStyle {
+struct EmitterStyle {
-enum value { Default, Block, Flow };
+  enum value { Default, Block, Flow };
-}
+};
-
 }
 
 #endif  // EMITTERSTYLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/eventhandler.h

@@ -17,7 +17,7 @@ struct Mark;
 
 class EventHandler {
  public:
-  virtual ~EventHandler() = default;
+  virtual ~EventHandler() {}
 
   virtual void OnDocumentStart(const Mark& mark) = 0;
   virtual void OnDocumentEnd() = 0;
@@ -34,12 +34,7 @@ class EventHandler {
   virtual void OnMapStart(const Mark& mark, const std::string& tag,
                           anchor_t anchor, EmitterStyle::value style) = 0;
   virtual void OnMapEnd() = 0;
-
-  virtual void OnAnchor(const Mark& /*mark*/,
-                        const std::string& /*anchor_name*/) {
-    // empty default implementation for compatibility
-  }
 };
-}  // namespace YAML
+}
 
 #endif  // EVENTHANDLER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/exceptions.h

@@ -8,12 +8,19 @@
 #endif
 
 #include "yaml-cpp/mark.h"
-#include "yaml-cpp/noexcept.h"
 #include "yaml-cpp/traits.h"
 #include <sstream>
 #include <stdexcept>
 #include <string>
 
+// This is here for compatibility with older versions of Visual Studio
+// which don't support noexcept
+#ifdef _MSC_VER
+    #define YAML_CPP_NOEXCEPT _NOEXCEPT
+#else
+    #define YAML_CPP_NOEXCEPT noexcept
+#endif
+
 namespace YAML {
 // error messages
 namespace ErrorMsg {
@@ -48,8 +55,6 @@ const char* const UNKNOWN_TOKEN = "unknown token";
 const char* const DOC_IN_SCALAR = "illegal document indicator in scalar";
 const char* const EOF_IN_SCALAR = "illegal EOF in scalar";
 const char* const CHAR_IN_SCALAR = "illegal character in scalar";
-const char* const UNEXPECTED_SCALAR = "unexpected scalar";
-const char* const UNEXPECTED_FLOW = "plain value cannot start with flow indicator character";
 const char* const TAB_IN_INDENTATION =
     "illegal tab when looking for indentation";
 const char* const FLOW_END = "illegal flow end";
@@ -67,7 +72,7 @@ const char* const ZERO_INDENT_IN_BLOCK =
 const char* const CHAR_IN_BLOCK = "unexpected character in block scalar";
 const char* const AMBIGUOUS_ANCHOR =
     "cannot assign the same alias to multiple nodes";
-const char* const UNKNOWN_ANCHOR = "the referenced anchor is not defined: ";
+const char* const UNKNOWN_ANCHOR = "the referenced anchor is not defined";
 
 const char* const INVALID_NODE =
     "invalid node; this may result from using a map iterator as a sequence "
@@ -102,12 +107,6 @@ inline const std::string KEY_NOT_FOUND_WITH_KEY(const std::string& key) {
   return stream.str();
 }
 
-inline const std::string KEY_NOT_FOUND_WITH_KEY(const char* key) {
-  std::stringstream stream;
-  stream << KEY_NOT_FOUND << ": " << key;
-  return stream.str();
-}
-
 template <typename T>
 inline const std::string KEY_NOT_FOUND_WITH_KEY(
     const T& key, typename enable_if<is_numeric<T>>::type* = 0) {
@@ -115,48 +114,13 @@ inline const std::string KEY_NOT_FOUND_WITH_KEY(
   stream << KEY_NOT_FOUND << ": " << key;
   return stream.str();
 }
-
-template <typename T>
-inline const std::string BAD_SUBSCRIPT_WITH_KEY(
-    const T&, typename disable_if<is_numeric<T>>::type* = nullptr) {
-  return BAD_SUBSCRIPT;
 }
 
-inline const std::string BAD_SUBSCRIPT_WITH_KEY(const std::string& key) {
-  std::stringstream stream;
-  stream << BAD_SUBSCRIPT << " (key: \"" << key << "\")";
-  return stream.str();
-}
-
-inline const std::string BAD_SUBSCRIPT_WITH_KEY(const char* key) {
-  std::stringstream stream;
-  stream << BAD_SUBSCRIPT << " (key: \"" << key << "\")";
-  return stream.str();
-}
-
-template <typename T>
-inline const std::string BAD_SUBSCRIPT_WITH_KEY(
-    const T& key, typename enable_if<is_numeric<T>>::type* = nullptr) {
-  std::stringstream stream;
-  stream << BAD_SUBSCRIPT << " (key: \"" << key << "\")";
-  return stream.str();
-}
-
-inline const std::string INVALID_NODE_WITH_KEY(const std::string& key) {
-  std::stringstream stream;
-  if (key.empty()) {
-    return INVALID_NODE;
-  }
-  stream << "invalid node; first invalid key: \"" << key << "\"";
-  return stream.str();
-}
-}  // namespace ErrorMsg
-
 class YAML_CPP_API Exception : public std::runtime_error {
  public:
   Exception(const Mark& mark_, const std::string& msg_)
       : std::runtime_error(build_what(mark_, msg_)), mark(mark_), msg(msg_) {}
-  ~Exception() YAML_CPP_NOEXCEPT override;
+  virtual ~Exception() YAML_CPP_NOEXCEPT;
 
   Exception(const Exception&) = default;
 
@@ -167,7 +131,7 @@ class YAML_CPP_API Exception : public std::runtime_error {
   static const std::string build_what(const Mark& mark,
                                       const std::string& msg) {
     if (mark.is_null()) {
-      return msg;
+      return msg.c_str();
     }
 
     std::stringstream output;
@@ -182,7 +146,7 @@ class YAML_CPP_API ParserException : public Exception {
   ParserException(const Mark& mark_, const std::string& msg_)
       : Exception(mark_, msg_) {}
   ParserException(const ParserException&) = default;
-  ~ParserException() YAML_CPP_NOEXCEPT override;
+  virtual ~ParserException() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API RepresentationException : public Exception {
@@ -190,7 +154,7 @@ class YAML_CPP_API RepresentationException : public Exception {
   RepresentationException(const Mark& mark_, const std::string& msg_)
       : Exception(mark_, msg_) {}
   RepresentationException(const RepresentationException&) = default;
-  ~RepresentationException() YAML_CPP_NOEXCEPT override;
+  virtual ~RepresentationException() YAML_CPP_NOEXCEPT;
 };
 
 // representation exceptions
@@ -199,7 +163,7 @@ class YAML_CPP_API InvalidScalar : public RepresentationException {
   InvalidScalar(const Mark& mark_)
       : RepresentationException(mark_, ErrorMsg::INVALID_SCALAR) {}
   InvalidScalar(const InvalidScalar&) = default;
-  ~InvalidScalar() YAML_CPP_NOEXCEPT override;
+  virtual ~InvalidScalar() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API KeyNotFound : public RepresentationException {
@@ -209,7 +173,7 @@ class YAML_CPP_API KeyNotFound : public RepresentationException {
       : RepresentationException(mark_, ErrorMsg::KEY_NOT_FOUND_WITH_KEY(key_)) {
   }
   KeyNotFound(const KeyNotFound&) = default;
-  ~KeyNotFound() YAML_CPP_NOEXCEPT override;
+  virtual ~KeyNotFound() YAML_CPP_NOEXCEPT;
 };
 
 template <typename T>
@@ -217,7 +181,7 @@ class YAML_CPP_API TypedKeyNotFound : public KeyNotFound {
  public:
   TypedKeyNotFound(const Mark& mark_, const T& key_)
       : KeyNotFound(mark_, key_), key(key_) {}
-  ~TypedKeyNotFound() YAML_CPP_NOEXCEPT override = default;
+  virtual ~TypedKeyNotFound() YAML_CPP_NOEXCEPT {}
 
   T key;
 };
@@ -230,11 +194,10 @@ inline TypedKeyNotFound<T> MakeTypedKeyNotFound(const Mark& mark,
 
 class YAML_CPP_API InvalidNode : public RepresentationException {
  public:
-  InvalidNode(const std::string& key)
+  InvalidNode()
-      : RepresentationException(Mark::null_mark(),
+      : RepresentationException(Mark::null_mark(), ErrorMsg::INVALID_NODE) {}
-                                ErrorMsg::INVALID_NODE_WITH_KEY(key)) {}
   InvalidNode(const InvalidNode&) = default;
-  ~InvalidNode() YAML_CPP_NOEXCEPT override;
+  virtual ~InvalidNode() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API BadConversion : public RepresentationException {
@@ -242,7 +205,7 @@ class YAML_CPP_API BadConversion : public RepresentationException {
   explicit BadConversion(const Mark& mark_)
       : RepresentationException(mark_, ErrorMsg::BAD_CONVERSION) {}
   BadConversion(const BadConversion&) = default;
-  ~BadConversion() YAML_CPP_NOEXCEPT override;
+  virtual ~BadConversion() YAML_CPP_NOEXCEPT;
 };
 
 template <typename T>
@@ -256,16 +219,15 @@ class YAML_CPP_API BadDereference : public RepresentationException {
   BadDereference()
       : RepresentationException(Mark::null_mark(), ErrorMsg::BAD_DEREFERENCE) {}
   BadDereference(const BadDereference&) = default;
-  ~BadDereference() YAML_CPP_NOEXCEPT override;
+  virtual ~BadDereference() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API BadSubscript : public RepresentationException {
  public:
-  template <typename Key>
+  BadSubscript()
-  BadSubscript(const Mark& mark_, const Key& key)
+      : RepresentationException(Mark::null_mark(), ErrorMsg::BAD_SUBSCRIPT) {}
-      : RepresentationException(mark_, ErrorMsg::BAD_SUBSCRIPT_WITH_KEY(key)) {}
   BadSubscript(const BadSubscript&) = default;
-  ~BadSubscript() YAML_CPP_NOEXCEPT override;
+  virtual ~BadSubscript() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API BadPushback : public RepresentationException {
@@ -273,7 +235,7 @@ class YAML_CPP_API BadPushback : public RepresentationException {
   BadPushback()
       : RepresentationException(Mark::null_mark(), ErrorMsg::BAD_PUSHBACK) {}
   BadPushback(const BadPushback&) = default;
-  ~BadPushback() YAML_CPP_NOEXCEPT override;
+  virtual ~BadPushback() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API BadInsert : public RepresentationException {
@@ -281,7 +243,7 @@ class YAML_CPP_API BadInsert : public RepresentationException {
   BadInsert()
       : RepresentationException(Mark::null_mark(), ErrorMsg::BAD_INSERT) {}
   BadInsert(const BadInsert&) = default;
-  ~BadInsert() YAML_CPP_NOEXCEPT override;
+  virtual ~BadInsert() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API EmitterException : public Exception {
@@ -289,17 +251,17 @@ class YAML_CPP_API EmitterException : public Exception {
   EmitterException(const std::string& msg_)
       : Exception(Mark::null_mark(), msg_) {}
   EmitterException(const EmitterException&) = default;
-  ~EmitterException() YAML_CPP_NOEXCEPT override;
+  virtual ~EmitterException() YAML_CPP_NOEXCEPT;
 };
 
 class YAML_CPP_API BadFile : public Exception {
  public:
-  explicit BadFile(const std::string& filename)
+  BadFile() : Exception(Mark::null_mark(), ErrorMsg::BAD_FILE) {}
-      : Exception(Mark::null_mark(),
-                  std::string(ErrorMsg::BAD_FILE) + ": " + filename) {}
   BadFile(const BadFile&) = default;
-  ~BadFile() YAML_CPP_NOEXCEPT override;
+  virtual ~BadFile() YAML_CPP_NOEXCEPT;
 };
-}  // namespace YAML
+}
+
+#undef YAML_CPP_NOEXCEPT
 
 #endif  // EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/fptostring.h

@@ -1,15 +0,0 @@
-#ifndef YAML_H_FPTOSTRING
-#define YAML_H_FPTOSTRING
-
-#include "yaml-cpp/dll.h"
-
-#include <string>
-
-namespace YAML {
-// "precision = 0" refers to shortest known unique representation of the value
-YAML_CPP_API std::string FpToString(float v, size_t precision = 0);
-YAML_CPP_API std::string FpToString(double v, size_t precision = 0);
-YAML_CPP_API std::string FpToString(long double v, size_t precision = 0);
-}
-
-#endif

include/yaml-cpp/node/convert.h

@@ -8,28 +8,18 @@
 #endif
 
 #include <array>
-#include <cmath>
 #include <limits>
 #include <list>
 #include <map>
-#include <unordered_map>
 #include <sstream>
-#include <type_traits>
-#include <valarray>
 #include <vector>
 
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-#include <string_view>
-#endif
-
 #include "yaml-cpp/binary.h"
 #include "yaml-cpp/node/impl.h"
 #include "yaml-cpp/node/iterator.h"
 #include "yaml-cpp/node/node.h"
 #include "yaml-cpp/node/type.h"
 #include "yaml-cpp/null.h"
-#include "yaml-cpp/fptostring.h"
-
 
 namespace YAML {
 class Binary;
@@ -81,33 +71,14 @@ struct convert<std::string> {
 // C-strings can only be encoded
 template <>
 struct convert<const char*> {
-  static Node encode(const char* rhs) { return Node(rhs); }
+  static Node encode(const char*& rhs) { return Node(rhs); }
-};
-
-template <>
-struct convert<char*> {
-  static Node encode(const char* rhs) { return Node(rhs); }
 };
 
 template <std::size_t N>
-struct convert<char[N]> {
+struct convert<const char[N]> {
-  static Node encode(const char* rhs) { return Node(rhs); }
+  static Node encode(const char(&rhs)[N]) { return Node(rhs); }
 };
 
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-template <>
-struct convert<std::string_view> {
-  static Node encode(std::string_view rhs) { return Node(std::string(rhs)); }
-
-  static bool decode(const Node& node, std::string_view& rhs) {
-    if (!node.IsScalar())
-      return false;
-    rhs = node.Scalar();
-    return true;
-  }
-};
-#endif
-
 template <>
 struct convert<_Null> {
   static Node encode(const _Null& /* rhs */) { return Node(); }
@@ -117,100 +88,42 @@ struct convert<_Null> {
   }
 };
 
-namespace conversion {
+#define YAML_DEFINE_CONVERT_STREAMABLE(type, negative_op)                \
-template <typename T>
+  template <>                                                            \
-typename std::enable_if< std::is_floating_point<T>::value, void>::type
+  struct convert<type> {                                                 \
-inner_encode(const T& rhs, std::stringstream& stream){
+    static Node encode(const type& rhs) {                                \
-  if (std::isnan(rhs)) {
+      std::stringstream stream;                                          \
-    stream << ".nan";
+      stream.precision(std::numeric_limits<type>::digits10 + 1);         \
-  } else if (std::isinf(rhs)) {
+      stream << rhs;                                                     \
-    if (std::signbit(rhs)) {
+      return Node(stream.str());                                         \
-      stream << "-.inf";
+    }                                                                    \
-    } else {
+                                                                         \
-      stream << ".inf";
+    static bool decode(const Node& node, type& rhs) {                    \
-    }
+      if (node.Type() != NodeType::Scalar)                               \
-  } else {
+        return false;                                                    \
-    stream << FpToString(rhs, stream.precision());
+      const std::string& input = node.Scalar();                          \
-  }
+      std::stringstream stream(input);                                   \
-}
+      stream.unsetf(std::ios::dec);                                      \
-
+      if ((stream >> std::noskipws >> rhs) && (stream >> std::ws).eof()) \
-template <typename T>
+        return true;                                                     \
-typename std::enable_if<!std::is_floating_point<T>::value, void>::type
+      if (std::numeric_limits<type>::has_infinity) {                     \
-inner_encode(const T& rhs, std::stringstream& stream){
+        if (conversion::IsInfinity(input)) {                             \
-  stream << rhs;
+          rhs = std::numeric_limits<type>::infinity();                   \
-}
+          return true;                                                   \
-
+        } else if (conversion::IsNegativeInfinity(input)) {              \
-template <typename T>
+          rhs = negative_op std::numeric_limits<type>::infinity();       \
-typename std::enable_if<(std::is_same<T, unsigned char>::value ||
+          return true;                                                   \
-                         std::is_same<T, signed char>::value), bool>::type
+        }                                                                \
-ConvertStreamTo(std::stringstream& stream, T& rhs) {
+      }                                                                  \
-  int num;
+                                                                         \
-  if ((stream >> std::noskipws >> num) && (stream >> std::ws).eof()) {
+      if (std::numeric_limits<type>::has_quiet_NaN &&                    \
-    if (num >= (std::numeric_limits<T>::min)() &&
+          conversion::IsNaN(input)) {                                    \
-        num <= (std::numeric_limits<T>::max)()) {
+        rhs = std::numeric_limits<type>::quiet_NaN();                    \
-      rhs = static_cast<T>(num);
+        return true;                                                     \
-      return true;
+      }                                                                  \
-    }
+                                                                         \
-  }
+      return false;                                                      \
-  return false;
+    }                                                                    \
-}
-
-template <typename T>
-typename std::enable_if<!(std::is_same<T, unsigned char>::value ||
-                          std::is_same<T, signed char>::value), bool>::type
-ConvertStreamTo(std::stringstream& stream, T& rhs) {
-  if ((stream >> std::noskipws >> rhs) && (stream >> std::ws).eof()) {
-    return true;
-  }
-  return false;
-}
-}
-
-#define YAML_DEFINE_CONVERT_STREAMABLE(type, negative_op)                  \
-  template <>                                                              \
-  struct convert<type> {                                                   \
-                                                                           \
-    static Node encode(const type& rhs) {                                  \
-      std::stringstream stream;                                            \
-      stream.imbue(std::locale("C"));                                       \
-      stream.precision(std::numeric_limits<type>::max_digits10);           \
-      conversion::inner_encode(rhs, stream);                               \
-      return Node(stream.str());                                           \
-    }                                                                      \
-                                                                           \
-    static bool decode(const Node& node, type& rhs) {                      \
-      if (node.Type() != NodeType::Scalar) {                               \
-        return false;                                                      \
-      }                                                                    \
-      const std::string& input = node.Scalar();                            \
-      std::stringstream stream(input);                                     \
-      stream.imbue(std::locale("C"));                                       \
-      stream.unsetf(std::ios::dec);                                        \
-      if ((stream.peek() == '-') && std::is_unsigned<type>::value) {       \
-        return false;                                                      \
-      }                                                                    \
-      if (conversion::ConvertStreamTo(stream, rhs)) {                      \
-        return true;                                                       \
-      }                                                                    \
-      if (std::numeric_limits<type>::has_infinity) {                       \
-        if (conversion::IsInfinity(input)) {                               \
-          rhs = std::numeric_limits<type>::infinity();                     \
-          return true;                                                     \
-        } else if (conversion::IsNegativeInfinity(input)) {                \
-          rhs = negative_op std::numeric_limits<type>::infinity();         \
-          return true;                                                     \
-        }                                                                  \
-      }                                                                    \
-                                                                           \
-      if (std::numeric_limits<type>::has_quiet_NaN) {                      \
-        if (conversion::IsNaN(input)) {                                    \
-          rhs = std::numeric_limits<type>::quiet_NaN();                    \
-          return true;                                                     \
-        }                                                                  \
-      }                                                                    \
-                                                                           \
-      return false;                                                        \
-    }                                                                      \
   }
 
 #define YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(type) \
@@ -249,104 +162,81 @@ struct convert<bool> {
 };
 
 // std::map
-template <typename K, typename V, typename C, typename A>
+template <typename K, typename V>
-struct convert<std::map<K, V, C, A>> {
+struct convert<std::map<K, V>> {
-  static Node encode(const std::map<K, V, C, A>& rhs) {
+  static Node encode(const std::map<K, V>& rhs) {
     Node node(NodeType::Map);
-    for (const auto& element : rhs)
+    for (typename std::map<K, V>::const_iterator it = rhs.begin();
-      node.force_insert(element.first, element.second);
+         it != rhs.end(); ++it)
+      node.force_insert(it->first, it->second);
     return node;
   }
 
-  static bool decode(const Node& node, std::map<K, V, C, A>& rhs) {
+  static bool decode(const Node& node, std::map<K, V>& rhs) {
     if (!node.IsMap())
       return false;
 
     rhs.clear();
-    for (const auto& element : node)
+    for (const_iterator it = node.begin(); it != node.end(); ++it)
 #if defined(__GNUC__) && __GNUC__ < 4
       // workaround for GCC 3:
-      rhs[element.first.template as<K>()] = element.second.template as<V>();
+      rhs[it->first.template as<K>()] = it->second.template as<V>();
 #else
-      rhs[element.first.as<K>()] = element.second.as<V>();
+      rhs[it->first.as<K>()] = it->second.as<V>();
-#endif
-    return true;
-  }
-};
-
-// std::unordered_map
-template <typename K, typename V, typename H, typename P, typename A>
-struct convert<std::unordered_map<K, V, H, P, A>> {
-  static Node encode(const std::unordered_map<K, V, H, P, A>& rhs) {
-    Node node(NodeType::Map);
-    for (const auto& element : rhs)
-      node.force_insert(element.first, element.second);
-    return node;
-  }
-
-  static bool decode(const Node& node, std::unordered_map<K, V, H, P, A>& rhs) {
-    if (!node.IsMap())
-      return false;
-
-    rhs.clear();
-    for (const auto& element : node)
-#if defined(__GNUC__) && __GNUC__ < 4
-      // workaround for GCC 3:
-      rhs[element.first.template as<K>()] = element.second.template as<V>();
-#else
-      rhs[element.first.as<K>()] = element.second.as<V>();
 #endif
     return true;
   }
 };
 
 // std::vector
-template <typename T, typename A>
+template <typename T>
-struct convert<std::vector<T, A>> {
+struct convert<std::vector<T>> {
-  static Node encode(const std::vector<T, A>& rhs) {
+  static Node encode(const std::vector<T>& rhs) {
     Node node(NodeType::Sequence);
-    for (const auto& element : rhs)
+    for (typename std::vector<T>::const_iterator it = rhs.begin();
-      node.push_back(element);
+         it != rhs.end(); ++it)
+      node.push_back(*it);
     return node;
   }
 
-  static bool decode(const Node& node, std::vector<T, A>& rhs) {
+  static bool decode(const Node& node, std::vector<T>& rhs) {
     if (!node.IsSequence())
       return false;
 
     rhs.clear();
-    for (const auto& element : node)
+    for (const_iterator it = node.begin(); it != node.end(); ++it)
 #if defined(__GNUC__) && __GNUC__ < 4
       // workaround for GCC 3:
-      rhs.push_back(element.template as<T>());
+      rhs.push_back(it->template as<T>());
 #else
-      rhs.push_back(element.as<T>());
+      rhs.push_back(it->as<T>());
 #endif
     return true;
   }
 };
 
 // std::list
-template <typename T, typename A>
+template <typename T>
-struct convert<std::list<T,A>> {
+struct convert<std::list<T>> {
-  static Node encode(const std::list<T,A>& rhs) {
+  static Node encode(const std::list<T>& rhs) {
     Node node(NodeType::Sequence);
-    for (const auto& element : rhs)
+    for (typename std::list<T>::const_iterator it = rhs.begin();
-      node.push_back(element);
+         it != rhs.end(); ++it)
+      node.push_back(*it);
     return node;
   }
 
-  static bool decode(const Node& node, std::list<T,A>& rhs) {
+  static bool decode(const Node& node, std::list<T>& rhs) {
     if (!node.IsSequence())
       return false;
 
     rhs.clear();
-    for (const auto& element : node)
+    for (const_iterator it = node.begin(); it != node.end(); ++it)
 #if defined(__GNUC__) && __GNUC__ < 4
       // workaround for GCC 3:
-      rhs.push_back(element.template as<T>());
+      rhs.push_back(it->template as<T>());
 #else
-      rhs.push_back(element.as<T>());
+      rhs.push_back(it->as<T>());
 #endif
     return true;
   }
@@ -385,37 +275,6 @@ struct convert<std::array<T, N>> {
   }
 };
 
-
-// std::valarray
-template <typename T>
-struct convert<std::valarray<T>> {
-  static Node encode(const std::valarray<T>& rhs) {
-    Node node(NodeType::Sequence);
-    for (const auto& element : rhs) {
-      node.push_back(element);
-    }
-    return node;
-  }
-
-  static bool decode(const Node& node, std::valarray<T>& rhs) {
-    if (!node.IsSequence()) {
-      return false;
-    }
-
-    rhs.resize(node.size());
-    for (auto i = 0u; i < node.size(); ++i) {
-#if defined(__GNUC__) && __GNUC__ < 4
-      // workaround for GCC 3:
-      rhs[i] = node[i].template as<T>();
-#else
-      rhs[i] = node[i].as<T>();
-#endif
-    }
-    return true;
-  }
-};
-
-
 // std::pair
 template <typename T, typename U>
 struct convert<std::pair<T, U>> {

include/yaml-cpp/node/detail/bool_type.h

@@ -0,0 +1,26 @@
+#ifndef NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+#if defined(_MSC_VER) ||                                            \
+    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
+     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
+#pragma once
+#endif
+
+namespace YAML {
+namespace detail {
+struct unspecified_bool {
+  struct NOT_ALLOWED;
+  static void true_value(NOT_ALLOWED*) {}
+};
+typedef void (*unspecified_bool_type)(unspecified_bool::NOT_ALLOWED*);
+}
+}
+
+#define YAML_CPP_OPERATOR_BOOL()                                            \
+  operator YAML::detail::unspecified_bool_type() const {                    \
+    return this->operator!() ? 0                                            \
+                             : &YAML::detail::unspecified_bool::true_value; \
+  }
+
+#endif  // NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/impl.h

@@ -9,8 +9,6 @@
 
 #include "yaml-cpp/node/detail/node.h"
 #include "yaml-cpp/node/detail/node_data.h"
-
-#include <algorithm>
 #include <type_traits>
 
 namespace YAML {
@@ -19,7 +17,7 @@ template <typename Key, typename Enable = void>
 struct get_idx {
   static node* get(const std::vector<node*>& /* sequence */,
                    const Key& /* key */, shared_memory_holder /* pMemory */) {
-    return nullptr;
+    return 0;
   }
 };
 
@@ -29,13 +27,13 @@ struct get_idx<Key,
                                        !std::is_same<Key, bool>::value>::type> {
   static node* get(const std::vector<node*>& sequence, const Key& key,
                    shared_memory_holder /* pMemory */) {
-    return key < sequence.size() ? sequence[key] : nullptr;
+    return key < sequence.size() ? sequence[key] : 0;
   }
 
   static node* get(std::vector<node*>& sequence, const Key& key,
                    shared_memory_holder pMemory) {
-    if (key > sequence.size() || (key > 0 && !sequence[key - 1]->is_defined()))
+   if (key > sequence.size() || (key > 0 && !sequence[key-1]->is_defined()))
-      return nullptr;
+      return 0;
     if (key == sequence.size())
       sequence.push_back(&pMemory->create_node());
     return sequence[key];
@@ -48,51 +46,13 @@ struct get_idx<Key, typename std::enable_if<std::is_signed<Key>::value>::type> {
                    shared_memory_holder pMemory) {
     return key >= 0 ? get_idx<std::size_t>::get(
                           sequence, static_cast<std::size_t>(key), pMemory)
-                    : nullptr;
+                    : 0;
   }
   static node* get(std::vector<node*>& sequence, const Key& key,
                    shared_memory_holder pMemory) {
     return key >= 0 ? get_idx<std::size_t>::get(
                           sequence, static_cast<std::size_t>(key), pMemory)
-                    : nullptr;
+                    : 0;
-  }
-};
-
-template <typename Key, typename Enable = void>
-struct remove_idx {
-  static bool remove(std::vector<node*>&, const Key&, std::size_t&) {
-    return false;
-  }
-};
-
-template <typename Key>
-struct remove_idx<
-    Key, typename std::enable_if<std::is_unsigned<Key>::value &&
-                                 !std::is_same<Key, bool>::value>::type> {
-
-  static bool remove(std::vector<node*>& sequence, const Key& key,
-                     std::size_t& seqSize) {
-    if (key >= sequence.size()) {
-      return false;
-    } else {
-      sequence.erase(sequence.begin() + key);
-      if (seqSize > key) {
-          --seqSize;
-      }
-      return true;
-    }
-  }
-};
-
-template <typename Key>
-struct remove_idx<Key,
-                  typename std::enable_if<std::is_signed<Key>::value>::type> {
-
-  static bool remove(std::vector<node*>& sequence, const Key& key,
-                     std::size_t& seqSize) {
-    return key >= 0 ? remove_idx<std::size_t>::remove(
-                          sequence, static_cast<std::size_t>(key), seqSize)
-                    : false;
   }
 };
 
@@ -106,11 +66,7 @@ inline bool node::equals(const T& rhs, shared_memory_holder pMemory) {
 }
 
 inline bool node::equals(const char* rhs, shared_memory_holder pMemory) {
-  std::string lhs;
+  return equals<std::string>(rhs, pMemory);
-  if (convert<std::string>::decode(Node(*this, std::move(pMemory)), lhs)) {
-    return lhs == rhs;
-  }
-  return false;
 }
 
 // indexing
@@ -122,20 +78,22 @@ inline node* node_data::get(const Key& key,
       break;
     case NodeType::Undefined:
     case NodeType::Null:
-      return nullptr;
+      return NULL;
     case NodeType::Sequence:
       if (node* pNode = get_idx<Key>::get(m_sequence, key, pMemory))
         return pNode;
-      return nullptr;
+      return NULL;
     case NodeType::Scalar:
-      throw BadSubscript(m_mark, key);
+      throw BadSubscript();
   }
 
-  auto it = std::find_if(m_map.begin(), m_map.end(), [&](const kv_pair m) {
+  for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    return m.first->equals(key, pMemory);
+    if (it->first->equals(key, pMemory)) {
-  });
+      return it->second;
+    }
+  }
 
-  return it != m_map.end() ? it->second : nullptr;
+  return NULL;
 }
 
 template <typename Key>
@@ -154,15 +112,13 @@ inline node& node_data::get(const Key& key, shared_memory_holder pMemory) {
       convert_to_map(pMemory);
       break;
     case NodeType::Scalar:
-      throw BadSubscript(m_mark, key);
+      throw BadSubscript();
   }
 
-  auto it = std::find_if(m_map.begin(), m_map.end(), [&](const kv_pair m) {
+  for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    return m.first->equals(key, pMemory);
+    if (it->first->equals(key, pMemory)) {
-  });
+      return *it->second;
-
+    }
-  if (it != m_map.end()) {
-    return *it->second;
   }
 
   node& k = convert_to_node(key, pMemory);
@@ -173,26 +129,20 @@ inline node& node_data::get(const Key& key, shared_memory_holder pMemory) {
 
 template <typename Key>
 inline bool node_data::remove(const Key& key, shared_memory_holder pMemory) {
-  if (m_type == NodeType::Sequence) {
+  if (m_type != NodeType::Map)
-    return remove_idx<Key>::remove(m_sequence, key, m_seqSize);
+    return false;
+
+  for (kv_pairs::iterator it = m_undefinedPairs.begin();
+       it != m_undefinedPairs.end();) {
+    kv_pairs::iterator jt = std::next(it);
+    if (it->first->equals(key, pMemory))
+      m_undefinedPairs.erase(it);
+    it = jt;
   }
 
-  if (m_type == NodeType::Map) {
+  for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    kv_pairs::iterator it = m_undefinedPairs.begin();
+    if (it->first->equals(key, pMemory)) {
-    while (it != m_undefinedPairs.end()) {
+      m_map.erase(it);
-      kv_pairs::iterator jt = std::next(it);
-      if (it->first->equals(key, pMemory)) {
-        m_undefinedPairs.erase(it);
-      }
-      it = jt;
-    }
-
-    auto iter = std::find_if(m_map.begin(), m_map.end(), [&](const kv_pair m) {
-      return m.first->equals(key, pMemory);
-    });
-
-    if (iter != m_map.end()) {
-      m_map.erase(iter);
       return true;
     }
   }

include/yaml-cpp/node/detail/iterator.h

@@ -8,25 +8,25 @@
 #endif
 
 #include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/detail/node_iterator.h"
 #include "yaml-cpp/node/node.h"
 #include "yaml-cpp/node/ptr.h"
+#include "yaml-cpp/node/detail/node_iterator.h"
 #include <cstddef>
 #include <iterator>
 
-
 namespace YAML {
 namespace detail {
 struct iterator_value;
 
 template <typename V>
-class iterator_base {
+class iterator_base : public std::iterator<std::forward_iterator_tag, V,
+                                           std::ptrdiff_t, V*, V> {
 
  private:
   template <typename>
   friend class iterator_base;
   struct enabler {};
-  using base_type = node_iterator;
+  typedef node_iterator base_type;
 
   struct proxy {
     explicit proxy(const V& x) : m_ref(x) {}
@@ -37,11 +37,7 @@ class iterator_base {
   };
 
  public:
-  using iterator_category = std::forward_iterator_tag;
+  typedef typename iterator_base::value_type value_type;
-  using value_type = V;
-  using difference_type = std::ptrdiff_t;
-  using pointer = V*;
-  using reference = V&;
 
  public:
   iterator_base() : m_iterator(), m_pMemory() {}
@@ -90,7 +86,7 @@ class iterator_base {
   base_type m_iterator;
   shared_memory_holder m_pMemory;
 };
-}  // namespace detail
+}
-}  // namespace YAML
+}
 
 #endif  // VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/iterator_fwd.h

@@ -20,8 +20,8 @@ template <typename V>
 class iterator_base;
 }
 
-using iterator = detail::iterator_base<detail::iterator_value>;
+typedef detail::iterator_base<detail::iterator_value> iterator;
-using const_iterator = detail::iterator_base<const detail::iterator_value>;
+typedef detail::iterator_base<const detail::iterator_value> const_iterator;
 }
 
 #endif  // VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/memory.h

@@ -22,12 +22,11 @@ namespace YAML {
 namespace detail {
 class YAML_CPP_API memory {
  public:
-  memory() : m_nodes{} {}
   node& create_node();
   void merge(const memory& rhs);
 
  private:
-  using Nodes = std::set<shared_node>;
+  typedef std::set<shared_node> Nodes;
   Nodes m_nodes;
 };
 
@@ -41,7 +40,7 @@ class YAML_CPP_API memory_holder {
  private:
   shared_memory m_pMemory;
 };
-}  // namespace detail
+}
-}  // namespace YAML
+}
 
 #endif  // VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node.h

@@ -7,24 +7,18 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/dll.h"
 #include "yaml-cpp/emitterstyle.h"
-#include "yaml-cpp/node/detail/node_ref.h"
+#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/ptr.h"
 #include "yaml-cpp/node/type.h"
+#include "yaml-cpp/node/ptr.h"
+#include "yaml-cpp/node/detail/node_ref.h"
 #include <set>
-#include <atomic>
 
 namespace YAML {
 namespace detail {
 class node {
- private:
-  struct less {
-    bool operator ()(const node* l, const node* r) const {return l->m_index < r->m_index;}
-  };
-
  public:
-  node() : m_pRef(new node_ref), m_dependencies{}, m_index{} {}
+  node() : m_pRef(new node_ref) {}
   node(const node&) = delete;
   node& operator=(const node&) = delete;
 
@@ -48,8 +42,9 @@ class node {
       return;
 
     m_pRef->mark_defined();
-    for (node* dependency : m_dependencies)
+    for (nodes::iterator it = m_dependencies.begin();
-      dependency->mark_defined();
+         it != m_dependencies.end(); ++it)
+      (*it)->mark_defined();
     m_dependencies.clear();
   }
 
@@ -114,7 +109,6 @@ class node {
   void push_back(node& input, shared_memory_holder pMemory) {
     m_pRef->push_back(input, pMemory);
     input.add_dependency(*this);
-    m_index = m_amount.fetch_add(1);
   }
   void insert(node& key, node& value, shared_memory_holder pMemory) {
     m_pRef->insert(key, value, pMemory);
@@ -126,7 +120,7 @@ class node {
   template <typename Key>
   node* get(const Key& key, shared_memory_holder pMemory) const {
     // NOTE: this returns a non-const node so that the top-level Node can wrap
-    // it, and returns a pointer so that it can be nullptr (if there is no such
+    // it, and returns a pointer so that it can be NULL (if there is no such
     // key).
     return static_cast<const node_ref&>(*m_pRef).get(key, pMemory);
   }
@@ -143,7 +137,7 @@ class node {
 
   node* get(node& key, shared_memory_holder pMemory) const {
     // NOTE: this returns a non-const node so that the top-level Node can wrap
-    // it, and returns a pointer so that it can be nullptr (if there is no such
+    // it, and returns a pointer so that it can be NULL (if there is no such
     // key).
     return static_cast<const node_ref&>(*m_pRef).get(key, pMemory);
   }
@@ -166,12 +160,10 @@ class node {
 
  private:
   shared_node_ref m_pRef;
-  using nodes = std::set<node*, less>;
+  typedef std::set<node*> nodes;
   nodes m_dependencies;
-  size_t m_index;
-  static YAML_CPP_API std::atomic<size_t> m_amount;
 };
-}  // namespace detail
+}
-}  // namespace YAML
+}
 
 #endif  // NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node_data.h

@@ -60,8 +60,8 @@ class YAML_CPP_API node_data {
   node_iterator end();
 
   // sequence
-  void push_back(node& node, const shared_memory_holder& pMemory);
+  void push_back(node& node, shared_memory_holder pMemory);
-  void insert(node& key, node& value, const shared_memory_holder& pMemory);
+  void insert(node& key, node& value, shared_memory_holder pMemory);
 
   // indexing
   template <typename Key>
@@ -71,9 +71,9 @@ class YAML_CPP_API node_data {
   template <typename Key>
   bool remove(const Key& key, shared_memory_holder pMemory);
 
-  node* get(node& key, const shared_memory_holder& pMemory) const;
+  node* get(node& key, shared_memory_holder pMemory) const;
-  node& get(node& key, const shared_memory_holder& pMemory);
+  node& get(node& key, shared_memory_holder pMemory);
-  bool remove(node& key, const shared_memory_holder& pMemory);
+  bool remove(node& key, shared_memory_holder pMemory);
 
   // map
   template <typename Key, typename Value>
@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
                     shared_memory_holder pMemory);
 
  public:
-  static const std::string& empty_scalar();
+  static std::string empty_scalar;
 
  private:
   void compute_seq_size() const;
@@ -91,8 +91,8 @@ class YAML_CPP_API node_data {
   void reset_map();
 
   void insert_map_pair(node& key, node& value);
-  void convert_to_map(const shared_memory_holder& pMemory);
+  void convert_to_map(shared_memory_holder pMemory);
-  void convert_sequence_to_map(const shared_memory_holder& pMemory);
+  void convert_sequence_to_map(shared_memory_holder pMemory);
 
   template <typename T>
   static node& convert_to_node(const T& rhs, shared_memory_holder pMemory);
@@ -108,17 +108,17 @@ class YAML_CPP_API node_data {
   std::string m_scalar;
 
   // sequence
-  using node_seq = std::vector<node *>;
+  typedef std::vector<node*> node_seq;
   node_seq m_sequence;
 
   mutable std::size_t m_seqSize;
 
   // map
-  using node_map = std::vector<std::pair<node*, node*>>;
+  typedef std::vector<std::pair<node*, node*>> node_map;
   node_map m_map;
 
-  using kv_pair = std::pair<node*, node*>;
+  typedef std::pair<node*, node*> kv_pair;
-  using kv_pairs = std::list<kv_pair>;
+  typedef std::list<kv_pair> kv_pairs;
   mutable kv_pairs m_undefinedPairs;
 };
 }

include/yaml-cpp/node/detail/node_iterator.h

@@ -24,11 +24,11 @@ struct iterator_type {
 
 template <typename V>
 struct node_iterator_value : public std::pair<V*, V*> {
-  using kv = std::pair<V*, V*>;
+  typedef std::pair<V*, V*> kv;
 
-  node_iterator_value() : kv(), pNode(nullptr) {}
+  node_iterator_value() : kv(), pNode(0) {}
   explicit node_iterator_value(V& rhs) : kv(), pNode(&rhs) {}
-  explicit node_iterator_value(V& key, V& value) : kv(&key, &value), pNode(nullptr) {}
+  explicit node_iterator_value(V& key, V& value) : kv(&key, &value), pNode(0) {}
 
   V& operator*() const { return *pNode; }
   V& operator->() const { return *pNode; }
@@ -36,23 +36,26 @@ struct node_iterator_value : public std::pair<V*, V*> {
   V* pNode;
 };
 
-using node_seq = std::vector<node *>;
+typedef std::vector<node*> node_seq;
-using node_map = std::vector<std::pair<node*, node*>>;
+typedef std::vector<std::pair<node*, node*>> node_map;
 
 template <typename V>
 struct node_iterator_type {
-  using seq = node_seq::iterator;
+  typedef node_seq::iterator seq;
-  using map = node_map::iterator;
+  typedef node_map::iterator map;
 };
 
 template <typename V>
 struct node_iterator_type<const V> {
-  using seq = node_seq::const_iterator;
+  typedef node_seq::const_iterator seq;
-  using map = node_map::const_iterator;
+  typedef node_map::const_iterator map;
 };
 
 template <typename V>
-class node_iterator_base {
+class node_iterator_base
+    : public std::iterator<std::forward_iterator_tag, node_iterator_value<V>,
+                           std::ptrdiff_t, node_iterator_value<V>*,
+                           node_iterator_value<V>> {
  private:
   struct enabler {};
 
@@ -65,13 +68,9 @@ class node_iterator_base {
   };
 
  public:
-  using iterator_category = std::forward_iterator_tag;
+  typedef typename node_iterator_type<V>::seq SeqIter;
-  using value_type = node_iterator_value<V>;
+  typedef typename node_iterator_type<V>::map MapIter;
-  using difference_type = std::ptrdiff_t;
+  typedef node_iterator_value<V> value_type;
-  using pointer = node_iterator_value<V>*;
-  using reference = node_iterator_value<V>&;
-  using SeqIter = typename node_iterator_type<V>::seq;
-  using MapIter = typename node_iterator_type<V>::map;
 
   node_iterator_base()
       : m_type(iterator_type::NoneType), m_seqIt(), m_mapIt(), m_mapEnd() {}
@@ -173,8 +172,8 @@ class node_iterator_base {
   MapIter m_mapIt, m_mapEnd;
 };
 
-using node_iterator = node_iterator_base<node>;
+typedef node_iterator_base<node> node_iterator;
-using const_node_iterator = node_iterator_base<const node>;
+typedef node_iterator_base<const node> const_node_iterator;
 }
 }
 

include/yaml-cpp/node/impl.h

@@ -7,21 +7,18 @@
 #pragma once
 #endif
 
-#include "yaml-cpp/exceptions.h"
+#include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/iterator.h"
 #include "yaml-cpp/node/detail/memory.h"
 #include "yaml-cpp/node/detail/node.h"
-#include "yaml-cpp/node/iterator.h"
+#include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/node/node.h"
-#include <sstream>
 #include <string>
 
 namespace YAML {
-inline Node::Node()
+inline Node::Node() : m_isValid(true), m_pNode(NULL) {}
-    : m_isValid(true), m_invalidKey{}, m_pMemory(nullptr), m_pNode(nullptr) {}
 
 inline Node::Node(NodeType::value type)
     : m_isValid(true),
-      m_invalidKey{},
       m_pMemory(new detail::memory_holder),
       m_pNode(&m_pMemory->create_node()) {
   m_pNode->set_type(type);
@@ -30,7 +27,6 @@ inline Node::Node(NodeType::value type)
 template <typename T>
 inline Node::Node(const T& rhs)
     : m_isValid(true),
-      m_invalidKey{},
       m_pMemory(new detail::memory_holder),
       m_pNode(&m_pMemory->create_node()) {
   Assign(rhs);
@@ -38,26 +34,24 @@ inline Node::Node(const T& rhs)
 
 inline Node::Node(const detail::iterator_value& rhs)
     : m_isValid(rhs.m_isValid),
-      m_invalidKey(rhs.m_invalidKey),
       m_pMemory(rhs.m_pMemory),
       m_pNode(rhs.m_pNode) {}
 
-inline Node::Node(const Node&) = default;
+inline Node::Node(const Node& rhs)
+    : m_isValid(rhs.m_isValid),
+      m_pMemory(rhs.m_pMemory),
+      m_pNode(rhs.m_pNode) {}
 
-inline Node::Node(Zombie)
+inline Node::Node(Zombie) : m_isValid(false), m_pNode(NULL) {}
-    : m_isValid(false), m_invalidKey{}, m_pMemory{}, m_pNode(nullptr) {}
-
-inline Node::Node(Zombie, const std::string& key)
-    : m_isValid(false), m_invalidKey(key), m_pMemory{}, m_pNode(nullptr) {}
 
 inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory)
-    : m_isValid(true), m_invalidKey{}, m_pMemory(pMemory), m_pNode(&node) {}
+    : m_isValid(true), m_pMemory(pMemory), m_pNode(&node) {}
 
-inline Node::~Node() = default;
+inline Node::~Node() {}
 
 inline void Node::EnsureNodeExists() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   if (!m_pNode) {
     m_pMemory.reset(new detail::memory_holder);
     m_pNode = &m_pMemory->create_node();
@@ -74,14 +68,14 @@ inline bool Node::IsDefined() const {
 
 inline Mark Node::Mark() const {
   if (!m_isValid) {
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   }
   return m_pNode ? m_pNode->mark() : Mark::null_mark();
 }
 
 inline NodeType::value Node::Type() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   return m_pNode ? m_pNode->type() : NodeType::Null;
 }
 
@@ -97,7 +91,7 @@ struct as_if {
     if (!node.m_pNode)
       return fallback;
 
-    T t = fallback;
+    T t;
     if (convert<T>::decode(node, t))
       return t;
     return fallback;
@@ -110,8 +104,6 @@ struct as_if<std::string, S> {
   const Node& node;
 
   std::string operator()(const S& fallback) const {
-    if (node.Type() == NodeType::Null)
-      return "null";
     if (node.Type() != NodeType::Scalar)
       return fallback;
     return node.Scalar();
@@ -124,8 +116,8 @@ struct as_if<T, void> {
   const Node& node;
 
   T operator()() const {
-    if (!node.m_pNode) // no fallback
+    if (!node.m_pNode)
-      throw InvalidNode(node.m_invalidKey);
+      throw TypedBadConversion<T>(node.Mark());
 
     T t;
     if (convert<T>::decode(node, t))
@@ -140,10 +132,6 @@ struct as_if<std::string, void> {
   const Node& node;
 
   std::string operator()() const {
-    if (node.Type() == NodeType::Undefined) // no fallback
-      throw InvalidNode(node.m_invalidKey);
-    if (node.Type() == NodeType::Null)
-      return "null";
     if (node.Type() != NodeType::Scalar)
       throw TypedBadConversion<std::string>(node.Mark());
     return node.Scalar();
@@ -154,7 +142,7 @@ struct as_if<std::string, void> {
 template <typename T>
 inline T Node::as() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   return as_if<T, void>(*this)();
 }
 
@@ -167,28 +155,32 @@ inline T Node::as(const S& fallback) const {
 
 inline const std::string& Node::Scalar() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
-  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
+  return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
 }
 
 inline const std::string& Node::Tag() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
-  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
+  return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
 }
 
 inline void Node::SetTag(const std::string& tag) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   m_pNode->set_tag(tag);
 }
 
 inline EmitterStyle::value Node::Style() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   return m_pNode ? m_pNode->style() : EmitterStyle::Default;
 }
 
 inline void Node::SetStyle(EmitterStyle::value style) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   m_pNode->set_style(style);
 }
@@ -196,7 +188,7 @@ inline void Node::SetStyle(EmitterStyle::value style) {
 // assignment
 inline bool Node::is(const Node& rhs) const {
   if (!m_isValid || !rhs.m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   if (!m_pNode || !rhs.m_pNode)
     return false;
   return m_pNode->is(*rhs.m_pNode);
@@ -204,20 +196,15 @@ inline bool Node::is(const Node& rhs) const {
 
 template <typename T>
 inline Node& Node::operator=(const T& rhs) {
+  if (!m_isValid)
+    throw InvalidNode();
   Assign(rhs);
   return *this;
 }
 
-inline Node& Node::operator=(const Node& rhs) {
-  if (is(rhs))
-    return *this;
-  AssignNode(rhs);
-  return *this;
-}
-
 inline void Node::reset(const YAML::Node& rhs) {
   if (!m_isValid || !rhs.m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   m_pMemory = rhs.m_pMemory;
   m_pNode = rhs.m_pNode;
 }
@@ -225,27 +212,44 @@ inline void Node::reset(const YAML::Node& rhs) {
 template <typename T>
 inline void Node::Assign(const T& rhs) {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   AssignData(convert<T>::encode(rhs));
 }
 
 template <>
 inline void Node::Assign(const std::string& rhs) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   m_pNode->set_scalar(rhs);
 }
 
 inline void Node::Assign(const char* rhs) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   m_pNode->set_scalar(rhs);
 }
 
 inline void Node::Assign(char* rhs) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   m_pNode->set_scalar(rhs);
 }
 
+inline Node& Node::operator=(const Node& rhs) {
+  if (!m_isValid || !rhs.m_isValid)
+    throw InvalidNode();
+  if (is(rhs))
+    return *this;
+  AssignNode(rhs);
+  return *this;
+}
+
 inline void Node::AssignData(const Node& rhs) {
+  if (!m_isValid || !rhs.m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   rhs.EnsureNodeExists();
 
@@ -254,8 +258,8 @@ inline void Node::AssignData(const Node& rhs) {
 }
 
 inline void Node::AssignNode(const Node& rhs) {
-  if (!m_isValid)
+  if (!m_isValid || !rhs.m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   rhs.EnsureNodeExists();
 
   if (!m_pNode) {
@@ -272,7 +276,7 @@ inline void Node::AssignNode(const Node& rhs) {
 // size/iterator
 inline std::size_t Node::size() const {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   return m_pNode ? m_pNode->size() : 0;
 }
 
@@ -305,11 +309,13 @@ inline iterator Node::end() {
 template <typename T>
 inline void Node::push_back(const T& rhs) {
   if (!m_isValid)
-    throw InvalidNode(m_invalidKey);
+    throw InvalidNode();
   push_back(Node(rhs));
 }
 
 inline void Node::push_back(const Node& rhs) {
+  if (!m_isValid || !rhs.m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   rhs.EnsureNodeExists();
 
@@ -317,49 +323,99 @@ inline void Node::push_back(const Node& rhs) {
   m_pMemory->merge(*rhs.m_pMemory);
 }
 
-template<typename Key>
+// helpers for indexing
-std::string key_to_string(const Key& key) {
+namespace detail {
-  return streamable_to_string<Key, is_streamable<std::stringstream, Key>::value>().impl(key);
+template <typename T>
+struct to_value_t {
+  explicit to_value_t(const T& t_) : t(t_) {}
+  const T& t;
+  typedef const T& return_type;
+
+  const T& operator()() const { return t; }
+};
+
+template <>
+struct to_value_t<const char*> {
+  explicit to_value_t(const char* t_) : t(t_) {}
+  const char* t;
+  typedef std::string return_type;
+
+  const std::string operator()() const { return t; }
+};
+
+template <>
+struct to_value_t<char*> {
+  explicit to_value_t(char* t_) : t(t_) {}
+  const char* t;
+  typedef std::string return_type;
+
+  const std::string operator()() const { return t; }
+};
+
+template <std::size_t N>
+struct to_value_t<char[N]> {
+  explicit to_value_t(const char* t_) : t(t_) {}
+  const char* t;
+  typedef std::string return_type;
+
+  const std::string operator()() const { return t; }
+};
+
+// converts C-strings to std::strings so they can be copied
+template <typename T>
+inline typename to_value_t<T>::return_type to_value(const T& t) {
+  return to_value_t<T>(t)();
+}
 }
 
 // indexing
 template <typename Key>
 inline const Node Node::operator[](const Key& key) const {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
-  detail::node* value =
+  detail::node* value = static_cast<const detail::node&>(*m_pNode)
-      static_cast<const detail::node&>(*m_pNode).get(key, m_pMemory);
+                            .get(detail::to_value(key), m_pMemory);
   if (!value) {
-    return Node(ZombieNode, key_to_string(key));
+    return Node(ZombieNode);
   }
   return Node(*value, m_pMemory);
 }
 
 template <typename Key>
 inline Node Node::operator[](const Key& key) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
-  detail::node& value = m_pNode->get(key, m_pMemory);
+  detail::node& value = m_pNode->get(detail::to_value(key), m_pMemory);
   return Node(value, m_pMemory);
 }
 
 template <typename Key>
 inline bool Node::remove(const Key& key) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
-  return m_pNode->remove(key, m_pMemory);
+  return m_pNode->remove(detail::to_value(key), m_pMemory);
 }
 
 inline const Node Node::operator[](const Node& key) const {
+  if (!m_isValid || !key.m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   key.EnsureNodeExists();
   m_pMemory->merge(*key.m_pMemory);
   detail::node* value =
       static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
   if (!value) {
-    return Node(ZombieNode, key_to_string(key));
+    return Node(ZombieNode);
   }
   return Node(*value, m_pMemory);
 }
 
 inline Node Node::operator[](const Node& key) {
+  if (!m_isValid || !key.m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   key.EnsureNodeExists();
   m_pMemory->merge(*key.m_pMemory);
@@ -368,6 +424,8 @@ inline Node Node::operator[](const Node& key) {
 }
 
 inline bool Node::remove(const Node& key) {
+  if (!m_isValid || !key.m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
   key.EnsureNodeExists();
   return m_pNode->remove(*key.m_pNode, m_pMemory);
@@ -376,12 +434,15 @@ inline bool Node::remove(const Node& key) {
 // map
 template <typename Key, typename Value>
 inline void Node::force_insert(const Key& key, const Value& value) {
+  if (!m_isValid)
+    throw InvalidNode();
   EnsureNodeExists();
-  m_pNode->force_insert(key, value, m_pMemory);
+  m_pNode->force_insert(detail::to_value(key), detail::to_value(value),
+                        m_pMemory);
 }
 
 // free functions
 inline bool operator==(const Node& lhs, const Node& rhs) { return lhs.is(rhs); }
-}  // namespace YAML
+}
 
 #endif  // NODE_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/iterator.h

@@ -15,13 +15,10 @@
 #include <utility>
 #include <vector>
 
-// Assert in place so gcc + libc++ combination properly builds
-static_assert(std::is_constructible<YAML::Node, const YAML::Node&>::value, "Node must be copy constructable");
-
 namespace YAML {
 namespace detail {
 struct iterator_value : public Node, std::pair<Node, Node> {
-  iterator_value() = default;
+  iterator_value() {}
   explicit iterator_value(const Node& rhs)
       : Node(rhs),
         std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}

include/yaml-cpp/node/node.h

@@ -8,11 +8,11 @@
 #endif
 
 #include <stdexcept>
-#include <string>
 
 #include "yaml-cpp/dll.h"
 #include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/mark.h"
+#include "yaml-cpp/node/detail/bool_type.h"
 #include "yaml-cpp/node/detail/iterator_fwd.h"
 #include "yaml-cpp/node/ptr.h"
 #include "yaml-cpp/node/type.h"
@@ -38,8 +38,8 @@ class YAML_CPP_API Node {
   template <typename T, typename S>
   friend struct as_if;
 
-  using iterator = YAML::iterator;
+  typedef YAML::iterator iterator;
-  using const_iterator = YAML::const_iterator;
+  typedef YAML::const_iterator const_iterator;
 
   Node();
   explicit Node(NodeType::value type);
@@ -58,7 +58,7 @@ class YAML_CPP_API Node {
   bool IsMap() const { return Type() == NodeType::Map; }
 
   // bool conversions
-  explicit operator bool() const { return IsDefined(); }
+  YAML_CPP_OPERATOR_BOOL()
   bool operator!() const { return !IsDefined(); }
 
   // access
@@ -116,7 +116,6 @@ class YAML_CPP_API Node {
  private:
   enum Zombie { ZombieNode };
   explicit Node(Zombie);
-  explicit Node(Zombie, const std::string&);
   explicit Node(detail::node& node, detail::shared_memory_holder pMemory);
 
   void EnsureNodeExists() const;
@@ -131,8 +130,6 @@ class YAML_CPP_API Node {
 
  private:
   bool m_isValid;
-  // String representation of invalid key, if the node is invalid.
-  std::string m_invalidKey;
   mutable detail::shared_memory_holder m_pMemory;
   mutable detail::node* m_pNode;
 };

include/yaml-cpp/node/ptr.h

@@ -7,6 +7,7 @@
 #pragma once
 #endif
 
+#include "yaml-cpp/dll.h"
 #include <memory>
 
 namespace YAML {
@@ -17,11 +18,11 @@ class node_data;
 class memory;
 class memory_holder;
 
-using shared_node = std::shared_ptr<node>;
+typedef std::shared_ptr<node> shared_node;
-using shared_node_ref = std::shared_ptr<node_ref>;
+typedef std::shared_ptr<node_ref> shared_node_ref;
-using shared_node_data = std::shared_ptr<node_data>;
+typedef std::shared_ptr<node_data> shared_node_data;
-using shared_memory_holder = std::shared_ptr<memory_holder>;
+typedef std::shared_ptr<memory_holder> shared_memory_holder;
-using shared_memory = std::shared_ptr<memory>;
+typedef std::shared_ptr<memory> shared_memory;
 }
 }
 

include/yaml-cpp/node/type.h

@@ -8,10 +8,9 @@
 #endif
 
 namespace YAML {
-namespace NodeType {
+struct NodeType {
-enum value { Undefined, Null, Scalar, Sequence, Map };
+  enum value { Undefined, Null, Scalar, Sequence, Map };
-}
+};
-
 }
 
 #endif  // VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/noexcept.h

@@ -1,18 +0,0 @@
-#ifndef NOEXCEPT_H_768872DA_476C_11EA_88B8_90B11C0C0FF8
-#define NOEXCEPT_H_768872DA_476C_11EA_88B8_90B11C0C0FF8
-
-#if defined(_MSC_VER) ||                                            \
-    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-// This is here for compatibility with older versions of Visual Studio
-// which don't support noexcept.
-#if defined(_MSC_VER) && _MSC_VER < 1900
-    #define YAML_CPP_NOEXCEPT _NOEXCEPT
-#else
-    #define YAML_CPP_NOEXCEPT noexcept
-#endif
-
-#endif

include/yaml-cpp/noncopyable.h

@@ -0,0 +1,25 @@
+#ifndef NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+#if defined(_MSC_VER) ||                                            \
+    (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
+     (__GNUC__ >= 4))  // GCC supports "pragma once" correctly since 3.4
+#pragma once
+#endif
+
+#include "yaml-cpp/dll.h"
+
+namespace YAML {
+// this is basically boost::noncopyable
+class YAML_CPP_API noncopyable {
+ protected:
+  noncopyable() {}
+  ~noncopyable() {}
+
+ private:
+  noncopyable(const noncopyable&);
+  const noncopyable& operator=(const noncopyable&);
+};
+}
+
+#endif  // NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/null.h

@@ -8,7 +8,7 @@
 #endif
 
 #include "yaml-cpp/dll.h"
-#include <cstddef>
+#include <string>
 
 namespace YAML {
 class Node;
@@ -18,7 +18,7 @@ inline bool operator==(const _Null&, const _Null&) { return true; }
 inline bool operator!=(const _Null&, const _Null&) { return false; }
 
 YAML_CPP_API bool IsNull(const Node& node);  // old API only
-YAML_CPP_API bool IsNullString(const char* str, std::size_t size);
+YAML_CPP_API bool IsNullString(const std::string& str);
 
 extern YAML_CPP_API _Null Null;
 }

include/yaml-cpp/ostream_wrapper.h

@@ -17,10 +17,6 @@ class YAML_CPP_API ostream_wrapper {
  public:
   ostream_wrapper();
   explicit ostream_wrapper(std::ostream& stream);
-  ostream_wrapper(const ostream_wrapper&) = delete;
-  ostream_wrapper(ostream_wrapper&&) = delete;
-  ostream_wrapper& operator=(const ostream_wrapper&) = delete;
-  ostream_wrapper& operator=(ostream_wrapper&&) = delete;
   ~ostream_wrapper();
 
   void write(const std::string& str);
@@ -30,7 +26,7 @@ class YAML_CPP_API ostream_wrapper {
 
   const char* str() const {
     if (m_pStream) {
-      return nullptr;
+      return 0;
     } else {
       m_buffer[m_pos] = '\0';
       return &m_buffer[0];
@@ -56,7 +52,7 @@ class YAML_CPP_API ostream_wrapper {
 
 template <std::size_t N>
 inline ostream_wrapper& operator<<(ostream_wrapper& stream,
-                                   const char (&str)[N]) {
+                                   const char(&str)[N]) {
   stream.write(str, N - 1);
   return stream;
 }
@@ -71,6 +67,6 @@ inline ostream_wrapper& operator<<(ostream_wrapper& stream, char ch) {
   stream.write(&ch, 1);
   return stream;
 }
-}  // namespace YAML
+}
 
 #endif  // OSTREAM_WRAPPER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/parser.h

@@ -11,6 +11,7 @@
 #include <memory>
 
 #include "yaml-cpp/dll.h"
+#include "yaml-cpp/noncopyable.h"
 
 namespace YAML {
 class EventHandler;
@@ -23,16 +24,11 @@ struct Token;
  * A parser turns a stream of bytes into one stream of "events" per YAML
  * document in the input stream.
  */
-class YAML_CPP_API Parser {
+class YAML_CPP_API Parser : private noncopyable {
  public:
   /** Constructs an empty parser (with no input. */
   Parser();
 
-  Parser(const Parser&) = delete;
-  Parser(Parser&&) = delete;
-  Parser& operator=(const Parser&) = delete;
-  Parser& operator=(Parser&&) = delete;
-
   /**
    * Constructs a parser from the given input stream. The input stream must
    * live as long as the parser.
@@ -85,6 +81,6 @@ class YAML_CPP_API Parser {
   std::unique_ptr<Scanner> m_pScanner;
   std::unique_ptr<Directives> m_pDirectives;
 };
-}  // namespace YAML
+}
 
 #endif  // PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/stlemitter.h

@@ -16,8 +16,8 @@ namespace YAML {
 template <typename Seq>
 inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) {
   emitter << BeginSeq;
-  for (const auto& v : seq)
+  for (typename Seq::const_iterator it = seq.begin(); it != seq.end(); ++it)
-    emitter << v;
+    emitter << *it;
   emitter << EndSeq;
   return emitter;
 }
@@ -39,9 +39,10 @@ inline Emitter& operator<<(Emitter& emitter, const std::set<T>& v) {
 
 template <typename K, typename V>
 inline Emitter& operator<<(Emitter& emitter, const std::map<K, V>& m) {
+  typedef typename std::map<K, V> map;
   emitter << BeginMap;
-  for (const auto& v : m)
+  for (typename map::const_iterator it = m.begin(); it != m.end(); ++it)
-    emitter << Key << v.first << Value << v.second;
+    emitter << Key << it->first << Value << it->second;
   emitter << EndMap;
   return emitter;
 }

include/yaml-cpp/traits.h

@@ -7,11 +7,6 @@
 #pragma once
 #endif
 
-#include <type_traits>
-#include <utility>
-#include <string>
-#include <sstream>
-
 namespace YAML {
 template <typename>
 struct is_numeric {
@@ -84,7 +79,7 @@ struct is_numeric<long double> {
 
 template <bool, class T = void>
 struct enable_if_c {
-  using type = T;
+  typedef T type;
 };
 
 template <class T>
@@ -95,7 +90,7 @@ struct enable_if : public enable_if_c<Cond::value, T> {};
 
 template <bool, class T = void>
 struct disable_if_c {
-  using type = T;
+  typedef T type;
 };
 
 template <class T>
@@ -105,32 +100,4 @@ template <class Cond, class T = void>
 struct disable_if : public disable_if_c<Cond::value, T> {};
 }
 
-template <typename S, typename T>
-struct is_streamable {
-  template <typename StreamT, typename ValueT>
-  static auto test(int)
-      -> decltype(std::declval<StreamT&>() << std::declval<ValueT>(), std::true_type());
-
-  template <typename, typename>
-  static auto test(...) -> std::false_type;
-
-  static const bool value = decltype(test<S, T>(0))::value;
-};
-
-template<typename Key, bool Streamable>
-struct streamable_to_string {
-  static std::string impl(const Key& key) {
-    std::stringstream ss;
-    ss.imbue(std::locale("C"));
-    ss << key;
-    return ss.str();
-  }
-};
-
-template<typename Key>
-struct streamable_to_string<Key, false> {
-  static std::string impl(const Key&) {
-    return "";
-  }
-};
 #endif  // TRAITS_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/binary.cpp

@@ -1,7 +1,5 @@
 #include "yaml-cpp/binary.h"
 
-#include <cctype>
-
 namespace YAML {
 static const char encoding[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -66,7 +64,7 @@ static const unsigned char decoding[] = {
 };
 
 std::vector<unsigned char> DecodeBase64(const std::string &input) {
-  using ret_type = std::vector<unsigned char>;
+  typedef std::vector<unsigned char> ret_type;
   if (input.empty())
     return ret_type();
 
@@ -74,27 +72,22 @@ std::vector<unsigned char> DecodeBase64(const std::string &input) {
   unsigned char *out = &ret[0];
 
   unsigned value = 0;
-  for (std::size_t i = 0, cnt = 0; i < input.size(); i++) {
+  for (std::size_t i = 0; i < input.size(); i++) {
-    if (std::isspace(static_cast<unsigned char>(input[i]))) {
+    unsigned char d = decoding[static_cast<unsigned>(input[i])];
-      // skip newlines
-      continue;
-    }
-    unsigned char d = decoding[static_cast<unsigned char>(input[i])];
     if (d == 255)
       return ret_type();
 
     value = (value << 6) | d;
-    if (cnt % 4 == 3) {
+    if (i % 4 == 3) {
       *out++ = value >> 16;
       if (i > 0 && input[i - 1] != '=')
         *out++ = value >> 8;
       if (input[i] != '=')
         *out++ = value;
     }
-    ++cnt;
   }
 
   ret.resize(out - &ret[0]);
   return ret;
 }
-}  // namespace YAML
+}

src/collectionstack.h

@@ -7,8 +7,8 @@
 #pragma once
 #endif
 
-#include <cassert>
 #include <stack>
+#include <cassert>
 
 namespace YAML {
 struct CollectionType {
@@ -17,7 +17,6 @@ struct CollectionType {
 
 class CollectionStack {
  public:
-  CollectionStack() : collectionStack{} {}
   CollectionType::value GetCurCollectionType() const {
     if (collectionStack.empty())
       return CollectionType::NoCollection;
@@ -29,13 +28,12 @@ class CollectionStack {
   }
   void PopCollectionType(CollectionType::value type) {
     assert(type == GetCurCollectionType());
-    (void)type;
     collectionStack.pop();
   }
 
  private:
   std::stack<CollectionType::value> collectionStack;
 };
-}  // namespace YAML
+}
 
 #endif  // COLLECTIONSTACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/contrib/graphbuilder.cpp

@@ -10,7 +10,8 @@ void* BuildGraphOfNextDocument(Parser& parser,
   GraphBuilderAdapter eventHandler(graphBuilder);
   if (parser.HandleNextDocument(eventHandler)) {
     return eventHandler.RootNode();
+  } else {
+    return NULL;
   }
-  return nullptr;
 }
-}  // namespace YAML
+}

src/contrib/graphbuilderadapter.cpp

@@ -49,7 +49,7 @@ void GraphBuilderAdapter::OnMapStart(const Mark &mark, const std::string &tag,
                                      EmitterStyle::value /* style */) {
   void *pNode = m_builder.NewMap(mark, tag, GetCurrentParent());
   m_containers.push(ContainerFrame(pNode, m_pKeyNode));
-  m_pKeyNode = nullptr;
+  m_pKeyNode = NULL;
   RegisterAnchor(anchor, pNode);
 }
 
@@ -62,7 +62,7 @@ void GraphBuilderAdapter::OnMapEnd() {
 
 void *GraphBuilderAdapter::GetCurrentParent() const {
   if (m_containers.empty()) {
-    return nullptr;
+    return NULL;
   }
   return m_containers.top().pContainer;
 }
@@ -83,7 +83,7 @@ void GraphBuilderAdapter::DispositionNode(void *pNode) {
   if (m_containers.top().isMap()) {
     if (m_pKeyNode) {
       m_builder.AssignInMap(pContainer, m_pKeyNode, pNode);
-      m_pKeyNode = nullptr;
+      m_pKeyNode = NULL;
     } else {
       m_pKeyNode = pNode;
     }
@@ -91,4 +91,4 @@ void GraphBuilderAdapter::DispositionNode(void *pNode) {
     m_builder.AppendToSequence(pContainer, pNode);
   }
 }
-}  // namespace YAML
+}

src/contrib/graphbuilderadapter.h

@@ -13,6 +13,7 @@
 
 #include "yaml-cpp/anchor.h"
 #include "yaml-cpp/contrib/anchordict.h"
+#include "yaml-cpp/contrib/graphbuilder.h"
 #include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/eventhandler.h"
 
@@ -25,15 +26,7 @@ namespace YAML {
 class GraphBuilderAdapter : public EventHandler {
  public:
   GraphBuilderAdapter(GraphBuilderInterface& builder)
-      : m_builder(builder),
+      : m_builder(builder), m_pRootNode(NULL), m_pKeyNode(NULL) {}
-        m_containers{},
-        m_anchors{},
-        m_pRootNode(nullptr),
-        m_pKeyNode(nullptr) {}
-  GraphBuilderAdapter(const GraphBuilderAdapter&) = delete;
-  GraphBuilderAdapter(GraphBuilderAdapter&&) = delete;
-  GraphBuilderAdapter& operator=(const GraphBuilderAdapter&) = delete;
-  GraphBuilderAdapter& operator=(GraphBuilderAdapter&&) = delete;
 
   virtual void OnDocumentStart(const Mark& mark) { (void)mark; }
   virtual void OnDocumentEnd() {}
@@ -57,8 +50,8 @@ class GraphBuilderAdapter : public EventHandler {
   struct ContainerFrame {
     ContainerFrame(void* pSequence)
         : pContainer(pSequence), pPrevKeyNode(&sequenceMarker) {}
-    ContainerFrame(void* pMap, void* pPreviousKeyNode)
+    ContainerFrame(void* pMap, void* pPrevKeyNode)
-        : pContainer(pMap), pPrevKeyNode(pPreviousKeyNode) {}
+        : pContainer(pMap), pPrevKeyNode(pPrevKeyNode) {}
 
     void* pContainer;
     void* pPrevKeyNode;
@@ -81,6 +74,6 @@ class GraphBuilderAdapter : public EventHandler {
   void RegisterAnchor(anchor_t anchor, void* pNode);
   void DispositionNode(void* pNode);
 };
-}  // namespace YAML
+}
 
 #endif  // GRAPHBUILDERADAPTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/contrib/yaml-cpp.natvis

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<!-- MSVC Debugger visualization hints for YAML::Node and YAML::detail::node -->
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="YAML::Node">
-    <DisplayString Condition="!m_isValid">{{invalid}}</DisplayString>
-    <DisplayString Condition="!m_pNode">{{pNode==nullptr}}</DisplayString>
-    <DisplayString>{{ {*m_pNode} }}</DisplayString>
-    <Expand>
-      <Item Condition="m_pNode->m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Scalar" Name="scalar">m_pNode->m_pRef._Ptr->m_pData._Ptr->m_scalar</Item>
-      <Item Condition="m_pNode->m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Sequence" Name="sequence">m_pNode->m_pRef._Ptr->m_pData._Ptr->m_sequence</Item>
-      <Item Condition="m_pNode->m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Map" Name="map">m_pNode->m_pRef._Ptr->m_pData._Ptr->m_map</Item>
-      <Item Name="[details]" >m_pNode->m_pRef._Ptr->m_pData._Ptr</Item>
-    </Expand>
-  </Type>
-
-  <Type Name="YAML::detail::node">
-    <DisplayString Condition="!m_pRef._Ptr">{{node:pRef==nullptr}}</DisplayString>
-    <DisplayString Condition="!m_pRef._Ptr->m_pData._Ptr">{{node:pRef->pData==nullptr}}</DisplayString>
-    <DisplayString Condition="!m_pRef._Ptr->m_pData._Ptr->m_isDefined">{{undefined}}</DisplayString>
-    <DisplayString Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Scalar">{{{m_pRef._Ptr->m_pData._Ptr->m_scalar}}}</DisplayString>
-    <DisplayString Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Map">{{ Map {m_pRef._Ptr->m_pData._Ptr->m_map}}}</DisplayString>
-    <DisplayString Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Sequence">{{ Seq {m_pRef._Ptr->m_pData._Ptr->m_sequence}}}</DisplayString>
-    <DisplayString>{{{m_pRef._Ptr->m_pData._Ptr->m_type}}}</DisplayString>
-    <Expand>
-      <Item Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Scalar" Name="scalar">m_pRef._Ptr->m_pData._Ptr->m_scalar</Item>
-      <Item Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Sequence" Name="sequence">m_pRef._Ptr->m_pData._Ptr->m_sequence</Item>
-      <Item Condition="m_pRef._Ptr->m_pData._Ptr->m_type==YAML::NodeType::Map" Name="map">m_pRef._Ptr->m_pData._Ptr->m_map</Item>
-      <Item Name="[details]" >m_pRef._Ptr->m_pData._Ptr</Item>
-    </Expand>
-  </Type>
-
-</AutoVisualizer>

src/contrib/yaml-cpp.natvis.md

@@ -1,9 +0,0 @@
-# MSVC debugger visualizer for YAML::Node
-
-## How to use
-Add yaml-cpp.natvis to your Visual C++ project like any other source file.  It will be included in the debug information, and improve debugger display on YAML::Node and contained types. 
-
-## Compatibility and Troubleshooting
-
-This has been tested for MSVC 2017. It is expected to be compatible with VS 2015 and VS 2019. If you have any problems, you can open an issue here: https://github.com/peterchen-cp/yaml-cpp-natvis
-

src/convert.cpp

@@ -16,7 +16,11 @@ std::string tolower(const std::string& str) {
 
 template <typename T>
 bool IsEntirely(const std::string& str, T func) {
-  return std::all_of(str.begin(), str.end(), [=](char ch) { return func(ch); });
+  for (std::size_t i = 0; i < str.size(); i++)
+    if (!func(str[i]))
+      return false;
+
+  return true;
 }
 
 // IsFlexibleCase
@@ -35,7 +39,7 @@ bool IsFlexibleCase(const std::string& str) {
   std::string rest = str.substr(1);
   return firstcaps && (IsEntirely(rest, IsLower) || IsEntirely(rest, IsUpper));
 }
-}  // namespace
+}
 
 namespace YAML {
 bool convert<bool>::decode(const Node& node, bool& rhs) {
@@ -48,22 +52,19 @@ bool convert<bool>::decode(const Node& node, bool& rhs) {
   static const struct {
     std::string truename, falsename;
   } names[] = {
-      {"y", "n"},
+      {"y", "n"}, {"yes", "no"}, {"true", "false"}, {"on", "off"},
-      {"yes", "no"},
-      {"true", "false"},
-      {"on", "off"},
   };
 
   if (!IsFlexibleCase(node.Scalar()))
     return false;
 
-  for (const auto& name : names) {
+  for (unsigned i = 0; i < sizeof(names) / sizeof(names[0]); i++) {
-    if (name.truename == tolower(node.Scalar())) {
+    if (names[i].truename == tolower(node.Scalar())) {
       rhs = true;
       return true;
     }
 
-    if (name.falsename == tolower(node.Scalar())) {
+    if (names[i].falsename == tolower(node.Scalar())) {
       rhs = false;
       return true;
     }
@@ -71,4 +72,4 @@ bool convert<bool>::decode(const Node& node, bool& rhs) {
 
   return false;
 }
-}  // namespace YAML
+}

src/depthguard.cpp

@@ -1,9 +0,0 @@
-#include "yaml-cpp/depthguard.h"
-
-namespace YAML {
-
-DeepRecursion::DeepRecursion(int depth, const Mark& mark_,
-                             const std::string& msg_)
-    : ParserException(mark_, msg_), m_depth(depth) {}
-
-}  // namespace YAML

src/directives.cpp

@@ -1,11 +1,16 @@
 #include "directives.h"
 
 namespace YAML {
-Directives::Directives() : version{true, 1, 2}, tags{} {}
+Directives::Directives() {
+  // version
+  version.isDefault = true;
+  version.major = 1;
+  version.minor = 2;
+}
 
-std::string Directives::TranslateTagHandle(
+const std::string Directives::TranslateTagHandle(
     const std::string& handle) const {
-  auto it = tags.find(handle);
+  std::map<std::string, std::string>::const_iterator it = tags.find(handle);
   if (it == tags.end()) {
     if (handle == "!!")
       return "tag:yaml.org,2002:";
@@ -14,4 +19,4 @@ std::string Directives::TranslateTagHandle(
 
   return it->second;
 }
-}  // namespace YAML
+}

src/directives.h

@@ -19,7 +19,7 @@ struct Version {
 struct Directives {
   Directives();
 
-  std::string TranslateTagHandle(const std::string& handle) const;
+  const std::string TranslateTagHandle(const std::string& handle) const;
 
   Version version;
   std::map<std::string, std::string> tags;

src/emit.cpp

@@ -1,7 +1,7 @@
 #include "yaml-cpp/node/emit.h"
-#include "nodeevents.h"
 #include "yaml-cpp/emitfromevents.h"
 #include "yaml-cpp/emitter.h"
+#include "nodeevents.h"
 
 namespace YAML {
 Emitter& operator<<(Emitter& out, const Node& node) {

src/emitfromevents.cpp

@@ -16,11 +16,10 @@ std::string ToString(YAML::anchor_t anchor) {
   stream << anchor;
   return stream.str();
 }
-}  // namespace
+}
 
 namespace YAML {
-EmitFromEvents::EmitFromEvents(Emitter& emitter)
+EmitFromEvents::EmitFromEvents(Emitter& emitter) : m_emitter(emitter) {}
-    : m_emitter(emitter), m_stateStack{} {}
 
 void EmitFromEvents::OnDocumentStart(const Mark&) {}
 
@@ -59,8 +58,6 @@ void EmitFromEvents::OnSequenceStart(const Mark&, const std::string& tag,
     default:
       break;
   }
-  // Restore the global settings to eliminate the override from node style
-  m_emitter.RestoreGlobalModifiedSettings();
   m_emitter << BeginSeq;
   m_stateStack.push(State::WaitingForSequenceEntry);
 }
@@ -85,8 +82,6 @@ void EmitFromEvents::OnMapStart(const Mark&, const std::string& tag,
     default:
       break;
   }
-  // Restore the global settings to eliminate the override from node style
-  m_emitter.RestoreGlobalModifiedSettings();
   m_emitter << BeginMap;
   m_stateStack.push(State::WaitingForKey);
 }
@@ -116,14 +111,9 @@ void EmitFromEvents::BeginNode() {
 }
 
 void EmitFromEvents::EmitProps(const std::string& tag, anchor_t anchor) {
-  if (!tag.empty() && tag != "?" && tag != "!"){
+  if (!tag.empty() && tag != "?" && tag != "!")
-      if (tag[0] == '!') {
+    m_emitter << VerbatimTag(tag);
-        m_emitter << LocalTag(std::string(tag.begin()+1, tag.end()));
-      } else {
-        m_emitter << VerbatimTag(tag);
-      }
-  }
   if (anchor)
     m_emitter << Anchor(ToString(anchor));
 }
-}  // namespace YAML
+}

src/emitter.cpp

@@ -11,12 +11,12 @@ namespace YAML {
 class Binary;
 struct _Null;
 
-Emitter::Emitter() : m_pState(new EmitterState), m_stream{} {}
+Emitter::Emitter() : m_pState(new EmitterState) {}
 
 Emitter::Emitter(std::ostream& stream)
     : m_pState(new EmitterState), m_stream(stream) {}
 
-Emitter::~Emitter() = default;
+Emitter::~Emitter() {}
 
 const char* Emitter::c_str() const { return m_stream.str(); }
 
@@ -49,10 +49,6 @@ bool Emitter::SetBoolFormat(EMITTER_MANIP value) {
   return ok;
 }
 
-bool Emitter::SetNullFormat(EMITTER_MANIP value) {
-  return m_pState->SetNullFormat(value, FmtScope::Global);
-}
-
 bool Emitter::SetIntBase(EMITTER_MANIP value) {
   return m_pState->SetIntFormat(value, FmtScope::Global);
 }
@@ -90,10 +86,6 @@ bool Emitter::SetDoublePrecision(std::size_t n) {
   return m_pState->SetDoublePrecision(n, FmtScope::Global);
 }
 
-void Emitter::RestoreGlobalModifiedSettings() {
-  m_pState->RestoreGlobalModifiedSettings();
-}
-
 // SetLocalValue
 // . Either start/end a group, or set a modifier locally
 Emitter& Emitter::SetLocalValue(EMITTER_MANIP value) {
@@ -205,7 +197,6 @@ void Emitter::EmitBeginSeq() {
 void Emitter::EmitEndSeq() {
   if (!good())
     return;
-  FlowType::value originalType = m_pState->CurGroupFlowType();
 
   if (m_pState->CurGroupChildCount() == 0)
     m_pState->ForceFlow();
@@ -213,14 +204,9 @@ void Emitter::EmitEndSeq() {
   if (m_pState->CurGroupFlowType() == FlowType::Flow) {
     if (m_stream.comment())
       m_stream << "\n";
-    if (originalType == FlowType::Block || m_pState->HasBegunNode())
+    m_stream << IndentTo(m_pState->CurIndent());
-      m_stream << IndentTo(m_pState->CurIndent());
+    if (m_pState->CurGroupChildCount() == 0)
-    if (originalType == FlowType::Block) {
       m_stream << "[";
-    } else {
-      if (m_pState->CurGroupChildCount() == 0 && !m_pState->HasBegunNode())
-        m_stream << "[";
-    }
     m_stream << "]";
   }
 
@@ -241,7 +227,6 @@ void Emitter::EmitBeginMap() {
 void Emitter::EmitEndMap() {
   if (!good())
     return;
-  FlowType::value originalType = m_pState->CurGroupFlowType();
 
   if (m_pState->CurGroupChildCount() == 0)
     m_pState->ForceFlow();
@@ -250,12 +235,8 @@ void Emitter::EmitEndMap() {
     if (m_stream.comment())
       m_stream << "\n";
     m_stream << IndentTo(m_pState->CurIndent());
-    if (originalType == FlowType::Block) {
+    if (m_pState->CurGroupChildCount() == 0)
       m_stream << "{";
-    } else {
-      if (m_pState->CurGroupChildCount() == 0 && !m_pState->HasBegunNode())
-        m_stream << "{";
-    }
     m_stream << "}";
   }
 
@@ -304,8 +285,10 @@ void Emitter::PrepareTopNode(EmitterNodeType::value child) {
   if (child == EmitterNodeType::NoType)
     return;
 
-  if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0)
+  if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0) {
-    EmitBeginDoc();
+    if (child != EmitterNodeType::NoType)
+      EmitBeginDoc();
+  }
 
   switch (child) {
     case EmitterNodeType::NoType:
@@ -505,9 +488,6 @@ void Emitter::FlowMapPrepareSimpleKeyValue(EmitterNodeType::value child) {
     if (m_stream.comment())
       m_stream << "\n";
     m_stream << IndentTo(lastIndent);
-    if (m_pState->HasAlias()) {
-      m_stream << " ";
-    }
     m_stream << ":";
   }
 
@@ -534,8 +514,7 @@ void Emitter::BlockMapPrepareNode(EmitterNodeType::value child) {
     if (m_pState->GetMapKeyFormat() == LongKey)
       m_pState->SetLongKey();
     if (child == EmitterNodeType::BlockSeq ||
-        child == EmitterNodeType::BlockMap ||
+        child == EmitterNodeType::BlockMap)
-        child == EmitterNodeType::Property)
       m_pState->SetLongKey();
 
     if (m_pState->CurGroupLongKey())
@@ -579,8 +558,6 @@ void Emitter::BlockMapPrepareLongKey(EmitterNodeType::value child) {
       break;
     case EmitterNodeType::BlockSeq:
     case EmitterNodeType::BlockMap:
-      if (m_pState->HasBegunContent())
-        m_stream << "\n";
       break;
   }
 }
@@ -604,12 +581,8 @@ void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child) {
     case EmitterNodeType::Scalar:
     case EmitterNodeType::FlowSeq:
     case EmitterNodeType::FlowMap:
-      SpaceOrIndentTo(true, curIndent + 1);
-      break;
     case EmitterNodeType::BlockSeq:
     case EmitterNodeType::BlockMap:
-      if (m_pState->HasBegunContent())
-        m_stream << "\n";
       SpaceOrIndentTo(true, curIndent + 1);
       break;
   }
@@ -648,9 +621,6 @@ void Emitter::BlockMapPrepareSimpleKeyValue(EmitterNodeType::value child) {
   const std::size_t nextIndent = curIndent + m_pState->CurGroupIndent();
 
   if (!m_pState->HasBegunNode()) {
-    if (m_pState->HasAlias()) {
-      m_stream << " ";
-    }
     m_stream << ":";
   }
 
@@ -704,45 +674,32 @@ void Emitter::StartedScalar() { m_pState->StartedScalar(); }
 // *******************************************************************************************
 // overloads of Write
 
-StringEscaping::value GetStringEscapingStyle(const EMITTER_MANIP emitterManip) {
+Emitter& Emitter::Write(const std::string& str) {
-  switch (emitterManip) {
-    case EscapeNonAscii:
-      return StringEscaping::NonAscii;
-    case EscapeAsJson:
-      return StringEscaping::JSON;
-    default:
-      return StringEscaping::None;
-      break;
-  }
-}
-
-Emitter& Emitter::Write(const char* str, std::size_t size) {
   if (!good())
     return *this;
 
-  StringEscaping::value stringEscaping = GetStringEscapingStyle(m_pState->GetOutputCharset());
+  const bool escapeNonAscii = m_pState->GetOutputCharset() == EscapeNonAscii;
-
   const StringFormat::value strFormat =
-      Utils::ComputeStringFormat(str, size, m_pState->GetStringFormat(),
+      Utils::ComputeStringFormat(str, m_pState->GetStringFormat(),
-                                 m_pState->CurGroupFlowType(), stringEscaping == StringEscaping::NonAscii);
+                                 m_pState->CurGroupFlowType(), escapeNonAscii);
 
-  if (strFormat == StringFormat::Literal || size > 1024)
+  if (strFormat == StringFormat::Literal)
     m_pState->SetMapKeyFormat(YAML::LongKey, FmtScope::Local);
 
   PrepareNode(EmitterNodeType::Scalar);
 
   switch (strFormat) {
     case StringFormat::Plain:
-      m_stream.write(str, size);
+      m_stream << str;
       break;
     case StringFormat::SingleQuoted:
-      Utils::WriteSingleQuotedString(m_stream, str, size);
+      Utils::WriteSingleQuotedString(m_stream, str);
       break;
     case StringFormat::DoubleQuoted:
-      Utils::WriteDoubleQuotedString(m_stream, str, size, stringEscaping);
+      Utils::WriteDoubleQuotedString(m_stream, str, escapeNonAscii);
       break;
     case StringFormat::Literal:
-      Utils::WriteLiteralString(m_stream, str, size,
+      Utils::WriteLiteralString(m_stream, str,
                                 m_pState->CurIndent() + m_pState->GetIndent());
       break;
   }
@@ -752,10 +709,6 @@ Emitter& Emitter::Write(const char* str, std::size_t size) {
   return *this;
 }
 
-Emitter& Emitter::Write(const std::string& str) {
-  return Write(str.data(), str.size());
-}
-
 std::size_t Emitter::GetFloatPrecision() const {
   return m_pState->GetFloatPrecision();
 }
@@ -813,21 +766,6 @@ const char* Emitter::ComputeFullBoolName(bool b) const {
                          // these answers
 }
 
-const char* Emitter::ComputeNullName() const {
-  switch (m_pState->GetNullFormat()) {
-    case LowerNull:
-      return "null";
-    case UpperNull:
-      return "NULL";
-    case CamelNull:
-      return "Null";
-    case TildeNull:
-      // fallthrough
-    default:
-      return "~";
-  }
-}
-
 Emitter& Emitter::Write(bool b) {
   if (!good())
     return *this;
@@ -849,10 +787,8 @@ Emitter& Emitter::Write(char ch) {
   if (!good())
     return *this;
 
-
-
   PrepareNode(EmitterNodeType::Scalar);
-  Utils::WriteChar(m_stream, ch, GetStringEscapingStyle(m_pState->GetOutputCharset()));
+  Utils::WriteChar(m_stream, ch);
   StartedScalar();
 
   return *this;
@@ -869,15 +805,13 @@ Emitter& Emitter::Write(const _Alias& alias) {
 
   PrepareNode(EmitterNodeType::Scalar);
 
-  if (!Utils::WriteAlias(m_stream, alias.content.data(), alias.content.size())) {
+  if (!Utils::WriteAlias(m_stream, alias.content)) {
     m_pState->SetError(ErrorMsg::INVALID_ALIAS);
     return *this;
   }
 
   StartedScalar();
 
-  m_pState->SetAlias();
-
   return *this;
 }
 
@@ -892,7 +826,7 @@ Emitter& Emitter::Write(const _Anchor& anchor) {
 
   PrepareNode(EmitterNodeType::Property);
 
-  if (!Utils::WriteAnchor(m_stream, anchor.content.data(), anchor.content.size())) {
+  if (!Utils::WriteAnchor(m_stream, anchor.content)) {
     m_pState->SetError(ErrorMsg::INVALID_ANCHOR);
     return *this;
   }
@@ -941,7 +875,7 @@ Emitter& Emitter::Write(const _Comment& comment) {
 
   if (m_stream.col() > 0)
     m_stream << Indentation(m_pState->GetPreCommentIndent());
-  Utils::WriteComment(m_stream, comment.content.data(), comment.content.size(),
+  Utils::WriteComment(m_stream, comment.content,
                       m_pState->GetPostCommentIndent());
 
   m_pState->SetNonContent();
@@ -955,7 +889,7 @@ Emitter& Emitter::Write(const _Null& /*null*/) {
 
   PrepareNode(EmitterNodeType::Scalar);
 
-  m_stream << ComputeNullName();
+  m_stream << "~";
 
   StartedScalar();
 
@@ -974,4 +908,4 @@ Emitter& Emitter::Write(const Binary& binary) {
 
   return *this;
 }
-}  // namespace YAML
+}

src/emitterstate.cpp

@@ -6,35 +6,29 @@
 namespace YAML {
 EmitterState::EmitterState()
     : m_isGood(true),
-      m_lastError{},
-      // default global manipulators
-      m_charset(EmitNonAscii),
-      m_strFmt(Auto),
-      m_boolFmt(TrueFalseBool),
-      m_boolLengthFmt(LongBool),
-      m_boolCaseFmt(LowerCase),
-      m_nullFmt(TildeNull),
-      m_intFmt(Dec),
-      m_indent(2),
-      m_preCommentIndent(2),
-      m_postCommentIndent(1),
-      m_seqFmt(Block),
-      m_mapFmt(Block),
-      m_mapKeyFmt(Auto),
-      m_floatPrecision(std::numeric_limits<float>::max_digits10),
-      m_doublePrecision(std::numeric_limits<double>::max_digits10),
-      //
-      m_modifiedSettings{},
-      m_globalModifiedSettings{},
-      m_groups{},
       m_curIndent(0),
       m_hasAnchor(false),
-      m_hasAlias(false),
       m_hasTag(false),
       m_hasNonContent(false),
-      m_docCount(0) {}
+      m_docCount(0) {
+  // set default global manipulators
+  m_charset.set(EmitNonAscii);
+  m_strFmt.set(Auto);
+  m_boolFmt.set(TrueFalseBool);
+  m_boolLengthFmt.set(LongBool);
+  m_boolCaseFmt.set(LowerCase);
+  m_intFmt.set(Dec);
+  m_indent.set(2);
+  m_preCommentIndent.set(2);
+  m_postCommentIndent.set(1);
+  m_seqFmt.set(Block);
+  m_mapFmt.set(Block);
+  m_mapKeyFmt.set(Auto);
+  m_floatPrecision.set(std::numeric_limits<float>::digits10 + 1);
+  m_doublePrecision.set(std::numeric_limits<double>::digits10 + 1);
+}
 
-EmitterState::~EmitterState() = default;
+EmitterState::~EmitterState() {}
 
 // SetLocalValue
 // . We blindly tries to set all possible formatters to this value
@@ -45,7 +39,6 @@ void EmitterState::SetLocalValue(EMITTER_MANIP value) {
   SetBoolFormat(value, FmtScope::Local);
   SetBoolCaseFormat(value, FmtScope::Local);
   SetBoolLengthFormat(value, FmtScope::Local);
-  SetNullFormat(value, FmtScope::Local);
   SetIntFormat(value, FmtScope::Local);
   SetFlowType(GroupType::Seq, value, FmtScope::Local);
   SetFlowType(GroupType::Map, value, FmtScope::Local);
@@ -54,8 +47,6 @@ void EmitterState::SetLocalValue(EMITTER_MANIP value) {
 
 void EmitterState::SetAnchor() { m_hasAnchor = true; }
 
-void EmitterState::SetAlias() { m_hasAlias = true; }
-
 void EmitterState::SetTag() { m_hasTag = true; }
 
 void EmitterState::SetNonContent() { m_hasNonContent = true; }
@@ -90,7 +81,6 @@ void EmitterState::StartedNode() {
   }
 
   m_hasAnchor = false;
-  m_hasAlias = false;
   m_hasTag = false;
   m_hasNonContent = false;
 }
@@ -100,13 +90,15 @@ EmitterNodeType::value EmitterState::NextGroupType(
   if (type == GroupType::Seq) {
     if (GetFlowType(type) == Block)
       return EmitterNodeType::BlockSeq;
-    return EmitterNodeType::FlowSeq;
+    else
+      return EmitterNodeType::FlowSeq;
+  } else {
+    if (GetFlowType(type) == Block)
+      return EmitterNodeType::BlockMap;
+    else
+      return EmitterNodeType::FlowMap;
   }
 
-  if (GetFlowType(type) == Block)
-    return EmitterNodeType::BlockMap;
-  return EmitterNodeType::FlowMap;
-
   // can't happen
   assert(false);
   return EmitterNodeType::NoType;
@@ -160,15 +152,9 @@ void EmitterState::EndedGroup(GroupType::value type) {
   if (m_groups.empty()) {
     if (type == GroupType::Seq) {
       return SetError(ErrorMsg::UNEXPECTED_END_SEQ);
+    } else {
+      return SetError(ErrorMsg::UNEXPECTED_END_MAP);
     }
-    return SetError(ErrorMsg::UNEXPECTED_END_MAP);
-  }
-
-  if (m_hasTag) {
-    SetError(ErrorMsg::INVALID_TAG);
-  }
-  if (m_hasAnchor) {
-    SetError(ErrorMsg::INVALID_ANCHOR);
   }
 
   // get rid of the current group
@@ -190,9 +176,6 @@ void EmitterState::EndedGroup(GroupType::value type) {
   m_globalModifiedSettings.restore();
 
   ClearModifiedSettings();
-  m_hasAnchor = false;
-  m_hasTag = false;
-  m_hasNonContent = false;
 }
 
 EmitterNodeType::value EmitterState::CurGroupNodeType() const {
@@ -233,16 +216,11 @@ std::size_t EmitterState::LastIndent() const {
 
 void EmitterState::ClearModifiedSettings() { m_modifiedSettings.clear(); }
 
-void EmitterState::RestoreGlobalModifiedSettings() {
-  m_globalModifiedSettings.restore();
-}
-
 bool EmitterState::SetOutputCharset(EMITTER_MANIP value,
                                     FmtScope::value scope) {
   switch (value) {
     case EmitNonAscii:
     case EscapeNonAscii:
-    case EscapeAsJson:
       _Set(m_charset, value, scope);
       return true;
     default:
@@ -300,19 +278,6 @@ bool EmitterState::SetBoolCaseFormat(EMITTER_MANIP value,
   }
 }
 
-bool EmitterState::SetNullFormat(EMITTER_MANIP value, FmtScope::value scope) {
-  switch (value) {
-    case LowerNull:
-    case UpperNull:
-    case CamelNull:
-    case TildeNull:
-      _Set(m_nullFmt, value, scope);
-      return true;
-    default:
-      return false;
-  }
-}
-
 bool EmitterState::SetIntFormat(EMITTER_MANIP value, FmtScope::value scope) {
   switch (value) {
     case Dec:
@@ -384,7 +349,7 @@ bool EmitterState::SetMapKeyFormat(EMITTER_MANIP value, FmtScope::value scope) {
 }
 
 bool EmitterState::SetFloatPrecision(std::size_t value, FmtScope::value scope) {
-  if (value > std::numeric_limits<float>::max_digits10)
+  if (value > std::numeric_limits<float>::digits10 + 1)
     return false;
   _Set(m_floatPrecision, value, scope);
   return true;
@@ -392,9 +357,9 @@ bool EmitterState::SetFloatPrecision(std::size_t value, FmtScope::value scope) {
 
 bool EmitterState::SetDoublePrecision(std::size_t value,
                                       FmtScope::value scope) {
-  if (value > std::numeric_limits<double>::max_digits10)
+  if (value > std::numeric_limits<double>::digits10 + 1)
     return false;
   _Set(m_doublePrecision, value, scope);
   return true;
 }
-}  // namespace YAML
+}

src/emitterstate.h

@@ -43,7 +43,6 @@ class EmitterState {
 
   // node handling
   void SetAnchor();
-  void SetAlias();
   void SetTag();
   void SetNonContent();
   void SetLongKey();
@@ -66,7 +65,6 @@ class EmitterState {
   std::size_t LastIndent() const;
   std::size_t CurIndent() const { return m_curIndent; }
   bool HasAnchor() const { return m_hasAnchor; }
-  bool HasAlias() const { return m_hasAlias; }
   bool HasTag() const { return m_hasTag; }
   bool HasBegunNode() const {
     return m_hasAnchor || m_hasTag || m_hasNonContent;
@@ -74,7 +72,6 @@ class EmitterState {
   bool HasBegunContent() const { return m_hasAnchor || m_hasTag; }
 
   void ClearModifiedSettings();
-  void RestoreGlobalModifiedSettings();
 
   // formatters
   void SetLocalValue(EMITTER_MANIP value);
@@ -94,9 +91,6 @@ class EmitterState {
   bool SetBoolCaseFormat(EMITTER_MANIP value, FmtScope::value scope);
   EMITTER_MANIP GetBoolCaseFormat() const { return m_boolCaseFmt.get(); }
 
-  bool SetNullFormat(EMITTER_MANIP value, FmtScope::value scope);
-  EMITTER_MANIP GetNullFormat() const { return m_nullFmt.get(); }
-
   bool SetIntFormat(EMITTER_MANIP value, FmtScope::value scope);
   EMITTER_MANIP GetIntFormat() const { return m_intFmt.get(); }
 
@@ -137,7 +131,6 @@ class EmitterState {
   Setting<EMITTER_MANIP> m_boolFmt;
   Setting<EMITTER_MANIP> m_boolLengthFmt;
   Setting<EMITTER_MANIP> m_boolCaseFmt;
-  Setting<EMITTER_MANIP> m_nullFmt;
   Setting<EMITTER_MANIP> m_intFmt;
   Setting<std::size_t> m_indent;
   Setting<std::size_t> m_preCommentIndent, m_postCommentIndent;
@@ -152,12 +145,7 @@ class EmitterState {
 
   struct Group {
     explicit Group(GroupType::value type_)
-        : type(type_),
+        : type(type_), indent(0), childCount(0), longKey(false) {}
-          flowType{},
-          indent(0),
-          childCount(0),
-          longKey(false),
-          modifiedSettings{} {}
 
     GroupType::value type;
     FlowType::value flowType;
@@ -189,7 +177,6 @@ class EmitterState {
   std::vector<std::unique_ptr<Group>> m_groups;
   std::size_t m_curIndent;
   bool m_hasAnchor;
-  bool m_hasAlias;
   bool m_hasTag;
   bool m_hasNonContent;
   std::size_t m_docCount;
@@ -211,6 +198,6 @@ void EmitterState::_Set(Setting<T>& fmt, T value, FmtScope::value scope) {
       assert(false);
   }
 }
-}  // namespace YAML
+}
 
 #endif  // EMITTERSTATE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/emitterutils.cpp

@@ -1,5 +1,3 @@
-#include <algorithm>
-#include <cstdint>
 #include <iomanip>
 #include <sstream>
 
@@ -10,8 +8,8 @@
 #include "regeximpl.h"
 #include "stringsource.h"
 #include "yaml-cpp/binary.h"  // IWYU pragma: keep
-#include "yaml-cpp/null.h"
 #include "yaml-cpp/ostream_wrapper.h"
+#include "yaml-cpp/null.h"
 
 namespace YAML {
 namespace Utils {
@@ -89,8 +87,8 @@ int Utf8BytesIndicated(char ch) {
 bool IsTrailingByte(char ch) { return (ch & 0xC0) == 0x80; }
 
 bool GetNextCodePointAndAdvance(int& codePoint,
-                                const char*& first,
+                                std::string::const_iterator& first,
-                                const char* last) {
+                                std::string::const_iterator last) {
   if (first == last)
     return false;
 
@@ -136,12 +134,12 @@ void WriteCodePoint(ostream_wrapper& out, int codePoint) {
   if (codePoint < 0 || codePoint > 0x10FFFF) {
     codePoint = REPLACEMENT_CHARACTER;
   }
-  if (codePoint <= 0x7F) {
+  if (codePoint < 0x7F) {
     out << static_cast<char>(codePoint);
-  } else if (codePoint <= 0x7FF) {
+  } else if (codePoint < 0x7FF) {
     out << static_cast<char>(0xC0 | (codePoint >> 6))
         << static_cast<char>(0x80 | (codePoint & 0x3F));
-  } else if (codePoint <= 0xFFFF) {
+  } else if (codePoint < 0xFFFF) {
     out << static_cast<char>(0xE0 | (codePoint >> 12))
         << static_cast<char>(0x80 | ((codePoint >> 6) & 0x3F))
         << static_cast<char>(0x80 | (codePoint & 0x3F));
@@ -153,39 +151,39 @@ void WriteCodePoint(ostream_wrapper& out, int codePoint) {
   }
 }
 
-bool IsValidPlainScalar(const char* str, std::size_t size, FlowType::value flowType,
+bool IsValidPlainScalar(const std::string& str, FlowType::value flowType,
                         bool allowOnlyAscii) {
   // check against null
-  if (IsNullString(str, size)) {
+  if (IsNullString(str)) {
     return false;
   }
 
   // check the start
   const RegEx& start = (flowType == FlowType::Flow ? Exp::PlainScalarInFlow()
                                                    : Exp::PlainScalar());
-  if (!start.Matches(StringCharSource(str, size))) {
+  if (!start.Matches(str)) {
     return false;
   }
 
   // and check the end for plain whitespace (which can't be faithfully kept in a
   // plain scalar)
-  if (size != 0 && str[size - 1] == ' ') {
+  if (!str.empty() && *str.rbegin() == ' ') {
     return false;
   }
 
   // then check until something is disallowed
-  static const RegEx disallowed_flow =
+  static const RegEx& disallowed_flow =
-      Exp::EndScalarInFlow() | (Exp::BlankOrBreak() + Exp::Comment()) |
+      Exp::EndScalarInFlow() || (Exp::BlankOrBreak() + Exp::Comment()) ||
-      Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() |
+      Exp::NotPrintable() || Exp::Utf8_ByteOrderMark() || Exp::Break() ||
-      Exp::Tab() | Exp::Ampersand();
+      Exp::Tab();
-  static const RegEx disallowed_block =
+  static const RegEx& disallowed_block =
-      Exp::EndScalar() | (Exp::BlankOrBreak() + Exp::Comment()) |
+      Exp::EndScalar() || (Exp::BlankOrBreak() + Exp::Comment()) ||
-      Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() |
+      Exp::NotPrintable() || Exp::Utf8_ByteOrderMark() || Exp::Break() ||
-      Exp::Tab() | Exp::Ampersand();
+      Exp::Tab();
   const RegEx& disallowed =
       flowType == FlowType::Flow ? disallowed_flow : disallowed_block;
 
-  StringCharSource buffer(str, size);
+  StringCharSource buffer(str.c_str(), str.size());
   while (buffer) {
     if (disallowed.Matches(buffer)) {
       return false;
@@ -199,54 +197,48 @@ bool IsValidPlainScalar(const char* str, std::size_t size, FlowType::value flowT
   return true;
 }
 
-bool IsValidSingleQuotedScalar(const char* str, std::size_t size, bool escapeNonAscii) {
+bool IsValidSingleQuotedScalar(const std::string& str, bool escapeNonAscii) {
   // TODO: check for non-printable characters?
-  return std::none_of(str, str + size, [=](char ch) {
+  for (std::size_t i = 0; i < str.size(); i++) {
-    return (escapeNonAscii && (0x80 <= static_cast<unsigned char>(ch))) ||
+    if (escapeNonAscii && (0x80 <= static_cast<unsigned char>(str[i]))) {
-           (ch == '\n');
+      return false;
-  });
+    }
+    if (str[i] == '\n') {
+      return false;
+    }
+  }
+  return true;
 }
 
-bool IsValidLiteralScalar(const char* str, std::size_t size, FlowType::value flowType,
+bool IsValidLiteralScalar(const std::string& str, FlowType::value flowType,
                           bool escapeNonAscii) {
   if (flowType == FlowType::Flow) {
     return false;
   }
 
   // TODO: check for non-printable characters?
-  return std::none_of(str, str + size, [=](char ch) {
+  for (std::size_t i = 0; i < str.size(); i++) {
-    return (escapeNonAscii && (0x80 <= static_cast<unsigned char>(ch)));
+    if (escapeNonAscii && (0x80 <= static_cast<unsigned char>(str[i]))) {
-  });
+      return false;
+    }
+  }
+  return true;
 }
 
-std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) {
+void WriteDoubleQuoteEscapeSequence(ostream_wrapper& out, int codePoint) {
-  const uint32_t leadOffset = 0xD800 - (0x10000 >> 10);
-
-  return {
-    leadOffset | (codePoint >> 10),
-    0xDC00 | (codePoint & 0x3FF),
-  };
-}
-
-void WriteDoubleQuoteEscapeSequence(ostream_wrapper& out, int codePoint, StringEscaping::value stringEscapingStyle) {
   static const char hexDigits[] = "0123456789abcdef";
 
   out << "\\";
   int digits = 8;
-  if (codePoint < 0xFF && stringEscapingStyle != StringEscaping::JSON) {
+  if (codePoint < 0xFF) {
     out << "x";
     digits = 2;
   } else if (codePoint < 0xFFFF) {
     out << "u";
     digits = 4;
-  } else if (stringEscapingStyle != StringEscaping::JSON) {
+  } else {
     out << "U";
     digits = 8;
-  } else {
-    auto surrogatePair = EncodeUTF16SurrogatePair(codePoint);
-    WriteDoubleQuoteEscapeSequence(out, surrogatePair.first, stringEscapingStyle);
-    WriteDoubleQuoteEscapeSequence(out, surrogatePair.second, stringEscapingStyle);
-    return;
   }
 
   // Write digits into the escape sequence
@@ -254,10 +246,10 @@ void WriteDoubleQuoteEscapeSequence(ostream_wrapper& out, int codePoint, StringE
     out << hexDigits[(codePoint >> (4 * (digits - 1))) & 0xF];
 }
 
-bool WriteAliasName(ostream_wrapper& out, const char* str, std::size_t size) {
+bool WriteAliasName(ostream_wrapper& out, const std::string& str) {
   int codePoint;
-  for (const char* i = str;
+  for (std::string::const_iterator i = str.begin();
-       GetNextCodePointAndAdvance(codePoint, i, str + size);) {
+       GetNextCodePointAndAdvance(codePoint, i, str.end());) {
     if (!IsAnchorChar(codePoint)) {
       return false;
     }
@@ -266,27 +258,27 @@ bool WriteAliasName(ostream_wrapper& out, const char* str, std::size_t size) {
   }
   return true;
 }
-}  // namespace
+}
 
-StringFormat::value ComputeStringFormat(const char* str, std::size_t size,
+StringFormat::value ComputeStringFormat(const std::string& str,
                                         EMITTER_MANIP strFormat,
                                         FlowType::value flowType,
                                         bool escapeNonAscii) {
   switch (strFormat) {
     case Auto:
-      if (IsValidPlainScalar(str, size, flowType, escapeNonAscii)) {
+      if (IsValidPlainScalar(str, flowType, escapeNonAscii)) {
         return StringFormat::Plain;
       }
       return StringFormat::DoubleQuoted;
     case SingleQuoted:
-      if (IsValidSingleQuotedScalar(str, size, escapeNonAscii)) {
+      if (IsValidSingleQuotedScalar(str, escapeNonAscii)) {
         return StringFormat::SingleQuoted;
       }
       return StringFormat::DoubleQuoted;
     case DoubleQuoted:
       return StringFormat::DoubleQuoted;
     case Literal:
-      if (IsValidLiteralScalar(str, size, flowType, escapeNonAscii)) {
+      if (IsValidLiteralScalar(str, flowType, escapeNonAscii)) {
         return StringFormat::Literal;
       }
       return StringFormat::DoubleQuoted;
@@ -297,11 +289,11 @@ StringFormat::value ComputeStringFormat(const char* str, std::size_t size,
   return StringFormat::DoubleQuoted;
 }
 
-bool WriteSingleQuotedString(ostream_wrapper& out, const char* str, std::size_t size) {
+bool WriteSingleQuotedString(ostream_wrapper& out, const std::string& str) {
   out << "'";
   int codePoint;
-  for (const char* i = str;
+  for (std::string::const_iterator i = str.begin();
-       GetNextCodePointAndAdvance(codePoint, i, str + size);) {
+       GetNextCodePointAndAdvance(codePoint, i, str.end());) {
     if (codePoint == '\n') {
       return false;  // We can't handle a new line and the attendant indentation
                      // yet
@@ -317,12 +309,12 @@ bool WriteSingleQuotedString(ostream_wrapper& out, const char* str, std::size_t
   return true;
 }
 
-bool WriteDoubleQuotedString(ostream_wrapper& out, const char* str, std::size_t size,
+bool WriteDoubleQuotedString(ostream_wrapper& out, const std::string& str,
-                             StringEscaping::value stringEscaping) {
+                             bool escapeNonAscii) {
   out << "\"";
   int codePoint;
-  for (const char* i = str;
+  for (std::string::const_iterator i = str.begin();
-       GetNextCodePointAndAdvance(codePoint, i, str + size);) {
+       GetNextCodePointAndAdvance(codePoint, i, str.end());) {
     switch (codePoint) {
       case '\"':
         out << "\\\"";
@@ -342,19 +334,16 @@ bool WriteDoubleQuotedString(ostream_wrapper& out, const char* str, std::size_t
       case '\b':
         out << "\\b";
         break;
-      case '\f':
-        out << "\\f";
-        break;
       default:
         if (codePoint < 0x20 ||
             (codePoint >= 0x80 &&
              codePoint <= 0xA0)) {  // Control characters and non-breaking space
-          WriteDoubleQuoteEscapeSequence(out, codePoint, stringEscaping);
+          WriteDoubleQuoteEscapeSequence(out, codePoint);
         } else if (codePoint == 0xFEFF) {  // Byte order marks (ZWNS) should be
                                            // escaped (YAML 1.2, sec. 5.2)
-          WriteDoubleQuoteEscapeSequence(out, codePoint, stringEscaping);
+          WriteDoubleQuoteEscapeSequence(out, codePoint);
-        } else if (stringEscaping == StringEscaping::NonAscii && codePoint > 0x7E) {
+        } else if (escapeNonAscii && codePoint > 0x7E) {
-          WriteDoubleQuoteEscapeSequence(out, codePoint, stringEscaping);
+          WriteDoubleQuoteEscapeSequence(out, codePoint);
         } else {
           WriteCodePoint(out, codePoint);
         }
@@ -364,60 +353,56 @@ bool WriteDoubleQuotedString(ostream_wrapper& out, const char* str, std::size_t
   return true;
 }
 
-bool WriteLiteralString(ostream_wrapper& out, const char* str, std::size_t size,
+bool WriteLiteralString(ostream_wrapper& out, const std::string& str,
                         std::size_t indent) {
   out << "|\n";
+  out << IndentTo(indent);
   int codePoint;
-  for (const char* i = str;
+  for (std::string::const_iterator i = str.begin();
-       GetNextCodePointAndAdvance(codePoint, i, str + size);) {
+       GetNextCodePointAndAdvance(codePoint, i, str.end());) {
     if (codePoint == '\n') {
-      out << "\n";
+      out << "\n" << IndentTo(indent);
     } else {
-      out<< IndentTo(indent);
       WriteCodePoint(out, codePoint);
     }
   }
   return true;
 }
 
-bool WriteChar(ostream_wrapper& out, char ch, StringEscaping::value stringEscapingStyle) {
+bool WriteChar(ostream_wrapper& out, char ch) {
   if (('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z')) {
     out << ch;
   } else if (ch == '\"') {
-    out << R"("\"")";
+    out << "\"\\\"\"";
   } else if (ch == '\t') {
-    out << R"("\t")";
+    out << "\"\\t\"";
   } else if (ch == '\n') {
-    out << R"("\n")";
+    out << "\"\\n\"";
   } else if (ch == '\b') {
-    out << R"("\b")";
+    out << "\"\\b\"";
-  } else if (ch == '\r') {
-    out << R"("\r")";
-  } else if (ch == '\f') {
-    out << R"("\f")";
   } else if (ch == '\\') {
-    out << R"("\\")";
+    out << "\"\\\\\"";
-  } else if (0x20 <= ch && ch <= 0x7e) {
+  } else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') {
     out << "\"" << ch << "\"";
   } else {
     out << "\"";
-    WriteDoubleQuoteEscapeSequence(out, ch, stringEscapingStyle);
+    WriteDoubleQuoteEscapeSequence(out, ch);
     out << "\"";
   }
   return true;
 }
 
-bool WriteComment(ostream_wrapper& out, const char* str, std::size_t size,
+bool WriteComment(ostream_wrapper& out, const std::string& str,
                   std::size_t postCommentIndent) {
   const std::size_t curIndent = out.col();
   out << "#" << Indentation(postCommentIndent);
   out.set_comment();
   int codePoint;
-  for (const char* i = str;
+  for (std::string::const_iterator i = str.begin();
-       GetNextCodePointAndAdvance(codePoint, i, str + size);) {
+       GetNextCodePointAndAdvance(codePoint, i, str.end());) {
     if (codePoint == '\n') {
-      out << "\n"
+      out << "\n" << IndentTo(curIndent) << "#"
-          << IndentTo(curIndent) << "#" << Indentation(postCommentIndent);
+          << Indentation(postCommentIndent);
       out.set_comment();
     } else {
       WriteCodePoint(out, codePoint);
@@ -426,14 +411,14 @@ bool WriteComment(ostream_wrapper& out, const char* str, std::size_t size,
   return true;
 }
 
-bool WriteAlias(ostream_wrapper& out, const char* str, std::size_t size) {
+bool WriteAlias(ostream_wrapper& out, const std::string& str) {
   out << "*";
-  return WriteAliasName(out, str, size);
+  return WriteAliasName(out, str);
 }
 
-bool WriteAnchor(ostream_wrapper& out, const char* str, std::size_t size) {
+bool WriteAnchor(ostream_wrapper& out, const std::string& str) {
   out << "&";
-  return WriteAliasName(out, str, size);
+  return WriteAliasName(out, str);
 }
 
 bool WriteTag(ostream_wrapper& out, const std::string& str, bool verbatim) {
@@ -490,10 +475,9 @@ bool WriteTagWithPrefix(ostream_wrapper& out, const std::string& prefix,
 }
 
 bool WriteBinary(ostream_wrapper& out, const Binary& binary) {
-  std::string encoded = EncodeBase64(binary.data(), binary.size());
+  WriteDoubleQuotedString(out, EncodeBase64(binary.data(), binary.size()),
-  WriteDoubleQuotedString(out, encoded.data(), encoded.size(),
+                          false);
-                          StringEscaping::None);
   return true;
 }
-}  // namespace Utils
+}
-}  // namespace YAML
+}

src/emitterutils.h

@@ -24,27 +24,22 @@ struct StringFormat {
   enum value { Plain, SingleQuoted, DoubleQuoted, Literal };
 };
 
-struct StringEscaping {
-  enum value { None, NonAscii, JSON };
-};
-
 namespace Utils {
-StringFormat::value ComputeStringFormat(const char* str, std::size_t size,
+StringFormat::value ComputeStringFormat(const std::string& str,
                                         EMITTER_MANIP strFormat,
                                         FlowType::value flowType,
                                         bool escapeNonAscii);
 
-bool WriteSingleQuotedString(ostream_wrapper& out, const char* str, std::size_t size);
+bool WriteSingleQuotedString(ostream_wrapper& out, const std::string& str);
-bool WriteDoubleQuotedString(ostream_wrapper& out, const char* str, std::size_t size,
+bool WriteDoubleQuotedString(ostream_wrapper& out, const std::string& str,
-                             StringEscaping::value stringEscaping);
+                             bool escapeNonAscii);
-bool WriteLiteralString(ostream_wrapper& out, const char* str, std::size_t size,
+bool WriteLiteralString(ostream_wrapper& out, const std::string& str,
                         std::size_t indent);
-bool WriteChar(ostream_wrapper& out, char ch,
+bool WriteChar(ostream_wrapper& out, char ch);
-               StringEscaping::value stringEscapingStyle);
+bool WriteComment(ostream_wrapper& out, const std::string& str,
-bool WriteComment(ostream_wrapper& out, const char* str, std::size_t size,
                   std::size_t postCommentIndent);
-bool WriteAlias(ostream_wrapper& out, const char* str, std::size_t size);
+bool WriteAlias(ostream_wrapper& out, const std::string& str);
-bool WriteAnchor(ostream_wrapper& out, const char* str, std::size_t size);
+bool WriteAnchor(ostream_wrapper& out, const std::string& str);
 bool WriteTag(ostream_wrapper& out, const std::string& str, bool verbatim);
 bool WriteTagWithPrefix(ostream_wrapper& out, const std::string& prefix,
                         const std::string& tag);

src/exceptions.cpp

@@ -1,20 +1,31 @@
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/noexcept.h"
+
+// This is here for compatibility with older versions of Visual Studio
+// which don't support noexcept
+#ifdef _MSC_VER
+    #define YAML_CPP_NOEXCEPT _NOEXCEPT
+#else
+    #define YAML_CPP_NOEXCEPT noexcept
+#endif
 
 namespace YAML {
 
 // These destructors are defined out-of-line so the vtable is only emitted once.
-Exception::~Exception() YAML_CPP_NOEXCEPT = default;
+Exception::~Exception() YAML_CPP_NOEXCEPT {}
-ParserException::~ParserException() YAML_CPP_NOEXCEPT = default;
+ParserException::~ParserException() YAML_CPP_NOEXCEPT {}
-RepresentationException::~RepresentationException() YAML_CPP_NOEXCEPT = default;
+RepresentationException::~RepresentationException() YAML_CPP_NOEXCEPT {}
-InvalidScalar::~InvalidScalar() YAML_CPP_NOEXCEPT = default;
+InvalidScalar::~InvalidScalar() YAML_CPP_NOEXCEPT {}
-KeyNotFound::~KeyNotFound() YAML_CPP_NOEXCEPT = default;
+KeyNotFound::~KeyNotFound() YAML_CPP_NOEXCEPT {}
-InvalidNode::~InvalidNode() YAML_CPP_NOEXCEPT = default;
+InvalidNode::~InvalidNode() YAML_CPP_NOEXCEPT {}
-BadConversion::~BadConversion() YAML_CPP_NOEXCEPT = default;
+BadConversion::~BadConversion() YAML_CPP_NOEXCEPT {}
-BadDereference::~BadDereference() YAML_CPP_NOEXCEPT = default;
+BadDereference::~BadDereference() YAML_CPP_NOEXCEPT {}
-BadSubscript::~BadSubscript() YAML_CPP_NOEXCEPT = default;
+BadSubscript::~BadSubscript() YAML_CPP_NOEXCEPT {}
-BadPushback::~BadPushback() YAML_CPP_NOEXCEPT = default;
+BadPushback::~BadPushback() YAML_CPP_NOEXCEPT {}
-BadInsert::~BadInsert() YAML_CPP_NOEXCEPT = default;
+BadInsert::~BadInsert() YAML_CPP_NOEXCEPT {}
-EmitterException::~EmitterException() YAML_CPP_NOEXCEPT = default;
+EmitterException::~EmitterException() YAML_CPP_NOEXCEPT {}
-BadFile::~BadFile() YAML_CPP_NOEXCEPT = default;
+BadFile::~BadFile() YAML_CPP_NOEXCEPT {}
-}  // namespace YAML
+}
+
+#undef YAML_CPP_NOEXCEPT
+
+

src/exp.cpp

@@ -12,7 +12,8 @@ namespace YAML {
 namespace Exp {
 unsigned ParseHex(const std::string& str, const Mark& mark) {
   unsigned value = 0;
-  for (char ch : str) {
+  for (std::size_t i = 0; i < str.size(); i++) {
+    char ch = str[i];
     int digit = 0;
     if ('a' <= ch && ch <= 'f')
       digit = ch - 'a' + 10;
@@ -54,16 +55,14 @@ std::string Escape(Stream& in, int codeLength) {
   // now break it up into chars
   if (value <= 0x7F)
     return Str(value);
-
+  else if (value <= 0x7FF)
-  if (value <= 0x7FF)
     return Str(0xC0 + (value >> 6)) + Str(0x80 + (value & 0x3F));
-
+  else if (value <= 0xFFFF)
-  if (value <= 0xFFFF)
     return Str(0xE0 + (value >> 12)) + Str(0x80 + ((value >> 6) & 0x3F)) +
            Str(0x80 + (value & 0x3F));
-
+  else
-  return Str(0xF0 + (value >> 18)) + Str(0x80 + ((value >> 12) & 0x3F)) +
+    return Str(0xF0 + (value >> 18)) + Str(0x80 + ((value >> 12) & 0x3F)) +
-         Str(0x80 + ((value >> 6) & 0x3F)) + Str(0x80 + (value & 0x3F));
+           Str(0x80 + ((value >> 6) & 0x3F)) + Str(0x80 + (value & 0x3F));
 }
 
 // Escape
@@ -105,7 +104,7 @@ std::string Escape(Stream& in) {
     case 'e':
       return "\x1B";
     case ' ':
-      return R"( )";
+      return "\x20";
     case '\"':
       return "\"";
     case '\'':
@@ -133,5 +132,5 @@ std::string Escape(Stream& in) {
   std::stringstream msg;
   throw ParserException(in.mark(), std::string(ErrorMsg::INVALID_ESCAPE) + ch);
 }
-}  // namespace Exp
+}
-}  // namespace YAML
+}

src/exp.h

@@ -33,15 +33,15 @@ inline const RegEx& Tab() {
   return e;
 }
 inline const RegEx& Blank() {
-  static const RegEx e = Space() | Tab();
+  static const RegEx e = Space() || Tab();
   return e;
 }
 inline const RegEx& Break() {
-  static const RegEx e = RegEx('\n') | RegEx("\r\n") | RegEx('\r');
+  static const RegEx e = RegEx('\n') || RegEx("\r\n");
   return e;
 }
 inline const RegEx& BlankOrBreak() {
-  static const RegEx e = Blank() | Break();
+  static const RegEx e = Blank() || Break();
   return e;
 }
 inline const RegEx& Digit() {
@@ -49,29 +49,29 @@ inline const RegEx& Digit() {
   return e;
 }
 inline const RegEx& Alpha() {
-  static const RegEx e = RegEx('a', 'z') | RegEx('A', 'Z');
+  static const RegEx e = RegEx('a', 'z') || RegEx('A', 'Z');
   return e;
 }
 inline const RegEx& AlphaNumeric() {
-  static const RegEx e = Alpha() | Digit();
+  static const RegEx e = Alpha() || Digit();
   return e;
 }
 inline const RegEx& Word() {
-  static const RegEx e = AlphaNumeric() | RegEx('-');
+  static const RegEx e = AlphaNumeric() || RegEx('-');
   return e;
 }
 inline const RegEx& Hex() {
-  static const RegEx e = Digit() | RegEx('A', 'F') | RegEx('a', 'f');
+  static const RegEx e = Digit() || RegEx('A', 'F') || RegEx('a', 'f');
   return e;
 }
 // Valid Unicode code points that are not part of c-printable (YAML 1.2, sec.
 // 5.1)
 inline const RegEx& NotPrintable() {
   static const RegEx e =
-      RegEx(0) |
+      RegEx(0) ||
-      RegEx("\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x7F", REGEX_OR) |
+      RegEx("\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x7F", REGEX_OR) ||
-      RegEx(0x0E, 0x1F) |
+      RegEx(0x0E, 0x1F) ||
-      (RegEx('\xC2') + (RegEx('\x80', '\x84') | RegEx('\x86', '\x9F')));
+      (RegEx('\xC2') + (RegEx('\x80', '\x84') || RegEx('\x86', '\x9F')));
   return e;
 }
 inline const RegEx& Utf8_ByteOrderMark() {
@@ -82,19 +82,19 @@ inline const RegEx& Utf8_ByteOrderMark() {
 // actual tags
 
 inline const RegEx& DocStart() {
-  static const RegEx e = RegEx("---") + (BlankOrBreak() | RegEx());
+  static const RegEx e = RegEx("---") + (BlankOrBreak() || RegEx());
   return e;
 }
 inline const RegEx& DocEnd() {
-  static const RegEx e = RegEx("...") + (BlankOrBreak() | RegEx());
+  static const RegEx e = RegEx("...") + (BlankOrBreak() || RegEx());
   return e;
 }
 inline const RegEx& DocIndicator() {
-  static const RegEx e = DocStart() | DocEnd();
+  static const RegEx e = DocStart() || DocEnd();
   return e;
 }
 inline const RegEx& BlockEntry() {
-  static const RegEx e = RegEx('-') + (BlankOrBreak() | RegEx());
+  static const RegEx e = RegEx('-') + (BlankOrBreak() || RegEx());
   return e;
 }
 inline const RegEx& Key() {
@@ -106,40 +106,36 @@ inline const RegEx& KeyInFlow() {
   return e;
 }
 inline const RegEx& Value() {
-  static const RegEx e = RegEx(':') + (BlankOrBreak() | RegEx());
+  static const RegEx e = RegEx(':') + (BlankOrBreak() || RegEx());
   return e;
 }
 inline const RegEx& ValueInFlow() {
-  static const RegEx e = RegEx(':') + (BlankOrBreak() | RegEx(",]}", REGEX_OR));
+  static const RegEx e = RegEx(':') + (BlankOrBreak() || RegEx(",}", REGEX_OR));
   return e;
 }
 inline const RegEx& ValueInJSONFlow() {
   static const RegEx e = RegEx(':');
   return e;
 }
-inline const RegEx& Ampersand() {
-  static const RegEx e = RegEx('&');
-  return e;
-}
 inline const RegEx Comment() {
   static const RegEx e = RegEx('#');
   return e;
 }
 inline const RegEx& Anchor() {
-  static const RegEx e = !(RegEx("[]{},", REGEX_OR) | BlankOrBreak());
+  static const RegEx e = !(RegEx("[]{},", REGEX_OR) || BlankOrBreak());
   return e;
 }
 inline const RegEx& AnchorEnd() {
-  static const RegEx e = RegEx("?:,]}%@`", REGEX_OR) | BlankOrBreak();
+  static const RegEx e = RegEx("?:,]}%@`", REGEX_OR) || BlankOrBreak();
   return e;
 }
 inline const RegEx& URI() {
-  static const RegEx e = Word() | RegEx("#;/?:@&=+$,_.!~*'()[]", REGEX_OR) |
+  static const RegEx e = Word() || RegEx("#;/?:@&=+$,_.!~*'()[]", REGEX_OR) ||
                          (RegEx('%') + Hex() + Hex());
   return e;
 }
 inline const RegEx& Tag() {
-  static const RegEx e = Word() | RegEx("#;/?:@&=+$_.~*'()", REGEX_OR) |
+  static const RegEx e = Word() || RegEx("#;/?:@&=+$_.~*'()", REGEX_OR) ||
                          (RegEx('%') + Hex() + Hex());
   return e;
 }
@@ -152,34 +148,34 @@ inline const RegEx& Tag() {
 // space.
 inline const RegEx& PlainScalar() {
   static const RegEx e =
-      !(BlankOrBreak() | RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) |
+      !(BlankOrBreak() || RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) ||
-        (RegEx("-?:", REGEX_OR) + (BlankOrBreak() | RegEx())));
+        (RegEx("-?:", REGEX_OR) + (BlankOrBreak() || RegEx())));
   return e;
 }
 inline const RegEx& PlainScalarInFlow() {
   static const RegEx e =
-      !(BlankOrBreak() | RegEx("?,[]{}#&*!|>\'\"%@`", REGEX_OR) |
+      !(BlankOrBreak() || RegEx("?,[]{}#&*!|>\'\"%@`", REGEX_OR) ||
-        (RegEx("-:", REGEX_OR) + (Blank() | RegEx())));
+        (RegEx("-:", REGEX_OR) + Blank()));
   return e;
 }
 inline const RegEx& EndScalar() {
-  static const RegEx e = RegEx(':') + (BlankOrBreak() | RegEx());
+  static const RegEx e = RegEx(':') + (BlankOrBreak() || RegEx());
   return e;
 }
 inline const RegEx& EndScalarInFlow() {
   static const RegEx e =
-      (RegEx(':') + (BlankOrBreak() | RegEx() | RegEx(",]}", REGEX_OR))) |
+      (RegEx(':') + (BlankOrBreak() || RegEx() || RegEx(",]}", REGEX_OR))) ||
       RegEx(",?[]{}", REGEX_OR);
   return e;
 }
 
 inline const RegEx& ScanScalarEndInFlow() {
-  static const RegEx e = (EndScalarInFlow() | (BlankOrBreak() + Comment()));
+  static const RegEx e = (EndScalarInFlow() || (BlankOrBreak() + Comment()));
   return e;
 }
 
 inline const RegEx& ScanScalarEnd() {
-  static const RegEx e = EndScalar() | (BlankOrBreak() + Comment());
+  static const RegEx e = EndScalar() || (BlankOrBreak() + Comment());
   return e;
 }
 inline const RegEx& EscSingleQuote() {
@@ -196,8 +192,8 @@ inline const RegEx& ChompIndicator() {
   return e;
 }
 inline const RegEx& Chomp() {
-  static const RegEx e = (ChompIndicator() + Digit()) |
+  static const RegEx e = (ChompIndicator() + Digit()) ||
-                         (Digit() + ChompIndicator()) | ChompIndicator() |
+                         (Digit() + ChompIndicator()) || ChompIndicator() ||
                          Digit();
   return e;
 }

src/fptostring.cpp

@@ -1,238 +0,0 @@
-#include "yaml-cpp/fptostring.h"
-#include "contrib/dragonbox.h"
-
-#include <array>
-#include <cassert>
-#include <cmath>
-#include <limits>
-#include <sstream>
-#include <tuple>
-
-namespace YAML {
-namespace detail {
-namespace fp_formatting {
-
-/**
- * Converts a integer into its ASCII digits.
- *
- * @param begin/end - a buffer, must be at least 20bytes long.
- * @param value     - input value.
- * @param width     - minimum number of digits, fill with '0' to the left. Must be equal or smaller than the buffer size.
- * @return          - number of digits filled into the buffer (or -1 if preconditions are not meet)
- *
- * Example:
- * std::array<char, 20> buffer;
- * auto ct = ConvertToChars(buffer.begin(), buffer.end(), 23, 3);
- * assert(ct = 3);
- * assert(buffer[0] == '0');
- * assert(buffer[1] == '2');
- * assert(buffer[2] == '3');
- */
-int ConvertToChars(char* begin, char* end, size_t value, int width=1) {
-  // precondition of this function (will trigger in debug build)
-  assert(width >= 1);
-  assert(end >= begin);       // end must be after begin
-  assert(end-begin >= width); // Buffer must be large enough
-  assert(end-begin >= 20);    // 2^64 has 20digits, so at least 20 digits must be available
-
-  // defensive programming, abort if precondition are not met (will trigger in release build)
-  if (width < 1) {
-    return -1;
-  }
-  if (end < begin) {
-    return -1;
-  }
-  if (end-begin < width) {
-    return -1;
-  }
-  if (end-begin < 20) {
-    return -1;
-  }
-
-
-  // count number of digits, and fill digits array accordingly
-  int digits_ct{};
-  while (value > 0) {
-    char c = value % 10 + '0';
-    value = value / 10;
-    digits_ct += 1;
-    *(end-digits_ct) = c;
-  }
-  while(digits_ct < width) {
-    assert(digits_ct < 64);
-    digits_ct += 1;
-    *(end-digits_ct) = '0';
-  }
-  // move data to the front of the array
-  std::memmove(begin, end-digits_ct, digits_ct);
-  return digits_ct;
-}
-
-/**
- * Converts a float or double to a string.
- *
- * converts a value 'v' to a string. Uses dragonbox for formatting.
- */
-template <typename T>
-std::string FpToString(T v, int precision = 0) {
-  // hard coded constant, at which exponent should switch to a scientific notation
-  int const lowerExponentThreshold = -5;
-  int const upperExponentThreshold =  (precision==0)?6:precision;
-  if (precision == 0) {
-    precision = 6;
-  }
-
-  // dragonbox/to_decimal does not handle value 0, inf, NaN
-  if (v == 0 || std::isinf(v) || std::isnan(v)) {
-    std::stringstream ss;
-    ss.imbue(std::locale("C"));
-    ss << v;
-    return ss.str();
-  }
-
-  auto r = jkj::dragonbox::to_decimal(v);
-
-  auto digits  = std::array<char, 20>{}; // max digits of size_t is 20.
-  auto digits_ct = ConvertToChars(digits.data(), digits.data() + digits.size(), r.significand);
-
-  // defensive programming, ConvertToChars arguments are invalid
-  if (digits_ct == -1) {
-    std::stringstream ss;
-    ss.imbue(std::locale("C"));
-    ss << v;
-    return ss.str();
-  }
-
-  // check if requested precision is lower than
-  // required digits for exact representation
-  if (digits_ct > precision) {
-    auto diff = digits_ct - precision;
-    r.exponent += diff;
-    digits_ct = precision;
-
-    // round numbers if required
-    if (digits[digits_ct] >= '5') {
-      int i{digits_ct-1};
-      digits[i] += 1;
-      while (digits[i] == '9'+1) {
-        digits_ct -= 1;
-        r.exponent += 1;
-        if (i > 0) {
-          digits[i-1] += 1;
-          i -= 1;
-        } else {
-          digits_ct = 1;
-          digits[0] = '1';
-          break;
-        }
-      }
-    }
-  }
-
-  std::array<char, 28> output_buffer; // max digits of size_t plus sign, a dot and 2 letters for 'e+' or 'e-' and 4 letters for the exponent
-  auto output_ptr = &output_buffer[0];
-
-  // print '-' symbol for negative numbers
-  if (r.is_negative) {
-    *(output_ptr++) = '-';
-  }
-
-  // exponent if only a single non-zero digit is before the decimal point
-  int const exponent = r.exponent + digits_ct - 1;
-
-  // case 1: scientific notation
-  if (exponent >= upperExponentThreshold || exponent <= lowerExponentThreshold) {
-    // print first digit
-    *(output_ptr++) = digits[0];
-
-    // print digits after decimal point
-    if (digits_ct > 1) {
-      *(output_ptr++) = '.';
-      // print significant numbers after decimal point
-      for (int i{1}; i < digits_ct; ++i) {
-         *(output_ptr++) = digits[i];
-      }
-    }
-    *(output_ptr++) = 'e';
-    *(output_ptr++) = (exponent>=0)?'+':'-';
-    auto exp_digits = std::array<char, 20>{};
-    auto exp_digits_ct = ConvertToChars(exp_digits.data(), exp_digits.data() + exp_digits.size(), std::abs(exponent), /*.precision=*/ 2);
-
-    // defensive programming, ConvertToChars arguments are invalid
-    if (exp_digits_ct == -1) {
-      std::stringstream ss;
-      ss.imbue(std::locale("C"));
-      ss << v;
-      return ss.str();
-    }
-
-    for (int i{0}; i < exp_digits_ct; ++i) {
-      *(output_ptr++) = exp_digits[i];
-    }
-
-  // case 2: default notation
-  } else {
-    auto const digits_end   = digits.begin() + digits_ct;
-    auto digits_iter    = digits.begin();
-
-    // print digits before point
-    int const before_decimal_digits = digits_ct + r.exponent;
-    if (before_decimal_digits > 0) {
-      // print digits before point
-      for (int i{0}; i < std::min(before_decimal_digits, digits_ct); ++i) {
-        *(output_ptr++) = *(digits_iter++);
-      }
-      // print trailing zeros before point
-      for (int i{0}; i < before_decimal_digits - digits_ct; ++i) {
-        *(output_ptr++) = '0';
-      }
-
-    // print 0 before point if none where printed before
-    } else {
-      *(output_ptr++) = '0';
-    }
-
-    if (digits_iter != digits_end) {
-      *(output_ptr++) = '.';
-      // print 0 after decimal point, to fill until first digits
-      int const after_decimal_zeros = -digits_ct - r.exponent;
-      for (int i{0}; i < after_decimal_zeros; ++i) {
-         *(output_ptr++) = '0';
-      }
-
-      // print significant numbers after decimal point
-      for (;digits_iter < digits_end; ++digits_iter) {
-         *(output_ptr++) = *digits_iter;
-      }
-    }
-  }
-  *output_ptr = '\0';
-  return std::string{&output_buffer[0], output_ptr};
-}
-
-}
-}
-
-std::string FpToString(float v, size_t precision) {
-  return detail::fp_formatting::FpToString(v, precision);
-}
-
-std::string FpToString(double v, size_t precision) {
-  return detail::fp_formatting::FpToString(v, precision);
-}
-
-/**
- * dragonbox only works for floats/doubles not long double
- */
-std::string FpToString(long double v, size_t precision) {
-  std::stringstream ss;
-  ss.imbue(std::locale("C"));
-  if (precision == 0) {
-     precision = std::numeric_limits<long double>::max_digits10;
-  }
-  ss.precision(precision);
-  ss << v;
-  return ss.str();
-}
-
-}

src/indentation.h

@@ -7,6 +7,7 @@
 #pragma once
 #endif
 
+#include <iostream>
 #include <cstddef>
 
 #include "yaml-cpp/ostream_wrapper.h"

src/memory.cpp

@@ -22,5 +22,5 @@ node& memory::create_node() {
 void memory::merge(const memory& rhs) {
   m_nodes.insert(rhs.m_nodes.begin(), rhs.m_nodes.end());
 }
-}  // namespace detail
+}
-}  // namespace YAML
+}

src/node.cpp

@@ -9,4 +9,4 @@ Node Clone(const Node& node) {
   events.Emit(builder);
   return builder.Root();
 }
-}  // namespace YAML
+}

src/node_data.cpp

@@ -1,5 +1,4 @@
-#include <algorithm>
+#include <assert.h>
-#include <cassert>
 #include <iterator>
 #include <sstream>
 
@@ -13,24 +12,15 @@
 
 namespace YAML {
 namespace detail {
-YAML_CPP_API std::atomic<size_t> node::m_amount{0};
 
-const std::string& node_data::empty_scalar() {
+std::string node_data::empty_scalar;
-  static const std::string svalue;
-  return svalue;
-}
 
 node_data::node_data()
     : m_isDefined(false),
       m_mark(Mark::null_mark()),
       m_type(NodeType::Null),
-      m_tag{},
       m_style(EmitterStyle::Default),
-      m_scalar{},
+      m_seqSize(0) {}
-      m_sequence{},
-      m_seqSize(0),
-      m_map{},
-      m_undefinedPairs{} {}
 
 void node_data::mark_defined() {
   if (m_type == NodeType::Undefined)
@@ -110,9 +100,9 @@ void node_data::compute_seq_size() const {
 }
 
 void node_data::compute_map_size() const {
-  auto it = m_undefinedPairs.begin();
+  kv_pairs::iterator it = m_undefinedPairs.begin();
   while (it != m_undefinedPairs.end()) {
-    auto jt = std::next(it);
+    kv_pairs::iterator jt = std::next(it);
     if (it->first->is_defined() && it->second->is_defined())
       m_undefinedPairs.erase(it);
     it = jt;
@@ -121,7 +111,7 @@ void node_data::compute_map_size() const {
 
 const_node_iterator node_data::begin() const {
   if (!m_isDefined)
-    return {};
+    return const_node_iterator();
 
   switch (m_type) {
     case NodeType::Sequence:
@@ -129,13 +119,13 @@ const_node_iterator node_data::begin() const {
     case NodeType::Map:
       return const_node_iterator(m_map.begin(), m_map.end());
     default:
-      return {};
+      return const_node_iterator();
   }
 }
 
 node_iterator node_data::begin() {
   if (!m_isDefined)
-    return {};
+    return node_iterator();
 
   switch (m_type) {
     case NodeType::Sequence:
@@ -143,13 +133,13 @@ node_iterator node_data::begin() {
     case NodeType::Map:
       return node_iterator(m_map.begin(), m_map.end());
     default:
-      return {};
+      return node_iterator();
   }
 }
 
 const_node_iterator node_data::end() const {
   if (!m_isDefined)
-    return {};
+    return const_node_iterator();
 
   switch (m_type) {
     case NodeType::Sequence:
@@ -157,13 +147,13 @@ const_node_iterator node_data::end() const {
     case NodeType::Map:
       return const_node_iterator(m_map.end(), m_map.end());
     default:
-      return {};
+      return const_node_iterator();
   }
 }
 
 node_iterator node_data::end() {
   if (!m_isDefined)
-    return {};
+    return node_iterator();
 
   switch (m_type) {
     case NodeType::Sequence:
@@ -171,13 +161,12 @@ node_iterator node_data::end() {
     case NodeType::Map:
       return node_iterator(m_map.end(), m_map.end());
     default:
-      return {};
+      return node_iterator();
   }
 }
 
 // sequence
-void node_data::push_back(node& node,
+void node_data::push_back(node& node, shared_memory_holder /* pMemory */) {
-                          const shared_memory_holder& /* pMemory */) {
   if (m_type == NodeType::Undefined || m_type == NodeType::Null) {
     m_type = NodeType::Sequence;
     reset_sequence();
@@ -189,8 +178,7 @@ void node_data::push_back(node& node,
   m_sequence.push_back(&node);
 }
 
-void node_data::insert(node& key, node& value,
+void node_data::insert(node& key, node& value, shared_memory_holder pMemory) {
-                       const shared_memory_holder& pMemory) {
   switch (m_type) {
     case NodeType::Map:
       break;
@@ -200,28 +188,27 @@ void node_data::insert(node& key, node& value,
       convert_to_map(pMemory);
       break;
     case NodeType::Scalar:
-      throw BadSubscript(m_mark, key);
+      throw BadSubscript();
   }
 
   insert_map_pair(key, value);
 }
 
 // indexing
-node* node_data::get(node& key,
+node* node_data::get(node& key, shared_memory_holder /* pMemory */) const {
-                     const shared_memory_holder& /* pMemory */) const {
   if (m_type != NodeType::Map) {
-    return nullptr;
+    return NULL;
   }
 
-  for (const auto& it : m_map) {
+  for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    if (it.first->is(key))
+    if (it->first->is(key))
-      return it.second;
+      return it->second;
   }
 
-  return nullptr;
+  return NULL;
 }
 
-node& node_data::get(node& key, const shared_memory_holder& pMemory) {
+node& node_data::get(node& key, shared_memory_holder pMemory) {
   switch (m_type) {
     case NodeType::Map:
       break;
@@ -231,12 +218,12 @@ node& node_data::get(node& key, const shared_memory_holder& pMemory) {
       convert_to_map(pMemory);
       break;
     case NodeType::Scalar:
-      throw BadSubscript(m_mark, key);
+      throw BadSubscript();
   }
 
-  for (const auto& it : m_map) {
+  for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    if (it.first->is(key))
+    if (it->first->is(key))
-      return *it.second;
+      return *it->second;
   }
 
   node& value = pMemory->create_node();
@@ -244,26 +231,15 @@ node& node_data::get(node& key, const shared_memory_holder& pMemory) {
   return value;
 }
 
-bool node_data::remove(node& key, const shared_memory_holder& /* pMemory */) {
+bool node_data::remove(node& key, shared_memory_holder /* pMemory */) {
   if (m_type != NodeType::Map)
     return false;
 
-  for (auto it = m_undefinedPairs.begin(); it != m_undefinedPairs.end();) {
+  for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
-    auto jt = std::next(it);
+    if (it->first->is(key)) {
-    if (it->first->is(key))
+      m_map.erase(it);
-      m_undefinedPairs.erase(it);
+      return true;
-    it = jt;
+    }
-  }
-
-  auto it =
-      std::find_if(m_map.begin(), m_map.end(),
-                   [&](std::pair<YAML::detail::node*, YAML::detail::node*> j) {
-                     return (j.first->is(key));
-                   });
-
-  if (it != m_map.end()) {
-    m_map.erase(it);
-    return true;
   }
 
   return false;
@@ -286,7 +262,7 @@ void node_data::insert_map_pair(node& key, node& value) {
     m_undefinedPairs.emplace_back(&key, &value);
 }
 
-void node_data::convert_to_map(const shared_memory_holder& pMemory) {
+void node_data::convert_to_map(shared_memory_holder pMemory) {
   switch (m_type) {
     case NodeType::Undefined:
     case NodeType::Null:
@@ -304,13 +280,12 @@ void node_data::convert_to_map(const shared_memory_holder& pMemory) {
   }
 }
 
-void node_data::convert_sequence_to_map(const shared_memory_holder& pMemory) {
+void node_data::convert_sequence_to_map(shared_memory_holder pMemory) {
   assert(m_type == NodeType::Sequence);
 
   reset_map();
   for (std::size_t i = 0; i < m_sequence.size(); i++) {
     std::stringstream stream;
-    stream.imbue(std::locale("C"));
     stream << i;
 
     node& key = pMemory->create_node();
@@ -321,5 +296,5 @@ void node_data::convert_sequence_to_map(const shared_memory_holder& pMemory) {
   reset_sequence();
   m_type = NodeType::Map;
 }
-}  // namespace detail
+}
-}  // namespace YAML
+}

src/nodebuilder.cpp

@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <cassert>
 
 #include "nodebuilder.h"
@@ -10,16 +11,11 @@ namespace YAML {
 struct Mark;
 
 NodeBuilder::NodeBuilder()
-    : m_pMemory(new detail::memory_holder),
+    : m_pMemory(new detail::memory_holder), m_pRoot(0), m_mapDepth(0) {
-      m_pRoot(nullptr),
+  m_anchors.push_back(0);  // since the anchors start at 1
-      m_stack{},
-      m_anchors{},
-      m_keys{},
-      m_mapDepth(0) {
-  m_anchors.push_back(nullptr);  // since the anchors start at 1
 }
 
-NodeBuilder::~NodeBuilder() = default;
+NodeBuilder::~NodeBuilder() {}
 
 Node NodeBuilder::Root() {
   if (!m_pRoot)
@@ -92,7 +88,7 @@ void NodeBuilder::Push(detail::node& node) {
 
   m_stack.push_back(&node);
   if (needsKey)
-    m_keys.emplace_back(&node, false);
+    m_keys.push_back(PushedKey(&node, false));
 }
 
 void NodeBuilder::Pop() {
@@ -131,4 +127,4 @@ void NodeBuilder::RegisterAnchor(anchor_t anchor, detail::node& node) {
     m_anchors.push_back(&node);
   }
 }
-}  // namespace YAML
+}

src/nodebuilder.h

@@ -27,29 +27,25 @@ class Node;
 class NodeBuilder : public EventHandler {
  public:
   NodeBuilder();
-  NodeBuilder(const NodeBuilder&) = delete;
+  virtual ~NodeBuilder();
-  NodeBuilder(NodeBuilder&&) = delete;
-  NodeBuilder& operator=(const NodeBuilder&) = delete;
-  NodeBuilder& operator=(NodeBuilder&&) = delete;
-  ~NodeBuilder() override;
 
   Node Root();
 
-  void OnDocumentStart(const Mark& mark) override;
+  virtual void OnDocumentStart(const Mark& mark);
-  void OnDocumentEnd() override;
+  virtual void OnDocumentEnd();
 
-  void OnNull(const Mark& mark, anchor_t anchor) override;
+  virtual void OnNull(const Mark& mark, anchor_t anchor);
-  void OnAlias(const Mark& mark, anchor_t anchor) override;
+  virtual void OnAlias(const Mark& mark, anchor_t anchor);
-  void OnScalar(const Mark& mark, const std::string& tag,
+  virtual void OnScalar(const Mark& mark, const std::string& tag,
-                        anchor_t anchor, const std::string& value) override;
+                        anchor_t anchor, const std::string& value);
 
-  void OnSequenceStart(const Mark& mark, const std::string& tag,
+  virtual void OnSequenceStart(const Mark& mark, const std::string& tag,
-                               anchor_t anchor, EmitterStyle::value style) override;
+                               anchor_t anchor, EmitterStyle::value style);
-  void OnSequenceEnd() override;
+  virtual void OnSequenceEnd();
 
-  void OnMapStart(const Mark& mark, const std::string& tag,
+  virtual void OnMapStart(const Mark& mark, const std::string& tag,
-                          anchor_t anchor, EmitterStyle::value style) override;
+                          anchor_t anchor, EmitterStyle::value style);
-  void OnMapEnd() override;
+  virtual void OnMapEnd();
 
  private:
   detail::node& Push(const Mark& mark, anchor_t anchor);
@@ -61,14 +57,14 @@ class NodeBuilder : public EventHandler {
   detail::shared_memory_holder m_pMemory;
   detail::node* m_pRoot;
 
-  using Nodes = std::vector<detail::node *>;
+  typedef std::vector<detail::node*> Nodes;
   Nodes m_stack;
   Nodes m_anchors;
 
-  using PushedKey = std::pair<detail::node*, bool>;
+  typedef std::pair<detail::node*, bool> PushedKey;
   std::vector<PushedKey> m_keys;
   std::size_t m_mapDepth;
 };
-}  // namespace YAML
+}
 
 #endif  // NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/nodeevents.cpp

@@ -13,14 +13,14 @@ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) {
 
 anchor_t NodeEvents::AliasManager::LookupAnchor(
     const detail::node& node) const {
-  auto it = m_anchorByIdentity.find(node.ref());
+  AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref());
   if (it == m_anchorByIdentity.end())
     return 0;
   return it->second;
 }
 
 NodeEvents::NodeEvents(const Node& node)
-    : m_pMemory(node.m_pMemory), m_root(node.m_pNode), m_refCount{} {
+    : m_pMemory(node.m_pMemory), m_root(node.m_pNode) {
   if (m_root)
     Setup(*m_root);
 }
@@ -32,12 +32,13 @@ void NodeEvents::Setup(const detail::node& node) {
     return;
 
   if (node.type() == NodeType::Sequence) {
-    for (auto element : node)
+    for (detail::const_node_iterator it = node.begin(); it != node.end(); ++it)
-      Setup(*element);
+      Setup(**it);
   } else if (node.type() == NodeType::Map) {
-    for (auto element : node) {
+    for (detail::const_node_iterator it = node.begin(); it != node.end();
-      Setup(*element.first);
+         ++it) {
-      Setup(*element.second);
+      Setup(*it->first);
+      Setup(*it->second);
     }
   }
 }
@@ -76,15 +77,17 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
       break;
     case NodeType::Sequence:
       handler.OnSequenceStart(Mark(), node.tag(), anchor, node.style());
-      for (auto element : node)
+      for (detail::const_node_iterator it = node.begin(); it != node.end();
-        Emit(*element, handler, am);
+           ++it)
+        Emit(**it, handler, am);
       handler.OnSequenceEnd();
       break;
     case NodeType::Map:
       handler.OnMapStart(Mark(), node.tag(), anchor, node.style());
-      for (auto element : node) {
+      for (detail::const_node_iterator it = node.begin(); it != node.end();
-        Emit(*element.first, handler, am);
+           ++it) {
-        Emit(*element.second, handler, am);
+        Emit(*it->first, handler, am);
+        Emit(*it->second, handler, am);
       }
       handler.OnMapEnd();
       break;
@@ -92,7 +95,7 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
 }
 
 bool NodeEvents::IsAliased(const detail::node& node) const {
-  auto it = m_refCount.find(node.ref());
+  RefCount::const_iterator it = m_refCount.find(node.ref());
   return it != m_refCount.end() && it->second > 1;
 }
-}  // namespace YAML
+}

src/nodeevents.h

@@ -26,17 +26,13 @@ class Node;
 class NodeEvents {
  public:
   explicit NodeEvents(const Node& node);
-  NodeEvents(const NodeEvents&) = delete;
-  NodeEvents(NodeEvents&&) = delete;
-  NodeEvents& operator=(const NodeEvents&) = delete;
-  NodeEvents& operator=(NodeEvents&&) = delete;
 
   void Emit(EventHandler& handler);
 
  private:
   class AliasManager {
    public:
-    AliasManager() : m_anchorByIdentity{}, m_curAnchor(0) {}
+    AliasManager() : m_curAnchor(0) {}
 
     void RegisterReference(const detail::node& node);
     anchor_t LookupAnchor(const detail::node& node) const;
@@ -45,7 +41,7 @@ class NodeEvents {
     anchor_t _CreateNewAnchor() { return ++m_curAnchor; }
 
    private:
-    using AnchorByIdentity = std::map<const detail::node_ref*, anchor_t>;
+    typedef std::map<const detail::node_ref*, anchor_t> AnchorByIdentity;
     AnchorByIdentity m_anchorByIdentity;
 
     anchor_t m_curAnchor;
@@ -60,9 +56,9 @@ class NodeEvents {
   detail::shared_memory_holder m_pMemory;
   detail::node* m_root;
 
-  using RefCount = std::map<const detail::node_ref*, int>;
+  typedef std::map<const detail::node_ref*, int> RefCount;
   RefCount m_refCount;
 };
-}  // namespace YAML
+}
 
 #endif  // NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/null.cpp

@@ -1,17 +1,10 @@
 #include "yaml-cpp/null.h"
-#include <cstring>
 
 namespace YAML {
 _Null Null;
 
-template <std::size_t N>
+bool IsNullString(const std::string& str) {
-static bool same(const char* str, std::size_t size, const char (&literal)[N]) {
+  return str.empty() || str == "~" || str == "null" || str == "Null" ||
-  constexpr int literalSize = N - 1; // minus null terminator
+         str == "NULL";
-  return size == literalSize && std::strncmp(str, literal, literalSize) == 0;
 }
-
-bool IsNullString(const char* str, std::size_t size) {
-  return size == 0 || same(str, size, "~") || same(str, size, "null") ||
-         same(str, size, "Null") || same(str, size, "NULL");
 }
-}  // namespace YAML

src/ostream_wrapper.cpp

@@ -2,26 +2,21 @@
 
 #include <algorithm>
 #include <cstring>
-#include <ostream>
+#include <iostream>
 
 namespace YAML {
 ostream_wrapper::ostream_wrapper()
     : m_buffer(1, '\0'),
-      m_pStream(nullptr),
+      m_pStream(0),
       m_pos(0),
       m_row(0),
       m_col(0),
       m_comment(false) {}
 
 ostream_wrapper::ostream_wrapper(std::ostream& stream)
-    : m_buffer{},
+    : m_pStream(&stream), m_pos(0), m_row(0), m_col(0), m_comment(false) {}
-      m_pStream(&stream),
-      m_pos(0),
-      m_row(0),
-      m_col(0),
-      m_comment(false) {}
 
-ostream_wrapper::~ostream_wrapper() = default;
+ostream_wrapper::~ostream_wrapper() {}
 
 void ostream_wrapper::write(const std::string& str) {
   if (m_pStream) {
@@ -31,8 +26,8 @@ void ostream_wrapper::write(const std::string& str) {
     std::copy(str.begin(), str.end(), m_buffer.begin() + m_pos);
   }
 
-  for (char ch : str) {
+  for (std::size_t i = 0; i < str.size(); i++) {
-    update_pos(ch);
+    update_pos(str[i]);
   }
 }
 
@@ -59,4 +54,4 @@ void ostream_wrapper::update_pos(char ch) {
     m_comment = false;
   }
 }
-}  // namespace YAML
+}

src/parse.cpp

@@ -3,10 +3,10 @@
 #include <fstream>
 #include <sstream>
 
-#include "nodebuilder.h"
-#include "yaml-cpp/node/impl.h"
 #include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/impl.h"
 #include "yaml-cpp/parser.h"
+#include "nodebuilder.h"
 
 namespace YAML {
 Node Load(const std::string& input) {
@@ -30,9 +30,9 @@ Node Load(std::istream& input) {
 }
 
 Node LoadFile(const std::string& filename) {
-  std::ifstream fin(filename);
+  std::ifstream fin(filename.c_str());
   if (!fin) {
-    throw BadFile(filename);
+    throw BadFile();
   }
   return Load(fin);
 }
@@ -51,9 +51,9 @@ std::vector<Node> LoadAll(std::istream& input) {
   std::vector<Node> docs;
 
   Parser parser(input);
-  while (true) {
+  while (1) {
     NodeBuilder builder;
-    if (!parser.HandleNextDocument(builder) || builder.Root().IsNull()) {
+    if (!parser.HandleNextDocument(builder)) {
       break;
     }
     docs.push_back(builder.Root());
@@ -63,9 +63,9 @@ std::vector<Node> LoadAll(std::istream& input) {
 }
 
 std::vector<Node> LoadAllFromFile(const std::string& filename) {
-  std::ifstream fin(filename);
+  std::ifstream fin(filename.c_str());
   if (!fin) {
-    throw BadFile(filename);
+    throw BadFile();
   }
   return LoadAll(fin);
 }

src/parser.cpp

@@ -11,13 +11,15 @@
 namespace YAML {
 class EventHandler;
 
-Parser::Parser() : m_pScanner{}, m_pDirectives{} {}
+Parser::Parser() {}
 
-Parser::Parser(std::istream& in) : Parser() { Load(in); }
+Parser::Parser(std::istream& in) { Load(in); }
 
-Parser::~Parser() = default;
+Parser::~Parser() {}
 
-Parser::operator bool() const { return m_pScanner && !m_pScanner->empty(); }
+Parser::operator bool() const {
+  return m_pScanner.get() && !m_pScanner->empty();
+}
 
 void Parser::Load(std::istream& in) {
   m_pScanner.reset(new Scanner(in));
@@ -25,7 +27,7 @@ void Parser::Load(std::istream& in) {
 }
 
 bool Parser::HandleNextDocument(EventHandler& eventHandler) {
-  if (!m_pScanner)
+  if (!m_pScanner.get())
     return false;
 
   ParseDirectives();
@@ -41,7 +43,11 @@ bool Parser::HandleNextDocument(EventHandler& eventHandler) {
 void Parser::ParseDirectives() {
   bool readDirective = false;
 
-  while (!m_pScanner->empty()) {
+  while (1) {
+    if (m_pScanner->empty()) {
+      break;
+    }
+
     Token& token = m_pScanner->peek();
     if (token.type != Token::DIRECTIVE) {
       break;
@@ -77,7 +83,6 @@ void Parser::HandleYamlDirective(const Token& token) {
   }
 
   std::stringstream str(token.params[0]);
-  str.imbue(std::locale("C"));
   str >> m_pDirectives->version.major;
   str.get();
   str >> m_pDirectives->version.minor;
@@ -108,13 +113,17 @@ void Parser::HandleTagDirective(const Token& token) {
 }
 
 void Parser::PrintTokens(std::ostream& out) {
-  if (!m_pScanner) {
+  if (!m_pScanner.get()) {
     return;
   }
 
-  while (!m_pScanner->empty()) {
+  while (1) {
+    if (m_pScanner->empty()) {
+      break;
+    }
+
     out << m_pScanner->peek() << "\n";
     m_pScanner->pop();
   }
 }
-}  // namespace YAML
+}

src/ptr_vector.h

@@ -12,17 +12,15 @@
 #include <memory>
 #include <vector>
 
+#include "yaml-cpp/noncopyable.h"
+
 namespace YAML {
 
 // TODO: This class is no longer needed
 template <typename T>
-class ptr_vector {
+class ptr_vector : private YAML::noncopyable {
  public:
-  ptr_vector() : m_data{} {}
+  ptr_vector() {}
-  ptr_vector(const ptr_vector&) = delete;
-  ptr_vector(ptr_vector&&) = default;
-  ptr_vector& operator=(const ptr_vector&) = delete;
-  ptr_vector& operator=(ptr_vector&&) = default;
 
   void clear() { m_data.clear(); }
 
@@ -40,6 +38,6 @@ class ptr_vector {
  private:
   std::vector<std::unique_ptr<T>> m_data;
 };
-}  // namespace YAML
+}
 
 #endif  // PTR_VECTOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/regex_yaml.cpp

@@ -2,16 +2,18 @@
 
 namespace YAML {
 // constructors
+RegEx::RegEx() : m_op(REGEX_EMPTY) {}
 
-RegEx::RegEx(REGEX_OP op) : m_op(op), m_a(0), m_z(0), m_params{} {}
+RegEx::RegEx(REGEX_OP op) : m_op(op) {}
-RegEx::RegEx() : RegEx(REGEX_EMPTY) {}
 
-RegEx::RegEx(char ch) : m_op(REGEX_MATCH), m_a(ch), m_z(0), m_params{} {}
+RegEx::RegEx(char ch) : m_op(REGEX_MATCH), m_a(ch) {}
 
-RegEx::RegEx(char a, char z) : m_op(REGEX_RANGE), m_a(a), m_z(z), m_params{} {}
+RegEx::RegEx(char a, char z) : m_op(REGEX_RANGE), m_a(a), m_z(z) {}
 
-RegEx::RegEx(const std::string& str, REGEX_OP op)
+RegEx::RegEx(const std::string& str, REGEX_OP op) : m_op(op) {
-    : m_op(op), m_a(0), m_z(0), m_params(str.begin(), str.end()) {}
+  for (std::size_t i = 0; i < str.size(); i++)
+    m_params.push_back(RegEx(str[i]));
+}
 
 // combination constructors
 RegEx operator!(const RegEx& ex) {
@@ -20,14 +22,14 @@ RegEx operator!(const RegEx& ex) {
   return ret;
 }
 
-RegEx operator|(const RegEx& ex1, const RegEx& ex2) {
+RegEx operator||(const RegEx& ex1, const RegEx& ex2) {
   RegEx ret(REGEX_OR);
   ret.m_params.push_back(ex1);
   ret.m_params.push_back(ex2);
   return ret;
 }
 
-RegEx operator&(const RegEx& ex1, const RegEx& ex2) {
+RegEx operator&&(const RegEx& ex1, const RegEx& ex2) {
   RegEx ret(REGEX_AND);
   ret.m_params.push_back(ex1);
   ret.m_params.push_back(ex2);
@@ -40,4 +42,4 @@ RegEx operator+(const RegEx& ex1, const RegEx& ex2) {
   ret.m_params.push_back(ex2);
   return ret;
 }
-}  // namespace YAML
+}

src/regex_yaml.h

@@ -31,14 +31,14 @@ enum REGEX_OP {
 class YAML_CPP_API RegEx {
  public:
   RegEx();
-  explicit RegEx(char ch);
+  RegEx(char ch);
   RegEx(char a, char z);
   RegEx(const std::string& str, REGEX_OP op = REGEX_SEQ);
-  ~RegEx() = default;
+  ~RegEx() {}
 
   friend YAML_CPP_API RegEx operator!(const RegEx& ex);
-  friend YAML_CPP_API RegEx operator|(const RegEx& ex1, const RegEx& ex2);
+  friend YAML_CPP_API RegEx operator||(const RegEx& ex1, const RegEx& ex2);
-  friend YAML_CPP_API RegEx operator&(const RegEx& ex1, const RegEx& ex2);
+  friend YAML_CPP_API RegEx operator&&(const RegEx& ex1, const RegEx& ex2);
   friend YAML_CPP_API RegEx operator+(const RegEx& ex1, const RegEx& ex2);
 
   bool Matches(char ch) const;
@@ -53,7 +53,7 @@ class YAML_CPP_API RegEx {
   int Match(const Source& source) const;
 
  private:
-  explicit RegEx(REGEX_OP op);
+  RegEx(REGEX_OP op);
 
   template <typename Source>
   bool IsValidSource(const Source& source) const;
@@ -77,11 +77,10 @@ class YAML_CPP_API RegEx {
 
  private:
   REGEX_OP m_op;
-  char m_a{};
+  char m_a, m_z;
-  char m_z{};
   std::vector<RegEx> m_params;
 };
-}  // namespace YAML
+}
 
 #include "regeximpl.h"
 

src/regeximpl.h

@@ -8,8 +8,8 @@
 #endif
 
 #include "stream.h"
-#include "streamcharsource.h"
 #include "stringsource.h"
+#include "streamcharsource.h"
 
 namespace YAML {
 // query matches
@@ -27,10 +27,6 @@ inline bool RegEx::Matches(const Stream& in) const { return Match(in) >= 0; }
 
 template <typename Source>
 inline bool RegEx::Matches(const Source& source) const {
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) || __cplusplus >= 201103L)
-  static_assert(!std::is_same<Source, const char*>::value,
-#endif
-    "Must use StringCharSource instead of plain C-string");
   return Match(source) >= 0;
 }
 
@@ -110,8 +106,9 @@ inline int RegEx::MatchOpEmpty(const Source& source) const {
 template <>
 inline int RegEx::MatchOpEmpty<StringCharSource>(
     const StringCharSource& source) const {
-  return !source ? 0 : -1;  // the empty regex only is successful on the empty
+  return !source
-                            // string
+             ? 0
+             : -1;  // the empty regex only is successful on the empty string
 }
 
 // MatchOperator
@@ -133,8 +130,8 @@ inline int RegEx::MatchOpRange(const Source& source) const {
 // OrOperator
 template <typename Source>
 inline int RegEx::MatchOpOr(const Source& source) const {
-  for (const RegEx& param : m_params) {
+  for (std::size_t i = 0; i < m_params.size(); i++) {
-    int n = param.MatchUnchecked(source);
+    int n = m_params[i].MatchUnchecked(source);
     if (n >= 0)
       return n;
   }
@@ -172,11 +169,11 @@ inline int RegEx::MatchOpNot(const Source& source) const {
 template <typename Source>
 inline int RegEx::MatchOpSeq(const Source& source) const {
   int offset = 0;
-  for (const RegEx& param : m_params) {
+  for (std::size_t i = 0; i < m_params.size(); i++) {
-    int n = param.Match(source + offset);  // note Match, not
+    int n = m_params[i].Match(source + offset);  // note Match, not
-                                           // MatchUnchecked because we
+                                                 // MatchUnchecked because we
-                                           // need to check validity after
+                                                 // need to check validity after
-                                           // the offset
+                                                 // the offset
     if (n == -1)
       return -1;
     offset += n;
@@ -184,6 +181,6 @@ inline int RegEx::MatchOpSeq(const Source& source) const {
 
   return offset;
 }
-}  // namespace YAML
+}
 
 #endif  // REGEXIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/scanner.cpp

@@ -9,18 +9,12 @@
 namespace YAML {
 Scanner::Scanner(std::istream& in)
     : INPUT(in),
-      m_tokens{},
       m_startedStream(false),
       m_endedStream(false),
       m_simpleKeyAllowed(false),
-      m_scalarValueAllowed(false),
+      m_canBeJSONFlow(false) {}
-      m_canBeJSONFlow(false),
-      m_simpleKeys{},
-      m_indents{},
-      m_indentRefs{},
-      m_flows{} {}
 
-Scanner::~Scanner() = default;
+Scanner::~Scanner() {}
 
 bool Scanner::empty() {
   EnsureTokensInQueue();
@@ -52,7 +46,7 @@ Token& Scanner::peek() {
 Mark Scanner::mark() const { return INPUT.mark(); }
 
 void Scanner::EnsureTokensInQueue() {
-  while (true) {
+  while (1) {
     if (!m_tokens.empty()) {
       Token& token = m_tokens.front();
 
@@ -89,7 +83,7 @@ void Scanner::ScanNextToken() {
     return StartStream();
   }
 
-  // get rid of whitespace, etc. (in between tokens it should be irrelevant)
+  // get rid of whitespace, etc. (in between tokens it should be irrelevent)
   ScanToNextToken();
 
   // maybe need to end some blocks
@@ -128,17 +122,6 @@ void Scanner::ScanNextToken() {
   }
 
   if (INPUT.peek() == Keys::FlowEntry) {
-    // values starting with `,` are not allowed.
-    // eg: reject `,foo`
-    if (INPUT.column() == 0) {
-      throw ParserException(INPUT.mark(), ErrorMsg::UNEXPECTED_FLOW);
-    }
-    // if we already parsed a quoted scalar value and we are not in a flow,
-    // then `,` is not a valid character.
-    // eg: reject `"foo",`
-    if (!m_scalarValueAllowed) {
-      throw ParserException(INPUT.mark(), ErrorMsg::UNEXPECTED_SCALAR);
-    }
     return ScanFlowEntry();
   }
 
@@ -171,13 +154,6 @@ void Scanner::ScanNextToken() {
     return ScanBlockScalar();
   }
 
-  // if we already parsed a quoted scalar value in this line,
-  // another scalar value is an error.
-  // eg: reject `"foo" "bar"`
-  if (!m_scalarValueAllowed) {
-    throw ParserException(INPUT.mark(), ErrorMsg::UNEXPECTED_SCALAR);
-  }
-
   if (INPUT.peek() == '\'' || INPUT.peek() == '\"') {
     return ScanQuotedScalar();
   }
@@ -193,7 +169,7 @@ void Scanner::ScanNextToken() {
 }
 
 void Scanner::ScanToNextToken() {
-  while (true) {
+  while (1) {
     // first eat whitespace
     while (INPUT && IsWhitespaceToBeEaten(INPUT.peek())) {
       if (InBlockContext() && Exp::Tab().Matches(INPUT)) {
@@ -222,9 +198,6 @@ void Scanner::ScanToNextToken() {
     // oh yeah, and let's get rid of that simple key
     InvalidateSimpleKey();
 
-    // new line - we accept a scalar value now
-    m_scalarValueAllowed = true;
-
     // new line - we may be able to accept a simple key now
     if (InBlockContext()) {
       m_simpleKeyAllowed = true;
@@ -267,7 +240,6 @@ const RegEx& Scanner::GetValueRegex() const {
 void Scanner::StartStream() {
   m_startedStream = true;
   m_simpleKeyAllowed = true;
-  m_scalarValueAllowed = true;
   std::unique_ptr<IndentMarker> pIndent(
       new IndentMarker(-1, IndentMarker::NONE));
   m_indentRefs.push_back(std::move(pIndent));
@@ -284,7 +256,6 @@ void Scanner::EndStream() {
   PopAllSimpleKeys();
 
   m_simpleKeyAllowed = false;
-  m_scalarValueAllowed = false;
   m_endedStream = true;
 }
 
@@ -311,7 +282,7 @@ Scanner::IndentMarker* Scanner::PushIndentTo(int column,
                                              IndentMarker::INDENT_TYPE type) {
   // are we in flow?
   if (InFlowContext()) {
-    return nullptr;
+    return 0;
   }
 
   std::unique_ptr<IndentMarker> pIndent(new IndentMarker(column, type));
@@ -320,12 +291,12 @@ Scanner::IndentMarker* Scanner::PushIndentTo(int column,
 
   // is this actually an indentation?
   if (indent.column < lastIndent.column) {
-    return nullptr;
+    return 0;
   }
   if (indent.column == lastIndent.column &&
       !(indent.type == IndentMarker::SEQ &&
         lastIndent.type == IndentMarker::MAP)) {
-    return nullptr;
+    return 0;
   }
 
   // push a start token

src/scanner.h

@@ -9,7 +9,9 @@
 
 #include <cstddef>
 #include <ios>
+#include <map>
 #include <queue>
+#include <set>
 #include <stack>
 #include <string>
 
@@ -47,7 +49,7 @@ class Scanner {
     enum INDENT_TYPE { MAP, SEQ, NONE };
     enum STATUS { VALID, INVALID, UNKNOWN };
     IndentMarker(int column_, INDENT_TYPE type_)
-        : column(column_), type(type_), status(VALID), pStartToken(nullptr) {}
+        : column(column_), type(type_), status(VALID), pStartToken(0) {}
 
     int column;
     INDENT_TYPE type;
@@ -177,7 +179,6 @@ class Scanner {
   // state info
   bool m_startedStream, m_endedStream;
   bool m_simpleKeyAllowed;
-  bool m_scalarValueAllowed;
   bool m_canBeJSONFlow;
   std::stack<SimpleKey> m_simpleKeys;
   std::stack<IndentMarker *> m_indents;

src/scanscalar.cpp

@@ -47,8 +47,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) {
       if (INPUT.column() == 0 && Exp::DocIndicator().Matches(INPUT)) {
         if (params.onDocIndicator == BREAK) {
           break;
-        }
+        } else if (params.onDocIndicator == THROW) {
-        if (params.onDocIndicator == THROW) {
           throw ParserException(INPUT.mark(), ErrorMsg::DOC_IN_SCALAR);
         }
       }
@@ -184,7 +183,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) {
         case FOLD_FLOW:
           if (nextEmptyLine) {
             scalar += "\n";
-          } else if (!emptyLine && !escapedNewline) {
+          } else if (!emptyLine && !nextEmptyLine && !escapedNewline) {
             scalar += " ";
           }
           break;
@@ -204,7 +203,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) {
 
   // post-processing
   if (params.trimTrailingSpaces) {
-    std::size_t pos = scalar.find_last_not_of(" \t");
+    std::size_t pos = scalar.find_last_not_of(' ');
     if (lastEscapedChar != std::string::npos) {
       if (pos < lastEscapedChar || pos == std::string::npos) {
         pos = lastEscapedChar;
@@ -248,4 +247,4 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) {
 
   return scalar;
 }
-}  // namespace YAML
+}

src/scanscalar.h

@@ -57,7 +57,7 @@ struct ScanScalarParams {
   bool leadingSpaces;
 };
 
-std::string ScanScalar(Stream& INPUT, ScanScalarParams& params);
+std::string ScanScalar(Stream& INPUT, ScanScalarParams& info);
 }
 
 #endif  // SCANSCALAR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/scantag.cpp

@@ -78,4 +78,4 @@ const std::string ScanTagSuffix(Stream& INPUT) {
 
   return tag;
 }
-}  // namespace YAML
+}

src/scantoken.cpp

@@ -37,7 +37,7 @@ void Scanner::ScanDirective() {
     token.value += INPUT.get();
 
   // read parameters
-  while (true) {
+  while (1) {
     // first get rid of whitespace
     while (Exp::Blank().Matches(INPUT))
       INPUT.eat(1);
@@ -171,7 +171,7 @@ void Scanner::ScanBlockEntry() {
 
 // Key
 void Scanner::ScanKey() {
-  // handle keys differently in the block context (and manage indents)
+  // handle keys diffently in the block context (and manage indents)
   if (InBlockContext()) {
     if (!m_simpleKeyAllowed)
       throw ParserException(INPUT.mark(), ErrorMsg::MAP_KEY);
@@ -199,7 +199,7 @@ void Scanner::ScanValue() {
     // seems fine)
     m_simpleKeyAllowed = false;
   } else {
-    // handle values differently in the block context (and manage indents)
+    // handle values diffently in the block context (and manage indents)
     if (InBlockContext()) {
       if (!m_simpleKeyAllowed)
         throw ParserException(INPUT.mark(), ErrorMsg::MAP_VALUE);
@@ -211,9 +211,6 @@ void Scanner::ScanValue() {
     m_simpleKeyAllowed = InBlockContext();
   }
 
-  // we are parsing a `key: value` pair; scalars are always allowed
-  m_scalarValueAllowed = true;
-
   // eat
   Mark mark = INPUT.mark();
   INPUT.eat(1);
@@ -341,7 +338,7 @@ void Scanner::ScanQuotedScalar() {
 
   // setup the scanning parameters
   ScanScalarParams params;
-  RegEx end = (single ? RegEx(quote) & !Exp::EscSingleQuote() : RegEx(quote));
+  RegEx end = (single ? RegEx(quote) && !Exp::EscSingleQuote() : RegEx(quote));
   params.end = &end;
   params.eatEnd = true;
   params.escape = (single ? '\'' : '\\');
@@ -363,10 +360,6 @@ void Scanner::ScanQuotedScalar() {
   // and scan
   scalar = ScanScalar(INPUT, params);
   m_simpleKeyAllowed = false;
-  // we just scanned a quoted scalar;
-  // we can only have another scalar in this line
-  // if we are in a flow, eg: `[ "foo", "bar" ]` is ok, but `"foo", "bar"` isn't.
-  m_scalarValueAllowed = InFlowContext();
   m_canBeJSONFlow = true;
 
   Token token(Token::NON_PLAIN_SCALAR, mark);
@@ -441,4 +434,4 @@ void Scanner::ScanBlockScalar() {
   token.value = scalar;
   m_tokens.push(token);
 }
-}  // namespace YAML
+}