Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ if(NOT PHASAR_IN_TREE)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.17.0
GIT_TAG v1.18.0
)
FetchContent_MakeAvailable(googletest)
endif()
Expand Down
2 changes: 1 addition & 1 deletion external/CRoaring
Submodule CRoaring updated 115 files
2 changes: 1 addition & 1 deletion external/json
Submodule json updated 1610 files
2 changes: 1 addition & 1 deletion external/json-schema-validator
Submodule json-schema-validator updated 68 files
+1 −0 .distro/.fmf/version
+61 −0 .distro/json-schema-validator.spec
+12 −0 .distro/plans/import.fmf
+10 −0 .distro/plans/main.fmf.dist-git
+7 −0 .distro/plans/smoke.fmf
+15 −0 .distro/tests/import/FetchContent/CMakeLists.txt
+11 −0 .distro/tests/import/find_package/CMakeLists.txt
+11 −0 .distro/tests/import/main.fmf
+4 −0 .distro/tests/import/test_FetchContent.sh
+4 −0 .distro/tests/import/test_find_package.sh
+9 −0 .distro/tests/smoke.fmf
+18 −4 .github/workflows/release.yaml
+100 −10 .github/workflows/test.yaml
+68 −0 .packit.yaml
+5 −4 .pre-commit-config.yaml
+26 −7 CMakeLists.txt
+32 −0 ChangeLog.md
+61 −27 README.md
+33 −23 conanfile.py
+1 −5 example/CMakeLists.txt
+15 −22 src/CMakeLists.txt
+3 −2 src/json-patch.hpp
+1 −1 src/json-schema-draft7.json.cpp
+45 −0 src/json-uri.cpp
+98 −52 src/json-validator.cpp
+1 −1 src/nlohmann/json-schema.hpp
+7 −5 src/smtp-address-validator.cpp
+3 −3 src/string-format-check.cpp
+18 −2 test/CMakeLists.txt
+3 −3 test/JSON-Schema-Test-Suite/json-schema-test.cpp
+321 −0 test/issue-105-verbose-combination-errors.cpp
+10 −0 test/issue-156/CMakeLists.txt
+1 −0 test/issue-156/instance-invalid.json
+1 −0 test/issue-156/instance.json
+6 −0 test/issue-156/schemas/common.json
+12 −0 test/issue-156/schemas/root.json
+6 −0 test/issue-156/schemas/v1/v1.json
+6 −0 test/issue-156/schemas/v2/v2.json
+21 −0 test/issue-168/CMakeLists.txt
+1 −0 test/issue-168/instance-invalid.json
+1 −0 test/issue-168/instance-stored-first-invalid.json
+1 −0 test/issue-168/instance-stored-first.json
+1 −0 test/issue-168/instance.json
+10 −0 test/issue-168/schema-stored-first.json
+15 −0 test/issue-168/schema.json
+1 −1 test/issue-189-default-values.cpp
+1 −1 test/issue-229-oneof-default-values.cpp
+1 −0 test/issue-243-root-default-values.cpp
+19 −0 test/issue-252/CMakeLists.txt
+7 −0 test/issue-252/defs.json
+1 −0 test/issue-252/instance-invalid.json
+1 −0 test/issue-252/instance.json
+10 −0 test/issue-252/schema.json.in
+41 −0 test/issue-255-error-message-limit-precision.cpp
+3 −0 test/issue-311/CMakeLists.txt
+4 −0 test/issue-311/instance.json
+26 −0 test/issue-311/schema.json
+12 −0 test/issue-336/CMakeLists.txt
+1 −0 test/issue-336/instance-invalid.json
+1 −0 test/issue-336/instance.json
+30 −0 test/issue-336/schema.json
+3 −1 test/issue-93/issue-93.cpp
+47 −0 test/issue-null-values-in-object.cpp
+10 −1 test/json-schema-validate.cpp
+7 −0 test/string-format-check-test.cpp
+20 −0 test/test-pipe-in.cmake
+0 −13 test/test-pipe-in.sh
+28 −2 test/uri.cpp
1 change: 1 addition & 0 deletions lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include <chrono>
#include <cstdlib>
#include <memory>
#include <numeric>
#include <utility>

namespace psr {
Expand Down
24 changes: 9 additions & 15 deletions lib/Utils/NlohmannLogging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,19 @@ class LLVMOutputStreamAdapter
llvm::raw_ostream &OS;
};

template <typename StringType = std::basic_string<char>>
class LLVMOutputAdapter {
public:
template <typename AllocatorType = std::allocator<char>>

LLVMOutputAdapter(llvm::raw_ostream &OS)
: OA(std::make_unique<LLVMOutputStreamAdapter>(OS)) {}

operator nlohmann::detail::output_adapter_t<char>() { return OA; }

private:
nlohmann::detail::output_adapter_t<char> OA = nullptr;
};
} // namespace

llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const nlohmann::json &J) {
// do the actual serialization
nlohmann::detail::serializer<nlohmann::json> S{LLVMOutputAdapter(OS), ' '};
S.dump(J, true, false, 4);
LLVMOutputStreamAdapter Adapter(OS);
nlohmann::detail::serializer<nlohmann::json> S{
Adapter,
/*ichar=*/' ',
/*pretty_print_=*/true,
/*ensure_ascii_=*/false,
/*indent_step_=*/4,
};
S.dump(J);
return OS;
}

Expand Down
Loading