diff --git a/Makefile b/Makefile
index b2e9b581..fd73a338 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
##########################################################################
# directory to recent compiler binaries
-COMPILER_DIR=/Users/niels/Documents/projects/compilers/local/bin
+COMPILER_DIR=/usr/local/opt/llvm/bin
# find GNU sed to use `-i` parameter
SED:=$(shell command -v gsed || which sed)
@@ -30,7 +30,6 @@ AMALGAMATED_FILE=single_include/nlohmann/json.hpp
all:
@echo "amalgamate - amalgamate file single_include/nlohmann/json.hpp from the include/nlohmann sources"
@echo "ChangeLog.md - generate ChangeLog file"
- @echo "check - compile and execute test suite"
@echo "check-amalgamation - check whether sources have been amalgamated"
@echo "clean - remove built files"
@echo "coverage - create coverage information with lcov"
@@ -44,26 +43,12 @@ all:
@echo "fuzz_testing_cbor - prepare fuzz testing of the CBOR parser"
@echo "fuzz_testing_msgpack - prepare fuzz testing of the MessagePack parser"
@echo "fuzz_testing_ubjson - prepare fuzz testing of the UBJSON parser"
- @echo "json_unit - create single-file test executable"
@echo "pedantic_clang - run Clang with maximal warning flags"
@echo "pedantic_gcc - run GCC with maximal warning flags"
@echo "pretty - beautify code with Artistic Style"
@echo "run_benchmarks - build and run benchmarks"
-##########################################################################
-# unit tests
-##########################################################################
-
-# build unit tests
-json_unit:
- @$(MAKE) json_unit -C test
-
-# run unit tests
-check:
- $(MAKE) check -C test
-
-
##########################################################################
# coverage
##########################################################################
@@ -484,13 +469,13 @@ cpplint:
# call Clang-Tidy
clang_tidy:
- $(COMPILER_DIR)/clang-tidy $(AMALGAMATED_FILE) -- -Iinclude -std=c++11
+ $(COMPILER_DIR)/clang-tidy $(SRCS) -- -Iinclude -std=c++11
# call PVS-Studio Analyzer
pvs_studio:
rm -fr pvs_studio_build
mkdir pvs_studio_build
- cd pvs_studio_build ; cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=On
+ cd pvs_studio_build ; cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DJSON_MultipleHeaders=ON
cd pvs_studio_build ; pvs-studio-analyzer analyze -j 10
cd pvs_studio_build ; plog-converter -a'GA:1,2;64:1;CS' -t fullhtml PVS-Studio.log -o pvs
open pvs_studio_build/pvs/index.html
@@ -499,7 +484,7 @@ pvs_studio:
infer:
rm -fr infer_build
mkdir infer_build
- cd infer_build ; infer compile -- cmake .. ; infer run -- make -j 4
+ cd infer_build ; infer compile -- cmake .. -DJSON_MultipleHeaders=ON ; infer run -- make -j 4
# call OCLint static analyzer
oclint:
@@ -577,12 +562,12 @@ check-single-includes:
# check if all flags of our CMake files work
check_cmake_flags_do:
$(CMAKE_BINARY) --version
- for flag in '' JSON_BuildTests JSON_Install JSON_MultipleHeaders JSON_Sanitizer JSON_Valgrind JSON_NoExceptions JSON_Coverage; do \
+ for flag in JSON_BuildTests JSON_Install JSON_MultipleHeaders JSON_Sanitizer JSON_Valgrind JSON_NoExceptions JSON_Coverage; do \
rm -fr cmake_build; \
mkdir cmake_build; \
- echo "$(CMAKE_BINARY) .. -D$$flag=On" ; \
+ echo "\n\n$(CMAKE_BINARY) .. -D$$flag=On\n" ; \
cd cmake_build ; \
- CXX=g++-8 $(CMAKE_BINARY) .. -D$$flag=On -DCMAKE_CXX_COMPILE_FEATURES="cxx_std_11;cxx_range_for" -DCMAKE_CXX_FLAGS="-std=gnu++11" ; \
+ $(CMAKE_BINARY) -Werror=dev .. -D$$flag=On -DCMAKE_CXX_COMPILE_FEATURES="cxx_std_11;cxx_range_for" -DCMAKE_CXX_FLAGS="-std=gnu++11" ; \
test -f Makefile || exit 1 ; \
cd .. ; \
done;
@@ -642,7 +627,6 @@ clean:
rm -fr cmake-3.1.0-Darwin64.tar.gz cmake-3.1.0-Darwin64
rm -fr build_coverage build_benchmarks fuzz-testing clang_analyze_build pvs_studio_build infer_build clang_sanitize_build cmake_build
$(MAKE) clean -Cdoc
- $(MAKE) clean -Ctest
##########################################################################
# Thirdparty code
diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp
index 05493531..63921ca5 100644
--- a/include/nlohmann/detail/input/input_adapters.hpp
+++ b/include/nlohmann/detail/input/input_adapters.hpp
@@ -36,7 +36,7 @@ class file_input_adapter
using char_type = char;
JSON_HEDLEY_NON_NULL(2)
- explicit file_input_adapter(std::FILE* f) noexcept
+ explicit file_input_adapter(std::FILE* f) noexcept
: m_file(f)
{}
@@ -90,7 +90,7 @@ class input_stream_adapter
input_stream_adapter& operator=(input_stream_adapter&) = delete;
input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
- input_stream_adapter(input_stream_adapter&& rhs) : is(rhs.is), sb(rhs.sb)
+ input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
{
rhs.is = nullptr;
rhs.sb = nullptr;
diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp
index d1443d6a..ae6a6cbe 100644
--- a/include/nlohmann/detail/input/json_sax.hpp
+++ b/include/nlohmann/detail/input/json_sax.hpp
@@ -258,30 +258,14 @@ class json_sax_dom_parser
return true;
}
+ template
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
- const detail::exception& ex)
+ const Exception& ex)
{
errored = true;
if (allow_exceptions)
{
- // determine the proper exception type from the id
- switch ((ex.id / 100) % 100)
- {
- case 1:
- JSON_THROW(*dynamic_cast(&ex));
- case 4:
- JSON_THROW(*dynamic_cast(&ex));
- // LCOV_EXCL_START
- case 2:
- JSON_THROW(*dynamic_cast(&ex));
- case 3:
- JSON_THROW(*dynamic_cast(&ex));
- case 5:
- JSON_THROW(*dynamic_cast(&ex));
- default:
- JSON_ASSERT(false);
- // LCOV_EXCL_STOP
- }
+ JSON_THROW(ex);
}
return false;
}
@@ -512,30 +496,14 @@ class json_sax_dom_callback_parser
return true;
}
+ template
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
- const detail::exception& ex)
+ const Exception& ex)
{
errored = true;
if (allow_exceptions)
{
- // determine the proper exception type from the id
- switch ((ex.id / 100) % 100)
- {
- case 1:
- JSON_THROW(*dynamic_cast(&ex));
- case 4:
- JSON_THROW(*dynamic_cast(&ex));
- // LCOV_EXCL_START
- case 2:
- JSON_THROW(*dynamic_cast(&ex));
- case 3:
- JSON_THROW(*dynamic_cast(&ex));
- case 5:
- JSON_THROW(*dynamic_cast(&ex));
- default:
- JSON_ASSERT(false);
- // LCOV_EXCL_STOP
- }
+ JSON_THROW(ex);
}
return false;
}
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp
index f055584f..60eb3526 100644
--- a/include/nlohmann/detail/input/lexer.hpp
+++ b/include/nlohmann/detail/input/lexer.hpp
@@ -1521,7 +1521,6 @@ scan_number_done:
// skip following whitespace
skip_whitespace();
}
- while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
switch (current)
{
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 5d774466..cf41f741 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -4619,7 +4619,7 @@ class file_input_adapter
using char_type = char;
JSON_HEDLEY_NON_NULL(2)
- explicit file_input_adapter(std::FILE* f) noexcept
+ explicit file_input_adapter(std::FILE* f) noexcept
: m_file(f)
{}
@@ -4673,7 +4673,7 @@ class input_stream_adapter
input_stream_adapter& operator=(input_stream_adapter&) = delete;
input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
- input_stream_adapter(input_stream_adapter&& rhs) : is(rhs.is), sb(rhs.sb)
+ input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
{
rhs.is = nullptr;
rhs.sb = nullptr;
@@ -5299,30 +5299,14 @@ class json_sax_dom_parser
return true;
}
+ template
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
- const detail::exception& ex)
+ const Exception& ex)
{
errored = true;
if (allow_exceptions)
{
- // determine the proper exception type from the id
- switch ((ex.id / 100) % 100)
- {
- case 1:
- JSON_THROW(*dynamic_cast(&ex));
- case 4:
- JSON_THROW(*dynamic_cast(&ex));
- // LCOV_EXCL_START
- case 2:
- JSON_THROW(*dynamic_cast(&ex));
- case 3:
- JSON_THROW(*dynamic_cast(&ex));
- case 5:
- JSON_THROW(*dynamic_cast(&ex));
- default:
- JSON_ASSERT(false);
- // LCOV_EXCL_STOP
- }
+ JSON_THROW(ex);
}
return false;
}
@@ -5553,30 +5537,14 @@ class json_sax_dom_callback_parser
return true;
}
+ template
bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
- const detail::exception& ex)
+ const Exception& ex)
{
errored = true;
if (allow_exceptions)
{
- // determine the proper exception type from the id
- switch ((ex.id / 100) % 100)
- {
- case 1:
- JSON_THROW(*dynamic_cast(&ex));
- case 4:
- JSON_THROW(*dynamic_cast(&ex));
- // LCOV_EXCL_START
- case 2:
- JSON_THROW(*dynamic_cast(&ex));
- case 3:
- JSON_THROW(*dynamic_cast(&ex));
- case 5:
- JSON_THROW(*dynamic_cast(&ex));
- default:
- JSON_ASSERT(false);
- // LCOV_EXCL_STOP
- }
+ JSON_THROW(ex);
}
return false;
}
@@ -9823,7 +9791,6 @@ scan_number_done:
// skip following whitespace
skip_whitespace();
}
- while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
switch (current)
{
diff --git a/test/Makefile b/test/Makefile
index b01fa872..2d08a8f7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,99 +1,13 @@
-##########################################################################
-# unit tests
-##########################################################################
+##############################################################################
+# OSS-Fuzz
+##############################################################################
+
+# The following targets realize the integration to OSS-Fuzz.
+# See for more information.
# additional flags
-CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Wcast-align -Wcast-qual -Wno-ctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wno-float-equal
-CPPFLAGS += -I ../single_include -I . -I thirdparty/doctest -I thirdparty/fifo_map -DDOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-SOURCES = src/unit.cpp \
- src/unit-algorithms.cpp \
- src/unit-allocator.cpp \
- src/unit-alt-string.cpp \
- src/unit-assert_macro.cpp \
- src/unit-bson.cpp \
- src/unit-capacity.cpp \
- src/unit-cbor.cpp \
- src/unit-class_const_iterator.cpp \
- src/unit-class_iterator.cpp \
- src/unit-class_lexer.cpp \
- src/unit-class_parser.cpp \
- src/unit-comparison.cpp \
- src/unit-concepts.cpp \
- src/unit-constructor1.cpp \
- src/unit-constructor2.cpp \
- src/unit-convenience.cpp \
- src/unit-conversions.cpp \
- src/unit-deserialization.cpp \
- src/unit-element_access1.cpp \
- src/unit-element_access2.cpp \
- src/unit-inspection.cpp \
- src/unit-items.cpp \
- src/unit-iterators1.cpp \
- src/unit-iterators2.cpp \
- src/unit-merge_patch.cpp \
- src/unit-json_patch.cpp \
- src/unit-json_pointer.cpp \
- src/unit-meta.cpp \
- src/unit-modifiers.cpp \
- src/unit-msgpack.cpp \
- src/unit-pointer_access.cpp \
- src/unit-readme.cpp \
- src/unit-reference_access.cpp \
- src/unit-regression.cpp \
- src/unit-serialization.cpp \
- src/unit-testsuites.cpp \
- src/unit-ubjson.cpp \
- src/unit-unicode.cpp \
- src/unit-user_defined_input.cpp \
- src/unit-wstring.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-TESTCASES = $(patsubst src/unit-%.cpp,test-%,$(wildcard src/unit-*.cpp))
-
-##############################################################################
-# main rules
-##############################################################################
-
-all: $(TESTCASES)
-
-clean:
- rm -fr json_unit $(OBJECTS) $(SOURCES:.cpp=.gcno) $(SOURCES:.cpp=.gcda) $(TESTCASES) $(FUZZERS) test_data.hpp
-
-test_data.hpp:
- @echo "#define TEST_DATA_DIRECTORY" > $@
-
-##############################################################################
-# single test file
-##############################################################################
-
-json_unit: $(OBJECTS) ../single_include/nlohmann/json.hpp thirdparty/doctest/doctest.h
- @echo "[CXXLD] $@"
- @$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
-
-%.o: %.cpp ../single_include/nlohmann/json.hpp thirdparty/doctest/doctest.h test_data.hpp
- @echo "[CXX] $@"
- @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
-
-
-##############################################################################
-# individual test cases
-##############################################################################
-
-test-%: src/unit-%.o src/unit.o ../single_include/nlohmann/json.hpp thirdparty/doctest/doctest.h test_data.hpp
- @echo "[CXXLD] $@"
- @$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $< src/unit.o -o $@
-
-TEST_PATTERN ?= "*"
-TEST_PREFIX = ""
-check: $(OBJECTS) $(TESTCASES)
- @cd .. ; for testcase in $(TESTCASES); do echo "Executing $$testcase..."; $(TEST_PREFIX)test/$$testcase $(TEST_PATTERN) || exit 1; done
-
-
-##############################################################################
-# fuzzer
-##############################################################################
+CXXFLAGS += -std=c++11
+CPPFLAGS += -I ../single_include
FUZZER_ENGINE = src/fuzzer-driver_afl.cpp
FUZZERS = parse_afl_fuzzer parse_bson_fuzzer parse_cbor_fuzzer parse_msgpack_fuzzer parse_ubjson_fuzzer