Merge cad14a5926 into 190ad502b5

include/yaml-cpp/emitter.h

@@ -44,7 +44,7 @@ class YAML_CPP_API Emitter {
 
   // state checking
   bool good() const;
-  const std::string GetLastError() const;
+  std::string GetLastError() const;
 
   // global setters
   bool SetOutputCharset(EMITTER_MANIP value);
@@ -126,7 +126,6 @@ class YAML_CPP_API Emitter {
 
   const char* ComputeFullBoolName(bool b) const;
   const char* ComputeNullName() const;
-  bool CanEmitNewline() const;
 
  private:
   std::unique_ptr<EmitterState> m_pState;

src/directives.cpp

@@ -3,8 +3,7 @@
 namespace YAML {
 Directives::Directives() : version{true, 1, 2}, tags{} {}
 
-const std::string Directives::TranslateTagHandle(
+std::string Directives::TranslateTagHandle(const std::string& handle) const {
-    const std::string& handle) const {
   auto it = tags.find(handle);
   if (it == tags.end()) {
     if (handle == "!!")

src/directives.h

@@ -19,7 +19,7 @@ struct Version {
 struct Directives {
   Directives();
 
-  const std::string TranslateTagHandle(const std::string& handle) const;
+  std::string TranslateTagHandle(const std::string& handle) const;
 
   Version version;
   std::map<std::string, std::string> tags;

src/emitter.cpp

@@ -25,9 +25,7 @@ std::size_t Emitter::size() const { return m_stream.pos(); }
 // state checking
 bool Emitter::good() const { return m_pState->good(); }
 
-const std::string Emitter::GetLastError() const {
+std::string Emitter::GetLastError() const { return m_pState->GetLastError(); }
-  return m_pState->GetLastError();
-}
 
 // global setters
 bool Emitter::SetOutputCharset(EMITTER_MANIP value) {
@@ -271,8 +269,6 @@ void Emitter::EmitNewline() {
   m_pState->SetNonContent();
 }
 
-bool Emitter::CanEmitNewline() const { return true; }
-
 // Put the stream in a state so we can simply write the next node
 // E.g., if we're in a sequence, write the "- "
 void Emitter::PrepareNode(EmitterNodeType::value child) {

src/scanner.cpp

@@ -7,6 +7,19 @@
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 
 namespace YAML {
+namespace {
+// IsWhitespaceToBeEaten
+// . We can eat whitespace if it's a space or tab
+// . Note: originally tabs in block context couldn't be eaten
+//         "where a simple key could be allowed
+//         (i.e., not at the beginning of a line, or following '-', '?', or
+// ':')"
+//   I think this is wrong, since tabs can be non-content whitespace; it's just
+//   that they can't contribute to indentation, so once you've seen a tab in a
+//   line, you can't start a simple key
+bool IsWhitespaceToBeEaten(char ch) { return (ch == ' ') || (ch == '\t'); }
+}  // namespace
+
 Scanner::Scanner(std::istream& in)
     : INPUT(in),
       m_tokens{},
@@ -213,27 +226,6 @@ void Scanner::ScanToNextToken() {
 ///////////////////////////////////////////////////////////////////////
 // Misc. helpers
 
-// IsWhitespaceToBeEaten
-// . We can eat whitespace if it's a space or tab
-// . Note: originally tabs in block context couldn't be eaten
-//         "where a simple key could be allowed
-//         (i.e., not at the beginning of a line, or following '-', '?', or
-// ':')"
-//   I think this is wrong, since tabs can be non-content whitespace; it's just
-//   that they can't contribute to indentation, so once you've seen a tab in a
-//   line, you can't start a simple key
-bool Scanner::IsWhitespaceToBeEaten(char ch) {
-  if (ch == ' ') {
-    return true;
-  }
-
-  if (ch == '\t') {
-    return true;
-  }
-
-  return false;
-}
-
 const RegEx& Scanner::GetValueRegex() const {
   if (InBlockContext()) {
     return Exp::Value();
@@ -269,7 +261,7 @@ Token* Scanner::PushToken(Token::TYPE type) {
   return &m_tokens.back();
 }
 
-Token::TYPE Scanner::GetStartTokenFor(IndentMarker::INDENT_TYPE type) const {
+Token::TYPE Scanner::GetStartTokenFor(IndentMarker::INDENT_TYPE type) {
   switch (type) {
     case IndentMarker::SEQ:
       return Token::BLOCK_SEQ_START;

src/scanner.h

@@ -88,7 +88,7 @@ class Scanner {
   bool InBlockContext() const { return m_flows.empty(); }
   std::size_t GetFlowLevel() const { return m_flows.size(); }
 
-  Token::TYPE GetStartTokenFor(IndentMarker::INDENT_TYPE type) const;
+  static Token::TYPE GetStartTokenFor(IndentMarker::INDENT_TYPE type);
 
   /**
    * Pushes an indentation onto the stack, and enqueues the proper token
@@ -129,8 +129,6 @@ class Scanner {
    */
   void ThrowParserException(const std::string &msg) const;
 
-  bool IsWhitespaceToBeEaten(char ch);
-
   /**
    * Returns the appropriate regex to check if the next token is a value token.
    */

src/scantag.cpp

@@ -6,7 +6,7 @@
 #include "yaml-cpp/mark.h"
 
 namespace YAML {
-const std::string ScanVerbatimTag(Stream& INPUT) {
+std::string ScanVerbatimTag(Stream& INPUT) {
   std::string tag;
 
   // eat the start character
@@ -29,7 +29,7 @@ const std::string ScanVerbatimTag(Stream& INPUT) {
   throw ParserException(INPUT.mark(), ErrorMsg::END_OF_VERBATIM_TAG);
 }
 
-const std::string ScanTagHandle(Stream& INPUT, bool& canBeHandle) {
+std::string ScanTagHandle(Stream& INPUT, bool& canBeHandle) {
   std::string tag;
   canBeHandle = true;
   Mark firstNonWordChar;
@@ -62,7 +62,7 @@ const std::string ScanTagHandle(Stream& INPUT, bool& canBeHandle) {
   return tag;
 }
 
-const std::string ScanTagSuffix(Stream& INPUT) {
+std::string ScanTagSuffix(Stream& INPUT) {
   std::string tag;
 
   while (INPUT) {

src/scantag.h

@@ -11,9 +11,9 @@
 #include "stream.h"
 
 namespace YAML {
-const std::string ScanVerbatimTag(Stream& INPUT);
+std::string ScanVerbatimTag(Stream& INPUT);
-const std::string ScanTagHandle(Stream& INPUT, bool& canBeHandle);
+std::string ScanTagHandle(Stream& INPUT, bool& canBeHandle);
-const std::string ScanTagSuffix(Stream& INPUT);
+std::string ScanTagSuffix(Stream& INPUT);
 }
 
 #endif  // SCANTAG_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/singledocparser.cpp

@@ -94,8 +94,8 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
   if (tag.empty())
     tag = (token.type == Token::NON_PLAIN_SCALAR ? "!" : "?");
 
-  if (token.type == Token::PLAIN_SCALAR 
+  if (token.type == Token::PLAIN_SCALAR && tag == "?" &&
-      && tag.compare("?") == 0 && IsNullString(token.value)) {
+      IsNullString(token.value)) {
     eventHandler.OnNull(mark, anchor);
     m_scanner.pop();
     return;

src/tag.cpp

@@ -29,7 +29,7 @@ Tag::Tag(const Token& token)
   }
 }
 
-const std::string Tag::Translate(const Directives& directives) {
+std::string Tag::Translate(const Directives& directives) const {
   switch (type) {
     case VERBATIM:
       return value;

src/tag.h

@@ -23,7 +23,7 @@ struct Tag {
   };
 
   Tag(const Token& token);
-  const std::string Translate(const Directives& directives);
+  std::string Translate(const Directives& directives) const;
 
   TYPE type;
   std::string handle, value;