External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge f8ff3ac8e4 into e0e01d53c2

Browse Source
This commit is contained in:
Ryan 2019-08-05 18:29:08 +00:00 committed by GitHub
commit 429205a487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/yaml-cpp/emittermanip.h
View File

@ -113,11 +113,13 @@ inline _Tag SecondaryTag(const std::string content) {
} }
struct _Comment { struct _Comment {
_Comment(const std::string& content_) : content(content_) {} _Comment(const std::string& content_, int col = -1) : content(content_), indent_col(col), indent_to(col > 0) {}
std::string content; std::string content;
size_t indent_col;
bool indent_to;
}; };
inline _Comment Comment(const std::string content) { return _Comment(content); } inline _Comment Comment(const std::string content, int col = -1) { return _Comment(content, col); }
struct _Precision { struct _Precision {
_Precision(int floatPrecision_, int doublePrecision_) _Precision(int floatPrecision_, int doublePrecision_)

5
src/emitter.cpp
View File

@ -872,7 +872,12 @@ Emitter& Emitter::Write(const _Comment& comment) {
PrepareNode(EmitterNodeType::NoType); PrepareNode(EmitterNodeType::NoType);
if (m_stream.col() > 0) if (m_stream.col() > 0)
{
if(comment.indent_to && comment.indent_col > m_stream.col())
m_stream << IndentTo(comment.indent_col);
else
m_stream << Indentation(m_pState->GetPreCommentIndent()); m_stream << Indentation(m_pState->GetPreCommentIndent());
}
Utils::WriteComment(m_stream, comment.content, Utils::WriteComment(m_stream, comment.content,
m_pState->GetPostCommentIndent()); m_pState->GetPostCommentIndent());