projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix include guards so they exactly match file names.
[oota-llvm.git]
/
include
/
llvm
/
Support
/
YAMLParser.h
diff --git
a/include/llvm/Support/YAMLParser.h
b/include/llvm/Support/YAMLParser.h
index 85ecc13d964c512fd476fd4ddba7ff90c9173540..6e4f57f6ab4a89bd3b1e625feebbfbabead5d5ab 100644
(file)
--- a/
include/llvm/Support/YAMLParser.h
+++ b/
include/llvm/Support/YAMLParser.h
@@
-35,15
+35,14
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_YAML
_
PARSER_H
-#define LLVM_SUPPORT_YAML
_
PARSER_H
+#ifndef LLVM_SUPPORT_YAMLPARSER_H
+#define LLVM_SUPPORT_YAMLPARSER_H
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/SMLoc.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/SMLoc.h"
-
#include <limits>
#include <utility>
#include <limits>
#include <utility>
@@
-77,7
+76,11
@@
std::string escape(StringRef Input);
/// documents.
class Stream {
public:
/// documents.
class Stream {
public:
+ /// @brief This keeps a reference to the string referenced by \p Input.
Stream(StringRef Input, SourceMgr &);
Stream(StringRef Input, SourceMgr &);
+
+ /// @brief This takes ownership of \p InputBuffer.
+ Stream(MemoryBuffer *InputBuffer, SourceMgr &);
~Stream();
document_iterator begin();
~Stream();
document_iterator begin();
@@
-130,10
+133,9
@@
public:
void setError(const Twine &Message, Token &Location) const;
bool failed() const;
void setError(const Twine &Message, Token &Location) const;
bool failed() const;
- virtual void skip() {}
;
+ virtual void skip() {}
unsigned int getType() const { return TypeID; }
unsigned int getType() const { return TypeID; }
- static inline bool classof(const Node *) { return true; }
void *operator new ( size_t Size
, BumpPtrAllocator &Alloc
void *operator new ( size_t Size
, BumpPtrAllocator &Alloc
@@
-149,7
+151,9
@@
protected:
OwningPtr<Document> &Doc;
SMRange SourceRange;
OwningPtr<Document> &Doc;
SMRange SourceRange;
- virtual ~Node();
+ void operator delete(void *) throw() {}
+
+ virtual ~Node() {}
private:
unsigned int TypeID;
private:
unsigned int TypeID;
@@
-164,13
+168,9
@@
class NullNode : public Node {
public:
NullNode(OwningPtr<Document> &D) : Node(NK_Null, D, StringRef()) {}
public:
NullNode(OwningPtr<Document> &D) : Node(NK_Null, D, StringRef()) {}
- static inline bool classof(const NullNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_Null;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_Null;
}
-
-protected:
- virtual ~NullNode();
};
/// @brief A scalar node is an opaque datum that can be presented as a
};
/// @brief A scalar node is an opaque datum that can be presented as a
@@
-184,7
+184,7
@@
public:
: Node(NK_Scalar, D, Anchor)
, Value(Val) {
SMLoc Start = SMLoc::getFromPointer(Val.begin());
: Node(NK_Scalar, D, Anchor)
, Value(Val) {
SMLoc Start = SMLoc::getFromPointer(Val.begin());
- SMLoc End = SMLoc::getFromPointer(Val.end()
- 1
);
+ SMLoc End = SMLoc::getFromPointer(Val.end());
SourceRange = SMRange(Start, End);
}
SourceRange = SMRange(Start, End);
}
@@
-200,14
+200,10
@@
public:
/// This happens with escaped characters and multi-line literals.
StringRef getValue(SmallVectorImpl<char> &Storage) const;
/// This happens with escaped characters and multi-line literals.
StringRef getValue(SmallVectorImpl<char> &Storage) const;
- static inline bool classof(const ScalarNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_Scalar;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_Scalar;
}
-protected:
- virtual ~ScalarNode();
-
private:
StringRef Value;
private:
StringRef Value;
@@
-245,19
+241,15
@@
public:
/// @returns The value, or nullptr if failed() == true.
Node *getValue();
/// @returns The value, or nullptr if failed() == true.
Node *getValue();
- virtual void skip() {
+ virtual void skip()
LLVM_OVERRIDE
{
getKey()->skip();
getValue()->skip();
}
getKey()->skip();
getValue()->skip();
}
- static inline bool classof(const KeyValueNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_KeyValue;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_KeyValue;
}
-protected:
- virtual ~KeyValueNode();
-
private:
Node *Key;
Node *Value;
private:
Node *Key;
Node *Value;
@@
-343,7
+335,7
@@
public:
enum MappingType {
MT_Block,
MT_Flow,
enum MappingType {
MT_Block,
MT_Flow,
- MT_Inline //< An inline mapping node is used for "[key: value]".
+ MT_Inline //
/
< An inline mapping node is used for "[key: value]".
};
MappingNode(OwningPtr<Document> &D, StringRef Anchor, MappingType MT)
};
MappingNode(OwningPtr<Document> &D, StringRef Anchor, MappingType MT)
@@
-365,18
+357,14
@@
public:
iterator end() { return iterator(); }
iterator end() { return iterator(); }
- virtual void skip() {
+ virtual void skip()
LLVM_OVERRIDE
{
yaml::skip(*this);
}
yaml::skip(*this);
}
- static inline bool classof(const MappingNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_Mapping;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_Mapping;
}
-protected:
- virtual ~MappingNode();
-
private:
MappingType Type;
bool IsAtBeginning;
private:
MappingType Type;
bool IsAtBeginning;
@@
-431,18
+419,14
@@
public:
iterator end() { return iterator(); }
iterator end() { return iterator(); }
- virtual void skip() {
+ virtual void skip()
LLVM_OVERRIDE
{
yaml::skip(*this);
}
yaml::skip(*this);
}
- static inline bool classof(const SequenceNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_Sequence;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_Sequence;
}
-protected:
- virtual ~SequenceNode();
-
private:
SequenceType SeqType;
bool IsAtBeginning;
private:
SequenceType SeqType;
bool IsAtBeginning;
@@
-463,14
+447,10
@@
public:
StringRef getName() const { return Name; }
Node *getTarget();
StringRef getName() const { return Name; }
Node *getTarget();
- static inline bool classof(const ScalarNode *) { return true; }
static inline bool classof(const Node *N) {
return N->getType() == NK_Alias;
}
static inline bool classof(const Node *N) {
return N->getType() == NK_Alias;
}
-protected:
- virtual ~AliasNode();
-
private:
StringRef Name;
};
private:
StringRef Name;
};
@@
-529,34
+509,44
@@
private:
/// @brief Iterator abstraction for Documents over a Stream.
class document_iterator {
public:
/// @brief Iterator abstraction for Documents over a Stream.
class document_iterator {
public:
- document_iterator() : Doc(NullDoc) {}
- document_iterator(OwningPtr<Document> &D) : Doc(D) {}
+ document_iterator() : Doc(0) {}
+ document_iterator(OwningPtr<Document> &D) : Doc(&D) {}
+
+ bool operator ==(const document_iterator &Other) {
+ if (isAtEnd() || Other.isAtEnd())
+ return isAtEnd() && Other.isAtEnd();
+ return *Doc == *Other.Doc;
+ }
bool operator !=(const document_iterator &Other) {
bool operator !=(const document_iterator &Other) {
- return
Doc != Other.Doc
;
+ return
!(*this == Other)
;
}
document_iterator operator ++() {
}
document_iterator operator ++() {
- if (!Doc->skip()) {
- Doc.reset(0);
+ assert(Doc != 0 && "incrementing iterator past the end.");
+ if (!(*Doc)->skip()) {
+ Doc->reset(0);
} else {
} else {
- Stream &S =
Doc
->stream;
- Doc
.
reset(new Document(S));
+ Stream &S =
(*Doc)
->stream;
+ Doc
->
reset(new Document(S));
}
return *this;
}
Document &operator *() {
}
return *this;
}
Document &operator *() {
- return *Doc;
+ return *Doc
->get()
;
}
OwningPtr<Document> &operator ->() {
}
OwningPtr<Document> &operator ->() {
- return Doc;
+ return
*
Doc;
}
private:
}
private:
- static OwningPtr<Document> NullDoc;
- OwningPtr<Document> &Doc;
+ bool isAtEnd() const {
+ return Doc == 0 || *Doc == 0;
+ }
+
+ OwningPtr<Document> *Doc;
};
}
};
}