diff options
| author |   patrick <patrick@openbsd.org> | 2018-04-06 14:26:03 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2018-04-06 14:26:03 +0000 |
| commit | bdabc2f19ffb9e20600dad6e8a300842a7bda50e (patch) | |
| tree | c50e7b2e5449b074651bb82a58517a8ebc4a8cf7 /gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h | |
| parent | Print a 'p' flag for file descriptors that were opened after pledge(2). (diff) | |
| download | wireguard-openbsd-bdabc2f19ffb9e20600dad6e8a300842a7bda50e.tar.xz wireguard-openbsd-bdabc2f19ffb9e20600dad6e8a300842a7bda50e.zip | |
Import LLVM 6.0.1 release including clang, lld and lldb.
"where is the kaboom?" deraadt@
Diffstat (limited to 'gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h')
| -rw-r--r-- | gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h b/gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h index bf10f09cd11..59dc2a752f1 100644 --- a/gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h +++ b/gnu/llvm/tools/clang/lib/Format/FormatTokenLexer.h @@ -36,7 +36,7 @@ enum LexerState { class FormatTokenLexer { public: - FormatTokenLexer(const SourceManager &SourceMgr, FileID ID, + FormatTokenLexer(const SourceManager &SourceMgr, FileID ID, unsigned Column, const FormatStyle &Style, encoding::Encoding Encoding); ArrayRef<FormatToken *> lex(); @@ -73,6 +73,8 @@ private: // nested template parts by balancing curly braces. void handleTemplateStrings(); + void tryParsePythonComment(); + bool tryMerge_TMacro(); bool tryMergeConflictMarkers(); |