Merge pull request nlohmann#12 from nlohmann/develop

Sync Fork from Upstream Repo

.gitignore

@@ -26,3 +26,9 @@ cmake-build-debug
 
 test/test-*
 /.vs
+
+doc/mkdocs/venv/
+doc/mkdocs/docs/images
+doc/mkdocs/docs/examples
+doc/mkdocs/site
+doc/mkdocs/docs/__pycache__/

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
 ## PROJECT
 ## name and version
 ##
-project(nlohmann_json VERSION 3.7.3 LANGUAGES CXX)
+project(nlohmann_json VERSION 3.8.0 LANGUAGES CXX)
 
 ##
 ## INCLUDE

Makefile

@@ -361,7 +361,7 @@ pedantic_gcc:
 		-Wunused-const-variable=2                         \
 		-Wunused-function                                 \
 		-Wunused-label                                    \
-		-Wunused-local-typedefs                           \
+		-Wno-unused-local-typedefs                           \
 		-Wunused-macros                                   \
 		-Wunused-parameter                                \
 		-Wunused-result                                   \

doc/Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "JSON for Modern C++"
-PROJECT_NUMBER         = 3.7.3
+PROJECT_NUMBER         = 3.8.0
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = .
@@ -110,9 +110,7 @@ WARN_LOGFILE           =
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../single_include/nlohmann/json.hpp \
-                         index.md \
-                         faq.md \
-                         binary_formats.md
+                         index.md
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO

doc/examples/README.link

@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/uDkr2VTjsrssiXq3"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/EezQxM0Nzi8tTUEe"><b>online</b></a>

doc/examples/accept__string.cpp

@@ -0,0 +1,26 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // a valid JSON text
+    auto valid_text = R"(
+    {
+        "numbers": [1, 2, 3]
+    }
+    )";
+
+    // an invalid JSON text
+    auto invalid_text = R"(
+    {
+        "strings": ["extra", "comma", ]
+    }
+    )";
+
+    std::cout << std::boolalpha
+              << json::accept(valid_text) << ' '
+              << json::accept(invalid_text) << '\n';
+}

doc/examples/accept__string.link

@@ -0,0 +1 @@
+<a target="_blank" href="https://wandbox.org/permlink/r5Tai1spihWHTdFA"><b>online</b></a>

doc/examples/accept__string.output

@@ -0,0 +1 @@
+true false

doc/examples/meta.output

@@ -10,8 +10,8 @@
     "url": "https://github.com/nlohmann/json",
     "version": {
         "major": 3,
-        "minor": 7,
-        "patch": 3,
-        "string": "3.7.3"
+        "minor": 8,
+        "patch": 0,
+        "string": "3.8.0"
     }
 }

doc/examples/swap__binary_t.link

@@ -0,0 +1 @@
+<a target="_blank" href="https://wandbox.org/permlink/OD1Yaew9vlzMYxmX"><b>online</b></a>

doc/index.md

@@ -332,4 +332,4 @@ Note that this table only lists those exceptions thrown due to the type. For ins
 @author [Niels Lohmann](http://nlohmann.me)
 @see https://github.com/nlohmann/json to download the source code
 
-@version 3.7.3
+@version 3.8.0

doc/mkdocs/Makefile

@@ -0,0 +1,31 @@
+# serve the site locally
+serve: prepare_files
+	venv/bin/mkdocs serve
+
+# create files that are not versioned inside the mkdocs folder
+prepare_files: clean
+	# build Doxygen
+	$(MAKE) -C ..
+	# create subfolders
+	mkdir docs/images docs/examples
+	# copy images
+	cp -vr ../json.gif ../images/range-begin-end.svg ../images/range-rbegin-rend.svg docs/images
+	# copy examples
+	cp -vr ../examples/*.cpp ../examples/*.output docs/examples
+
+# clean subfolders
+clean:
+	rm -fr docs/images docs/examples
+
+# publish site to GitHub pages
+publish: prepare_files
+	venv/bin/mkdocs gh-deploy --clean --force
+
+# install a Python virtual environment
+install_venv: requirements.txt
+	python3 -mvenv venv
+	venv/bin/pip install -r requirements.txt
+
+# uninstall the virtual environment
+uninstall_venv: clean
+	rm -fr venv