peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the None enumeration vaules to NoType to avoid a collision with X11's macro

Browse Source
This commit is contained in:
Jesse Beder
2015-01-24 15:58:14 -06:00
parent 2b2e607118
commit 087e0673f3
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/emitterdef.h
View File

@@ -9,7 +9,7 @@
namespace YAML { namespace YAML {
struct EmitterNodeType { struct EmitterNodeType {
enum value { None, Property, Scalar, FlowSeq, BlockSeq, FlowMap, BlockMap }; enum value { NoType, Property, Scalar, FlowSeq, BlockSeq, FlowMap, BlockMap };
}; };
} }

4
src/collectionstack.h
View File

@@ -12,14 +12,14 @@
namespace YAML { namespace YAML {
struct CollectionType { struct CollectionType {
enum value { None, BlockMap, BlockSeq, FlowMap, FlowSeq, CompactMap }; enum value { NoCollection, BlockMap, BlockSeq, FlowMap, FlowSeq, CompactMap };
}; };
class CollectionStack { class CollectionStack {
public: public:
CollectionType::value GetCurCollectionType() const { CollectionType::value GetCurCollectionType() const {
if (collectionStack.empty()) if (collectionStack.empty())
return CollectionType::None; return CollectionType::NoCollection;
return collectionStack.top(); return collectionStack.top();
} }

44
src/emitter.cpp
View File

@@ -146,7 +146,7 @@ void Emitter::EmitBeginDoc() {
if (!good()) if (!good())
return; return;
if (m_pState->CurGroupType() != GroupType::None) { if (m_pState->CurGroupType() != GroupType::NoType) {
m_pState->SetError("Unexpected begin document"); m_pState->SetError("Unexpected begin document");
return; return;
} }
@@ -168,7 +168,7 @@ void Emitter::EmitEndDoc() {
if (!good()) if (!good())
return; return;
if (m_pState->CurGroupType() != GroupType::None) { if (m_pState->CurGroupType() != GroupType::NoType) {
m_pState->SetError("Unexpected begin document"); m_pState->SetError("Unexpected begin document");
return; return;
} }
@@ -248,7 +248,7 @@ void Emitter::EmitNewline() {
if (!good()) if (!good())
return; return;
PrepareNode(EmitterNodeType::None); PrepareNode(EmitterNodeType::NoType);
m_stream << "\n"; m_stream << "\n";
m_pState->SetNonContent(); m_pState->SetNonContent();
} }
@@ -259,7 +259,7 @@ bool Emitter::CanEmitNewline() const { return true; }
// E.g., if we're in a sequence, write the "- " // E.g., if we're in a sequence, write the "- "
void Emitter::PrepareNode(EmitterNodeType::value child) { void Emitter::PrepareNode(EmitterNodeType::value child) {
switch (m_pState->CurGroupNodeType()) { switch (m_pState->CurGroupNodeType()) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
PrepareTopNode(child); PrepareTopNode(child);
break; break;
case EmitterNodeType::FlowSeq: case EmitterNodeType::FlowSeq:
@@ -282,16 +282,16 @@ void Emitter::PrepareNode(EmitterNodeType::value child) {
} }
void Emitter::PrepareTopNode(EmitterNodeType::value child) { void Emitter::PrepareTopNode(EmitterNodeType::value child) {
if (child == EmitterNodeType::None) if (child == EmitterNodeType::NoType)
return; return;
if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0) { if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0) {
if (child != EmitterNodeType::None) if (child != EmitterNodeType::NoType)
EmitBeginDoc(); EmitBeginDoc();
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -323,7 +323,7 @@ void Emitter::FlowSeqPrepareNode(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -344,7 +344,7 @@ void Emitter::BlockSeqPrepareNode(EmitterNodeType::value child) {
const std::size_t curIndent = m_pState->CurIndent(); const std::size_t curIndent = m_pState->CurIndent();
const std::size_t nextIndent = curIndent + m_pState->CurGroupIndent(); const std::size_t nextIndent = curIndent + m_pState->CurGroupIndent();
if (child == EmitterNodeType::None) if (child == EmitterNodeType::NoType)
return; return;
if (!m_pState->HasBegunContent()) { if (!m_pState->HasBegunContent()) {
@@ -356,7 +356,7 @@ void Emitter::BlockSeqPrepareNode(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -405,7 +405,7 @@ void Emitter::FlowMapPrepareLongKey(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -433,7 +433,7 @@ void Emitter::FlowMapPrepareLongKeyValue(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -464,7 +464,7 @@ void Emitter::FlowMapPrepareSimpleKey(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -492,7 +492,7 @@ void Emitter::FlowMapPrepareSimpleKeyValue(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -533,7 +533,7 @@ void Emitter::BlockMapPrepareLongKey(EmitterNodeType::value child) {
const std::size_t curIndent = m_pState->CurIndent(); const std::size_t curIndent = m_pState->CurIndent();
const std::size_t childCount = m_pState->CurGroupChildCount(); const std::size_t childCount = m_pState->CurGroupChildCount();
if (child == EmitterNodeType::None) if (child == EmitterNodeType::NoType)
return; return;
if (!m_pState->HasBegunContent()) { if (!m_pState->HasBegunContent()) {
@@ -548,7 +548,7 @@ void Emitter::BlockMapPrepareLongKey(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -565,7 +565,7 @@ void Emitter::BlockMapPrepareLongKey(EmitterNodeType::value child) {
void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child) { void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child) {
const std::size_t curIndent = m_pState->CurIndent(); const std::size_t curIndent = m_pState->CurIndent();
if (child == EmitterNodeType::None) if (child == EmitterNodeType::NoType)
return; return;
if (!m_pState->HasBegunContent()) { if (!m_pState->HasBegunContent()) {
@@ -575,7 +575,7 @@ void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -592,7 +592,7 @@ void Emitter::BlockMapPrepareSimpleKey(EmitterNodeType::value child) {
const std::size_t curIndent = m_pState->CurIndent(); const std::size_t curIndent = m_pState->CurIndent();
const std::size_t childCount = m_pState->CurGroupChildCount(); const std::size_t childCount = m_pState->CurGroupChildCount();
if (child == EmitterNodeType::None) if (child == EmitterNodeType::NoType)
return; return;
if (!m_pState->HasBegunNode()) { if (!m_pState->HasBegunNode()) {
@@ -602,7 +602,7 @@ void Emitter::BlockMapPrepareSimpleKey(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -625,7 +625,7 @@ void Emitter::BlockMapPrepareSimpleKeyValue(EmitterNodeType::value child) {
} }
switch (child) { switch (child) {
case EmitterNodeType::None: case EmitterNodeType::NoType:
break; break;
case EmitterNodeType::Property: case EmitterNodeType::Property:
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
@@ -871,7 +871,7 @@ Emitter& Emitter::Write(const _Comment& comment) {
if (!good()) if (!good())
return *this; return *this;
PrepareNode(EmitterNodeType::None); PrepareNode(EmitterNodeType::NoType);
if (m_stream.col() > 0) if (m_stream.col() > 0)
m_stream << Indentation(m_pState->GetPreCommentIndent()); m_stream << Indentation(m_pState->GetPreCommentIndent());

8
src/emitterstate.cpp
View File

@@ -98,7 +98,7 @@ EmitterNodeType::value EmitterState::NextGroupType(
// can't happen // can't happen
assert(false); assert(false);
return EmitterNodeType::None; return EmitterNodeType::NoType;
} }
void EmitterState::StartedDoc() { void EmitterState::StartedDoc() {
@@ -168,17 +168,17 @@ void EmitterState::EndedGroup(GroupType::value type) {
EmitterNodeType::value EmitterState::CurGroupNodeType() const { EmitterNodeType::value EmitterState::CurGroupNodeType() const {
if (m_groups.empty()) if (m_groups.empty())
return EmitterNodeType::None; return EmitterNodeType::NoType;
return m_groups.top().NodeType(); return m_groups.top().NodeType();
} }
GroupType::value EmitterState::CurGroupType() const { GroupType::value EmitterState::CurGroupType() const {
return m_groups.empty() ? GroupType::None : m_groups.top().type; return m_groups.empty() ? GroupType::NoType : m_groups.top().type;
} }
FlowType::value EmitterState::CurGroupFlowType() const { FlowType::value EmitterState::CurGroupFlowType() const {
return m_groups.empty() ? FlowType::None : m_groups.top().flowType; return m_groups.empty() ? FlowType::NoType : m_groups.top().flowType;
} }
int EmitterState::CurGroupIndent() const { int EmitterState::CurGroupIndent() const {

6
src/emitterstate.h
View File

@@ -22,10 +22,10 @@ struct FmtScope {
enum value { Local, Global }; enum value { Local, Global };
}; };
struct GroupType { struct GroupType {
enum value { None, Seq, Map }; enum value { NoType, Seq, Map };
}; };
struct FlowType { struct FlowType {
enum value { None, Flow, Block }; enum value { NoType, Flow, Block };
}; };
class EmitterState { class EmitterState {
@@ -170,7 +170,7 @@ class EmitterState {
// can't get here // can't get here
assert(false); assert(false);
return EmitterNodeType::None; return EmitterNodeType::NoType;
} }
}; };