Skip to content

Commit

Permalink
modified the way of incrementing iterators
Browse files Browse the repository at this point in the history
  • Loading branch information
@fktn-k
fktn-k committed Feb 1, 2025
1 parent dcdf050 commit 4aac7ed
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 68 deletions.
51 changes: 17 additions & 34 deletions include/fkYAML/detail/input/input_adapter.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,38 +103,28 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
if FK_YAML_UNLIKELY (first == 0x0D /*CR*/) {
cr_itrs.emplace_back(current);
}
++current;
break;
case 2: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second});
}
break;
}
case 3: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third});
}
break;
}
case 4: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto fourth = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const auto fourth = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third, fourth);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third, fourth});
Expand All @@ -144,6 +134,8 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
default: // LCOV_EXCL_LINE
unreachable(); // LCOV_EXCL_LINE
}

++current;
}

const bool is_contiguous_no_cr = cr_itrs.empty() && m_is_contiguous;
Expand Down Expand Up @@ -192,8 +184,7 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
while (current != m_end || encoded_buf_size != 0) {
while (current != m_end && encoded_buf_size < 2) {
auto utf16 = static_cast<char16_t>(static_cast<uint8_t>(*current) << shift_bits[0]);
++current;
utf16 |= static_cast<char16_t>(static_cast<uint8_t>(*current) << shift_bits[1]);
utf16 |= static_cast<char16_t>(static_cast<uint8_t>(*++current) << shift_bits[1]);
++current;

// skip appending CRs.
Expand Down Expand Up @@ -325,38 +316,28 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
if FK_YAML_UNLIKELY (first == 0x0D /*CR*/) {
cr_itrs.emplace_back(current);
}
++current;
break;
case 2: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second});
}
break;
}
case 3: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third});
}
break;
}
case 4: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto fourth = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const auto fourth = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third, fourth);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third, fourth});
Expand All @@ -366,6 +347,8 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
default: // LCOV_EXCL_LINE
unreachable(); // LCOV_EXCL_LINE
}

++current;
}

m_buffer.reserve(std::distance(m_begin, m_end) - cr_itrs.size());
Expand Down
51 changes: 17 additions & 34 deletions single_include/fkYAML/node.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8976,38 +8976,28 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
if FK_YAML_UNLIKELY (first == 0x0D /*CR*/) {
cr_itrs.emplace_back(current);
}
++current;
break;
case 2: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second});
}
break;
}
case 3: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third});
}
break;
}
case 4: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto fourth = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const auto fourth = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third, fourth);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third, fourth});
Expand All @@ -9017,6 +9007,8 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
default: // LCOV_EXCL_LINE
unreachable(); // LCOV_EXCL_LINE
}

++current;
}

const bool is_contiguous_no_cr = cr_itrs.empty() && m_is_contiguous;
Expand Down Expand Up @@ -9065,8 +9057,7 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
while (current != m_end || encoded_buf_size != 0) {
while (current != m_end && encoded_buf_size < 2) {
auto utf16 = static_cast<char16_t>(static_cast<uint8_t>(*current) << shift_bits[0]);
++current;
utf16 |= static_cast<char16_t>(static_cast<uint8_t>(*current) << shift_bits[1]);
utf16 |= static_cast<char16_t>(static_cast<uint8_t>(*++current) << shift_bits[1]);
++current;

// skip appending CRs.
Expand Down Expand Up @@ -9198,38 +9189,28 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
if FK_YAML_UNLIKELY (first == 0x0D /*CR*/) {
cr_itrs.emplace_back(current);
}
++current;
break;
case 2: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second});
}
break;
}
case 3: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third});
}
break;
}
case 4: {
++current;
const auto second = static_cast<uint8_t>(*current);
++current;
const auto third = static_cast<uint8_t>(*current);
++current;
const auto fourth = static_cast<uint8_t>(*current);
++current;
const auto second = static_cast<uint8_t>(*++current);
const auto third = static_cast<uint8_t>(*++current);
const auto fourth = static_cast<uint8_t>(*++current);
const bool is_valid = utf8::validate(first, second, third, fourth);
if FK_YAML_UNLIKELY (!is_valid) {
throw fkyaml::invalid_encoding("Invalid UTF-8 encoding.", {first, second, third, fourth});
Expand All @@ -9239,6 +9220,8 @@ class iterator_input_adapter<IterType, enable_if_t<is_iterator_of<IterType, char
default: // LCOV_EXCL_LINE
unreachable(); // LCOV_EXCL_LINE
}

++current;
}

m_buffer.reserve(std::distance(m_begin, m_end) - cr_itrs.size());
Expand Down

0 comments on commit 4aac7ed

Please sign in to comment.