Skip to content

Isolated jkeiser fix for issue 1632: make it so that INCORRECT_TYPE is a recoverable condition in On Demand #1663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lemire merged 18 commits into from
Jul 23, 2021
Merged

Isolated jkeiser fix for issue 1632: make it so that INCORRECT_TYPE is a recoverable condition in On Demand #1663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4b118bd
Verifying issue.
lemire Jul 18, 2021
267e70d
Adding another case.
lemire Jul 18, 2021
3300d84
Adding type test.
lemire Jul 19, 2021
3c5c2d2
This backports (isolate) a fix by jkeiser of issue 1632.
lemire Jul 19, 2021
f364e35
Minor fixes.
lemire Jul 19, 2021
e8e731a
Merge branch 'master' into dlemire/backport_jkeiser_fix_for_issue1632
lemire Jul 19, 2021
a349969
Adding a duplicate of the existing test.
lemire Jul 19, 2021
8b2bff9
Messy temporary work.
lemire Jul 19, 2021
df24da3
Cleaning.
lemire Jul 19, 2021
4501aeb
Disabling a couple of asserts.
lemire Jul 19, 2021
2e688a2
Removing two other asserts.
lemire Jul 19, 2021
9cace04
Adding more tests.
lemire Jul 19, 2021
d0e2a7f
Minor fixes
lemire Jul 19, 2021
c3f7eff
Adding some commentary
lemire Jul 19, 2021
24068a0
Merge branch 'master' into dlemire/backport_jkeiser_fix_for_issue1632
lemire Jul 22, 2021
f2d419d
Basic guarding.
lemire Jul 22, 2021
1fe50cb
Trimming.
lemire Jul 22, 2021
d7770e9
Disabling 'json[N-1]' test.
lemire Jul 22, 2021
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
Prev Previous commit
Next Next commit
Trimming.
  • Loading branch information
@lemire
lemire committed Jul 22, 2021
commit 1fe50cb777f6dc9eaf56aae74070062afcd89447
14 changes: 0 additions & 14 deletions include/simdjson/generic/ondemand/json_iterator-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,20 +327,6 @@ simdjson_warn_unused simdjson_really_inline bool json_iterator::copy_to_buffer(c
return true;
}

template<int N>
simdjson_warn_unused simdjson_really_inline bool json_iterator::peek_to_buffer(uint8_t (&tmpbuf)[N]) noexcept {
auto max_len = token.peek_length();
auto json = token.peek();
return copy_to_buffer(json, max_len, tmpbuf);
}

template<int N>
simdjson_warn_unused simdjson_really_inline bool json_iterator::advance_to_buffer(uint8_t (&tmpbuf)[N]) noexcept {
auto max_len = peek_length();
auto json = return_current_and_advance();
return copy_to_buffer(json, max_len, tmpbuf);
}

} // namespace ondemand
} // namespace SIMDJSON_IMPLEMENTATION
} // namespace simdjson
Expand Down
2 changes: 0 additions & 2 deletions include/simdjson/generic/ondemand/json_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ class json_iterator {
simdjson_really_inline error_code optional_error(error_code error, const char *message) noexcept;

template<int N> simdjson_warn_unused simdjson_really_inline bool copy_to_buffer(const uint8_t *json, uint32_t max_len, uint8_t (&tmpbuf)[N]) noexcept;
template<int N> simdjson_warn_unused simdjson_really_inline bool peek_to_buffer(uint8_t (&tmpbuf)[N]) noexcept;
template<int N> simdjson_warn_unused simdjson_really_inline bool advance_to_buffer(uint8_t (&tmpbuf)[N]) noexcept;

simdjson_really_inline token_position position() const noexcept;
simdjson_really_inline void reenter_child(token_position position, depth_t child_depth) noexcept;
Expand Down