Skip to content

Commit

Permalink
Upgrade JSON Toolkit to 9685d29e2e633d71319c64b1ab2fbceab865dbf3
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Cruz Viotti <[email protected]>
  • Loading branch information
jviotti committed Oct 15, 2024
1 parent 8876f1c commit cdb819a
Show file tree
Hide file tree
Showing 58 changed files with 327 additions and 8,862 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
CXX: ${{ matrix.platform.cxx }}
steps:
- name: Install ClangFormat
run: pip install clang-format==19.1.0
run: pipx install clang-format==19.1.0

- uses: actions/checkout@v4
- name: Install dependencies (macOS)
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
noa https://github.com/sourcemeta/noa 517e88aef5981b88ac6bb8caff15d17dffcb4320
jsontoolkit https://github.com/sourcemeta/jsontoolkit 9abbaee71e9e00e95632858d29c7ebe5c2a723b0
jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3
googletest https://github.com/google/googletest a7f443b80b105f940225332ed3c31f2790092f47
12 changes: 6 additions & 6 deletions src/engine/rule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ auto sourcemeta::alterschema::Rule::apply(
"Could not determine the schema dialect");
}

const auto vocabularies{vocabularies_to_set(
sourcemeta::jsontoolkit::vocabularies(schema, resolver, default_dialect)
.get())};
const auto vocabularies{
vocabularies_to_set(sourcemeta::jsontoolkit::vocabularies(
schema, resolver, default_dialect))};
if (!this->condition(schema, dialect.value(), vocabularies, pointer)) {
return {};
}
Expand Down Expand Up @@ -83,8 +83,8 @@ auto sourcemeta::alterschema::Rule::check(
"Could not determine the schema dialect");
}

const auto vocabularies{vocabularies_to_set(
sourcemeta::jsontoolkit::vocabularies(schema, resolver, default_dialect)
.get())};
const auto vocabularies{
vocabularies_to_set(sourcemeta::jsontoolkit::vocabularies(
schema, resolver, default_dialect))};
return this->condition(schema, dialect.value(), vocabularies, pointer);
}
22 changes: 5 additions & 17 deletions vendor/jsontoolkit/CMakeLists.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 62 additions & 6 deletions vendor/jsontoolkit/cmake/FindUriParser.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/jsontoolkit/config.cmake.in

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions vendor/jsontoolkit/src/evaluator/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit cdb819a

Please sign in to comment.