diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-07-08 15:54:05 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-07-08 15:54:05 +0000 |
| commit | fc7be18c76af2e700641f3598c4856baeef1428e (patch) | |
| tree | 11dbca45eb321c3a4dd08b12152acc6ef5dd3fa9 /contrib/libs/yaml-cpp/src/scanscalar.cpp | |
| parent | ec0e7ed6da6fb317741fd8468602949a1362eca5 (diff) | |
| parent | c92cb9d3a19331916f0c274d80e67f02a62caa9b (diff) | |
| download | ydb-fc7be18c76af2e700641f3598c4856baeef1428e.tar.gz | |
Merge branch 'rightlib' into mergelibs-240708-1553
Diffstat (limited to 'contrib/libs/yaml-cpp/src/scanscalar.cpp')
| -rw-r--r-- | contrib/libs/yaml-cpp/src/scanscalar.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/libs/yaml-cpp/src/scanscalar.cpp b/contrib/libs/yaml-cpp/src/scanscalar.cpp index 10e359d446..be57b1cd5d 100644 --- a/contrib/libs/yaml-cpp/src/scanscalar.cpp +++ b/contrib/libs/yaml-cpp/src/scanscalar.cpp @@ -47,7 +47,8 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) { if (INPUT.column() == 0 && Exp::DocIndicator().Matches(INPUT)) { if (params.onDocIndicator == BREAK) { break; - } else if (params.onDocIndicator == THROW) { + } + if (params.onDocIndicator == THROW) { throw ParserException(INPUT.mark(), ErrorMsg::DOC_IN_SCALAR); } } @@ -183,7 +184,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) { case FOLD_FLOW: if (nextEmptyLine) { scalar += "\n"; - } else if (!emptyLine && !nextEmptyLine && !escapedNewline) { + } else if (!emptyLine && !escapedNewline) { scalar += " "; } break; @@ -203,7 +204,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) { // post-processing if (params.trimTrailingSpaces) { - std::size_t pos = scalar.find_last_not_of(' '); + std::size_t pos = scalar.find_last_not_of(" \t"); if (lastEscapedChar != std::string::npos) { if (pos < lastEscapedChar || pos == std::string::npos) { pos = lastEscapedChar; @@ -247,4 +248,4 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) { return scalar; } -} +} // namespace YAML |