luo980/yaml-cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang-tidy] convert member functions to static

Browse Source 
Found with readability-convert-member-functions-to-static

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-06-15 15:22:00 -07:00
parent 1863090b55
commit ab05c7c338
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/yaml-cpp/emitter.h
View File

@ -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;

2
src/emitter.cpp
View File

@ -269,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) {

36
src/scanner.cpp
View File

@ -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;

4
src/scanner.h
View File

@ -90,7 +90,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
@ -131,8 +131,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.
*/