This commit is contained in:
Jesse Beder
2014-03-22 22:46:04 -05:00
parent 0fbeac8f4f
commit 5fd25df859
35 changed files with 198 additions and 112 deletions

View File

@@ -7,9 +7,15 @@
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/eventhandler.h"
#include <stack> #include <stack>
#include "yaml-cpp/anchor.h"
#include "yaml-cpp/eventhandler.h"
namespace YAML {
struct Mark;
} // namespace YAML
namespace YAML { namespace YAML {
class Emitter; class Emitter;

View File

@@ -7,16 +7,22 @@
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include <memory>
#include <sstream>
#include <string>
#include "yaml-cpp/binary.h" #include "yaml-cpp/binary.h"
#include "yaml-cpp/dll.h"
#include "yaml-cpp/emitterdef.h" #include "yaml-cpp/emitterdef.h"
#include "yaml-cpp/emittermanip.h" #include "yaml-cpp/emittermanip.h"
#include "yaml-cpp/noncopyable.h" #include "yaml-cpp/noncopyable.h"
#include "yaml-cpp/null.h" #include "yaml-cpp/null.h"
#include "yaml-cpp/ostream_wrapper.h" #include "yaml-cpp/ostream_wrapper.h"
#include <memory>
#include <string> namespace YAML {
#include <sstream> class Binary;
struct _Null;
} // namespace YAML
namespace YAML { namespace YAML {
class EmitterState; class EmitterState;

View File

@@ -7,18 +7,19 @@
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h"
#include "yaml-cpp/noncopyable.h"
#include <ios> #include <ios>
#include <memory> #include <memory>
#include "yaml-cpp/dll.h"
#include "yaml-cpp/noncopyable.h"
namespace YAML { namespace YAML {
struct Directives;
struct Mark;
struct Token;
class EventHandler; class EventHandler;
class Node; class Node;
class Scanner; class Scanner;
struct Directives;
struct Mark;
struct Token;
class YAML_CPP_API Parser : private noncopyable { class YAML_CPP_API Parser : private noncopyable {
public: public:

View File

@@ -1,8 +1,10 @@
#include "yaml-cpp/parser.h"
#include "yaml-cpp/contrib/graphbuilder.h"
#include "graphbuilderadapter.h" #include "graphbuilderadapter.h"
#include "yaml-cpp/parser.h" // IWYU pragma: keep
namespace YAML { namespace YAML {
class GraphBuilderInterface;
void* BuildGraphOfNextDocument(Parser& parser, void* BuildGraphOfNextDocument(Parser& parser,
GraphBuilderInterface& graphBuilder) { GraphBuilderInterface& graphBuilder) {
GraphBuilderAdapter eventHandler(graphBuilder); GraphBuilderAdapter eventHandler(graphBuilder);

View File

@@ -1,6 +1,9 @@
#include "graphbuilderadapter.h" #include "graphbuilderadapter.h"
#include "yaml-cpp/contrib/graphbuilder.h"
namespace YAML { namespace YAML {
struct Mark;
int GraphBuilderAdapter::ContainerFrame::sequenceMarker; int GraphBuilderAdapter::ContainerFrame::sequenceMarker;
void GraphBuilderAdapter::OnNull(const Mark &mark, anchor_t anchor) { void GraphBuilderAdapter::OnNull(const Mark &mark, anchor_t anchor) {

View File

@@ -10,9 +10,16 @@
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <stack> #include <stack>
#include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/anchor.h"
#include "yaml-cpp/contrib/anchordict.h" #include "yaml-cpp/contrib/anchordict.h"
#include "yaml-cpp/contrib/graphbuilder.h" #include "yaml-cpp/contrib/graphbuilder.h"
#include "yaml-cpp/eventhandler.h"
namespace YAML {
class GraphBuilderInterface;
struct Mark;
} // namespace YAML
namespace YAML { namespace YAML {
class GraphBuilderAdapter : public EventHandler { class GraphBuilderAdapter : public EventHandler {

View File

@@ -1,9 +1,15 @@
#include "yaml-cpp/emitfromevents.h"
#include "yaml-cpp/emitter.h"
#include "yaml-cpp/null.h"
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
#include "yaml-cpp/emitfromevents.h"
#include "yaml-cpp/emitter.h"
#include "yaml-cpp/emittermanip.h"
#include "yaml-cpp/null.h"
namespace YAML {
struct Mark;
} // namespace YAML
namespace { namespace {
std::string ToString(YAML::anchor_t anchor) { std::string ToString(YAML::anchor_t anchor) {
std::stringstream stream; std::stringstream stream;

View File

@@ -1,11 +1,16 @@
#include "yaml-cpp/emitter.h"
#include "emitterstate.h"
#include "emitterutils.h"
#include "indentation.h"
#include "yaml-cpp/exceptions.h"
#include <sstream> #include <sstream>
#include "emitterutils.h"
#include "indentation.h" // IWYU pragma: keep
#include "yaml-cpp/emitter.h"
#include "yaml-cpp/emitterdef.h"
#include "yaml-cpp/emittermanip.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
namespace YAML { namespace YAML {
class Binary;
struct _Null;
Emitter::Emitter() : m_pState(new EmitterState) {} Emitter::Emitter() : m_pState(new EmitterState) {}
Emitter::Emitter(std::ostream& stream) Emitter::Emitter(std::ostream& stream)

View File

@@ -1,7 +1,8 @@
#include "emitterstate.h"
#include "yaml-cpp/exceptions.h"
#include <limits> #include <limits>
#include "emitterstate.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
namespace YAML { namespace YAML {
EmitterState::EmitterState() EmitterState::EmitterState()
: m_isGood(true), : m_isGood(true),

View File

@@ -1,11 +1,14 @@
#include <iomanip>
#include <sstream>
#include "emitterutils.h" #include "emitterutils.h"
#include "exp.h" #include "exp.h"
#include "indentation.h" #include "indentation.h"
#include "yaml-cpp/binary.h" #include "regex_yaml.h"
#include "yaml-cpp/exceptions.h" #include "regeximpl.h"
#include "stringsource.h" #include "stringsource.h"
#include <sstream> #include "yaml-cpp/binary.h" // IWYU pragma: keep
#include <iomanip> #include "yaml-cpp/ostream_wrapper.h"
namespace YAML { namespace YAML {
namespace Utils { namespace Utils {

View File

@@ -7,10 +7,16 @@
#pragma once #pragma once
#endif #endif
#include "emitterstate.h"
#include "yaml-cpp/ostream_wrapper.h"
#include <string> #include <string>
#include "emitterstate.h"
#include "yaml-cpp/emittermanip.h"
#include "yaml-cpp/ostream_wrapper.h"
namespace YAML {
class ostream_wrapper;
} // namespace YAML
namespace YAML { namespace YAML {
class Binary; class Binary;

View File

@@ -1,7 +1,13 @@
#include "exp.h"
#include "yaml-cpp/exceptions.h"
#include <sstream> #include <sstream>
#include "exp.h"
#include "stream.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
namespace YAML {
struct Mark;
} // namespace YAML
namespace YAML { namespace YAML {
namespace Exp { namespace Exp {
unsigned ParseHex(const std::string& str, const Mark& mark) { unsigned ParseHex(const std::string& str, const Mark& mark) {

View File

@@ -7,9 +7,10 @@
#pragma once #pragma once
#endif #endif
#include "regex_yaml.h"
#include <string>
#include <ios> #include <ios>
#include <string>
#include "regex_yaml.h"
#include "stream.h" #include "stream.h"
namespace YAML { namespace YAML {

View File

@@ -1,15 +1,16 @@
#include "yaml-cpp/parser.h"
#include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/exceptions.h"
#include "directives.h"
#include "scanner.h"
#include "singledocparser.h"
#include "tag.h"
#include "token.h"
#include <sstream>
#include <cstdio> #include <cstdio>
#include <sstream>
#include "directives.h" // IWYU pragma: keep
#include "scanner.h" // IWYU pragma: keep
#include "singledocparser.h"
#include "token.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
#include "yaml-cpp/parser.h"
namespace YAML { namespace YAML {
class EventHandler;
Parser::Parser() {} Parser::Parser() {}
Parser::Parser(std::istream& in) { Load(in); } Parser::Parser(std::istream& in) { Load(in); }

View File

@@ -7,8 +7,8 @@
#pragma once #pragma once
#endif #endif
#include <vector>
#include <string> #include <string>
#include <vector>
namespace YAML { namespace YAML {
class Stream; class Stream;

View File

@@ -1,10 +1,11 @@
#include "scanner.h"
#include "token.h"
#include "yaml-cpp/exceptions.h"
#include "exp.h"
#include <cassert> #include <cassert>
#include <memory> #include <memory>
#include "exp.h"
#include "scanner.h"
#include "token.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
namespace YAML { namespace YAML {
Scanner::Scanner(std::istream& in) Scanner::Scanner(std::istream& in)
: INPUT(in), : INPUT(in),

View File

@@ -8,14 +8,16 @@
#endif #endif
#include <ios> #include <ios>
#include <string>
#include <queue>
#include <stack>
#include <set>
#include <map> #include <map>
#include <queue>
#include <set>
#include <stack>
#include <string>
#include "ptr_vector.h" #include "ptr_vector.h"
#include "stream.h" #include "stream.h"
#include "token.h" #include "token.h"
#include "yaml-cpp/mark.h"
namespace YAML { namespace YAML {
class Node; class Node;

View File

@@ -1,8 +1,8 @@
#include "scanscalar.h"
#include "scanner.h"
#include "exp.h" #include "exp.h"
#include "yaml-cpp/exceptions.h" #include "regeximpl.h"
#include "token.h" #include "scanscalar.h"
#include "stream.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
namespace YAML { namespace YAML {
// ScanScalar // ScanScalar

View File

@@ -8,6 +8,7 @@
#endif #endif
#include <string> #include <string>
#include "regex_yaml.h" #include "regex_yaml.h"
#include "stream.h" #include "stream.h"

View File

@@ -1,7 +1,9 @@
#include "scanner.h"
#include "regex_yaml.h"
#include "exp.h" #include "exp.h"
#include "yaml-cpp/exceptions.h" #include "regex_yaml.h"
#include "regeximpl.h"
#include "stream.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
#include "yaml-cpp/mark.h"
namespace YAML { namespace YAML {
const std::string ScanVerbatimTag(Stream& INPUT) { const std::string ScanVerbatimTag(Stream& INPUT) {

View File

@@ -1,12 +1,16 @@
#include "scanner.h"
#include "token.h"
#include "yaml-cpp/exceptions.h"
#include "exp.h"
#include "scanscalar.h"
#include "scantag.h"
#include "tag.h"
#include <sstream> #include <sstream>
#include "exp.h"
#include "regex_yaml.h"
#include "regeximpl.h"
#include "scanner.h"
#include "scanscalar.h"
#include "scantag.h" // IWYU pragma: keep
#include "tag.h" // IWYU pragma: keep
#include "token.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep
#include "yaml-cpp/mark.h"
namespace YAML { namespace YAML {
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// Specialization for scanning specific tokens // Specialization for scanning specific tokens

View File

@@ -1,9 +1,9 @@
#include "scanner.h" #include "scanner.h"
#include "token.h" #include "token.h"
#include "yaml-cpp/exceptions.h"
#include "exp.h"
namespace YAML { namespace YAML {
struct Mark;
Scanner::SimpleKey::SimpleKey(const Mark& mark_, int flowLevel_) Scanner::SimpleKey::SimpleKey(const Mark& mark_, int flowLevel_)
: mark(mark_), flowLevel(flowLevel_), pIndent(0), pMapStart(0), pKey(0) {} : mark(mark_), flowLevel(flowLevel_), pIndent(0), pMapStart(0), pKey(0) {}

View File

@@ -1,14 +1,15 @@
#include "singledocparser.h" #include <algorithm>
#include "collectionstack.h" #include <cstdio>
#include "directives.h" #include <sstream>
#include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/exceptions.h" #include "collectionstack.h" // IWYU pragma: keep
#include "scanner.h" #include "scanner.h"
#include "singledocparser.h"
#include "tag.h" #include "tag.h"
#include "token.h" #include "token.h"
#include <sstream> #include "yaml-cpp/eventhandler.h"
#include <cstdio> #include "yaml-cpp/exceptions.h" // IWYU pragma: keep
#include <algorithm> #include "yaml-cpp/mark.h"
namespace YAML { namespace YAML {
SingleDocParser::SingleDocParser(Scanner& scanner, const Directives& directives) SingleDocParser::SingleDocParser(Scanner& scanner, const Directives& directives)

View File

@@ -7,20 +7,21 @@
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/anchor.h"
#include "yaml-cpp/noncopyable.h"
#include <string>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string>
#include "yaml-cpp/anchor.h"
#include "yaml-cpp/noncopyable.h"
namespace YAML { namespace YAML {
struct Directives;
struct Mark;
struct Token;
class CollectionStack; class CollectionStack;
class EventHandler; class EventHandler;
class Node; class Node;
class Scanner; class Scanner;
struct Directives;
struct Mark;
struct Token;
class SingleDocParser : private noncopyable { class SingleDocParser : private noncopyable {
public: public:

View File

@@ -1,6 +1,6 @@
#include "stream.h"
#include <iostream> #include <iostream>
#include "exp.h"
#include "stream.h"
#ifndef YAML_PREFETCH_SIZE #ifndef YAML_PREFETCH_SIZE
#define YAML_PREFETCH_SIZE 2048 #define YAML_PREFETCH_SIZE 2048

View File

@@ -1,9 +1,10 @@
#include "tag.h"
#include "directives.h"
#include "token.h"
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include "directives.h" // IWYU pragma: keep
#include "tag.h"
#include "token.h"
namespace YAML { namespace YAML {
Tag::Tag(const Token& token) : type(static_cast<TYPE>(token.data)) { Tag::Tag(const Token& token) : type(static_cast<TYPE>(token.data)) {
switch (type) { switch (type) {

View File

@@ -10,8 +10,8 @@
#include <string> #include <string>
namespace YAML { namespace YAML {
struct Token;
struct Directives; struct Directives;
struct Token;
struct Tag { struct Tag {
enum TYPE { enum TYPE {

View File

@@ -1,8 +1,15 @@
#include "parsertests.h"
#include "handlermacros.h"
#include "yaml-cpp/yaml.h"
#include <iostream> #include <iostream>
#include "handlermacros.h"
#include "parsertests.h" // IWYU pragma: keep
#include "teststruct.h"
#include "yaml-cpp/parser.h"
namespace YAML {
class Exception;
class ParserException;
} // namespace YAML
namespace Test { namespace Test {
namespace Parser { namespace Parser {
TEST NoEndOfMapFlow() { TEST NoEndOfMapFlow() {

View File

@@ -1,9 +1,10 @@
#include "spectests.h"
#include "handlermacros.h"
#include "specexamples.h"
#include "yaml-cpp/yaml.h"
#include <cassert> #include <cassert>
#include "handlermacros.h"
#include "specexamples.h" // IWYU pragma: keep
#include "spectests.h" // IWYU pragma: keep
#include "yaml-cpp/yaml.h" // IWYU pragma: keep
namespace Test { namespace Test {
namespace Spec { namespace Spec {
// 2.1 // 2.1

View File

@@ -1,9 +1,14 @@
#include "tests.h"
#include "handlermacros.h"
#include "yaml-cpp/yaml.h"
#include "yaml-cpp/eventhandler.h"
#include <iostream> #include <iostream>
#include "teststruct.h"
#include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/yaml.h" // IWYU pragma: keep
namespace YAML {
class Exception;
struct Mark;
} // namespace YAML
namespace Test { namespace Test {
namespace Emitter { namespace Emitter {
//////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////

View File

@@ -1,8 +1,8 @@
#include "yaml-cpp/ostream_wrapper.h" #include <stddef.h>
#include <sstream> #include <sstream>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "yaml-cpp/ostream_wrapper.h"
namespace { namespace {
TEST(OstreamWrapperTest, BufferNoWrite) { TEST(OstreamWrapperTest, BufferNoWrite) {

View File

@@ -1,7 +1,12 @@
#include "spectests.h"
#include "yaml-cpp/yaml.h"
#include <iostream> #include <iostream>
#include "spectests.h"
#include "yaml-cpp/yaml.h" // IWYU pragma: keep
namespace YAML {
class Exception;
} // namespace YAML
namespace Test { namespace Test {
namespace { namespace {
void RunSpecTest(TEST (*test)(), const std::string& index, void RunSpecTest(TEST (*test)(), const std::string& index,

View File

@@ -1,12 +1,12 @@
#include "tests.h" #include <fstream>
#include <iostream>
#include <sstream>
#include <vector>
#include "emittertests.h" #include "emittertests.h"
#include "parsertests.h" #include "parsertests.h"
#include "spectests.h" #include "spectests.h"
#include "yaml-cpp/yaml.h" #include "tests.h"
#include <fstream>
#include <sstream>
#include <vector>
#include <iostream>
namespace Test { namespace Test {
void RunAll() { void RunAll() {

View File

@@ -1,7 +1,7 @@
#include "yaml-cpp/yaml.h"
#include "yaml-cpp/eventhandler.h"
#include <iostream> #include <iostream>
#include "yaml-cpp/yaml.h" // IWYU pragma: keep
class NullEventHandler : public YAML::EventHandler { class NullEventHandler : public YAML::EventHandler {
public: public:
typedef YAML::Mark Mark; typedef YAML::Mark Mark;

View File

@@ -1,7 +1,8 @@
#include "yaml-cpp/yaml.h"
#include "yaml-cpp/eventhandler.h"
#include <iostream> #include <iostream>
#include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/yaml.h" // IWYU pragma: keep
class NullEventHandler : public YAML::EventHandler { class NullEventHandler : public YAML::EventHandler {
public: public:
typedef YAML::Mark Mark; typedef YAML::Mark Mark;