Merge with bugfix

This commit is contained in:
ado 2023-07-31 21:52:08 +02:00
parent fbe19de70c
commit 5f46259914
2 changed files with 2 additions and 4 deletions

View File

@ -656,7 +656,7 @@ private:
if constexpr (quoted_multiline_enabled) { if constexpr (quoted_multiline_enabled) {
while (unterminated_quote()) { while (unterminated_quote()) {
size -= next_line_converter_.size_shifted(); next_line_size_ -= next_line_converter_.size_shifted();
if (multiline_limit_reached(limit)) { if (multiline_limit_reached(limit)) {
return; return;

View File

@ -593,9 +593,7 @@ TEST_CASE("parser test various cases version 2") {
using escape = ss::escape<'\\'>; using escape = ss::escape<'\\'>;
using multiline = ss::multiline; using multiline = ss::multiline;
// TODO uncomment #ifdef CMAKE_GITHUB_CI
// #ifdef CMAKE_GITHUB_CI
#if 0
using multiline_r = ss::multiline_restricted<10>; using multiline_r = ss::multiline_restricted<10>;
test_combinations_with_trim_and_error_options<>(); test_combinations_with_trim_and_error_options<>();