projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Support] Add optional argument to SaturatingAdd() and SaturatingMultiply() to indica...
[oota-llvm.git]
/
include
/
llvm
/
Support
/
LineIterator.h
diff --git
a/include/llvm/Support/LineIterator.h
b/include/llvm/Support/LineIterator.h
index 7077656da676e38cce86fb9bad0c0c8dd6c02593..9d4cd3bd4c6d95def0cef731d55c049528a46ed0 100644
(file)
--- a/
include/llvm/Support/LineIterator.h
+++ b/
include/llvm/Support/LineIterator.h
@@
-7,40
+7,44
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_LINEITERATOR_H
__
-#define LLVM_SUPPORT_LINEITERATOR_H
__
+#ifndef LLVM_SUPPORT_LINEITERATOR_H
+#define LLVM_SUPPORT_LINEITERATOR_H
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/DataTypes.h"
#include <iterator>
namespace llvm {
class MemoryBuffer;
#include <iterator>
namespace llvm {
class MemoryBuffer;
-/// \brief A forward iterator which reads
non-blank
text lines from a buffer.
+/// \brief A forward iterator which reads text lines from a buffer.
///
/// This class provides a forward iterator interface for reading one line at
/// a time from a buffer. When default constructed the iterator will be the
/// "end" iterator.
///
///
/// This class provides a forward iterator interface for reading one line at
/// a time from a buffer. When default constructed the iterator will be the
/// "end" iterator.
///
-/// The iterator also is aware of what line number it is currently processing
-/// and can strip comment lines given the comment-starting character.
+/// The iterator is aware of what line number it is currently processing. It
+/// strips blank lines by default, and comment lines given a comment-starting
+/// character.
///
/// Note that this iterator requires the buffer to be nul terminated.
class line_iterator
///
/// Note that this iterator requires the buffer to be nul terminated.
class line_iterator
- : public std::iterator<std::forward_iterator_tag, StringRef
, ptrdiff_t
> {
+ : public std::iterator<std::forward_iterator_tag, StringRef> {
const MemoryBuffer *Buffer;
char CommentMarker;
const MemoryBuffer *Buffer;
char CommentMarker;
+ bool SkipBlanks;
unsigned LineNumber;
StringRef CurrentLine;
public:
/// \brief Default construct an "end" iterator.
unsigned LineNumber;
StringRef CurrentLine;
public:
/// \brief Default construct an "end" iterator.
- line_iterator() : Buffer(
0
) {}
+ line_iterator() : Buffer(
nullptr
) {}
/// \brief Construct a new iterator around some memory buffer.
/// \brief Construct a new iterator around some memory buffer.
- explicit line_iterator(const MemoryBuffer &Buffer, char CommentMarker = '\0');
+ explicit line_iterator(const MemoryBuffer &Buffer, bool SkipBlanks = true,
+ char CommentMarker = '\0');
/// \brief Return true if we've reached EOF or are an "end" iterator.
bool is_at_eof() const { return !Buffer; }
/// \brief Return true if we've reached EOF or are an "end" iterator.
bool is_at_eof() const { return !Buffer; }
@@
-81,4
+85,4
@@
private:
};
}
};
}
-#endif
// LLVM_SUPPORT_LINEITERATOR_H__
+#endif