diff options
author | Dmitri Gribenko <gribozavr@gmail.com> | 2012-07-13 00:44:24 +0000 |
---|---|---|
committer | Dmitri Gribenko <gribozavr@gmail.com> | 2012-07-13 00:44:24 +0000 |
commit | 3f38bf2d441fac379c427f86153fbb0cb41256c6 (patch) | |
tree | 85044422828656cba608b746c8e3e6937697aeb9 /lib/AST/CommentLexer.cpp | |
parent | 3d986980bd02594b1a5aa7b9f9f68d201621ced7 (diff) | |
download | clang-3f38bf2d441fac379c427f86153fbb0cb41256c6.tar.gz |
Comment parsing: repaint the bikesched: rename 'HTML open tags' to 'HTML start tags' and 'HTML close tags' to 'HTML end tags' according to HTML spec.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160153 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/CommentLexer.cpp')
-rw-r--r-- | lib/AST/CommentLexer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/AST/CommentLexer.cpp b/lib/AST/CommentLexer.cpp index 1f4955d1cf..5b411ca9cc 100644 --- a/lib/AST/CommentLexer.cpp +++ b/lib/AST/CommentLexer.cpp @@ -273,11 +273,11 @@ void Lexer::lexCommentText(Token &T) { case LS_VerbatimLineText: lexVerbatimLineText(T); return; - case LS_HTMLOpenTag: - lexHTMLOpenTag(T); + case LS_HTMLStartTag: + lexHTMLStartTag(T); return; - case LS_HTMLCloseTag: - lexHTMLCloseTag(T); + case LS_HTMLEndTag: + lexHTMLEndTag(T); return; } @@ -363,9 +363,9 @@ void Lexer::lexCommentText(Token &T) { } const char C = *TokenPtr; if (isHTMLIdentifierStartingCharacter(C)) - setupAndLexHTMLOpenTag(T); + setupAndLexHTMLStartTag(T); else if (C == '/') - setupAndLexHTMLCloseTag(T); + setupAndLexHTMLEndTag(T); else { StringRef Text(BufferPtr, TokenPtr - BufferPtr); formTokenWithChars(T, TokenPtr, tok::text); @@ -496,25 +496,25 @@ void Lexer::lexVerbatimLineText(Token &T) { State = LS_Normal; } -void Lexer::setupAndLexHTMLOpenTag(Token &T) { +void Lexer::setupAndLexHTMLStartTag(Token &T) { assert(BufferPtr[0] == '<' && isHTMLIdentifierStartingCharacter(BufferPtr[1])); const char *TagNameEnd = skipHTMLIdentifier(BufferPtr + 2, CommentEnd); StringRef Name(BufferPtr + 1, TagNameEnd - (BufferPtr + 1)); - formTokenWithChars(T, TagNameEnd, tok::html_tag_open); - T.setHTMLTagOpenName(Name); + formTokenWithChars(T, TagNameEnd, tok::html_start_tag); + T.setHTMLTagStartName(Name); BufferPtr = skipWhitespace(BufferPtr, CommentEnd); const char C = *BufferPtr; if (BufferPtr != CommentEnd && (C == '>' || C == '/' || isHTMLIdentifierStartingCharacter(C))) - State = LS_HTMLOpenTag; + State = LS_HTMLStartTag; } -void Lexer::lexHTMLOpenTag(Token &T) { - assert(State == LS_HTMLOpenTag); +void Lexer::lexHTMLStartTag(Token &T) { + assert(State == LS_HTMLStartTag); const char *TokenPtr = BufferPtr; char C = *TokenPtr; @@ -577,7 +577,7 @@ void Lexer::lexHTMLOpenTag(Token &T) { } } -void Lexer::setupAndLexHTMLCloseTag(Token &T) { +void Lexer::setupAndLexHTMLEndTag(Token &T) { assert(BufferPtr[0] == '<' && BufferPtr[1] == '/'); const char *TagNameBegin = skipWhitespace(BufferPtr + 2, CommentEnd); @@ -585,14 +585,14 @@ void Lexer::setupAndLexHTMLCloseTag(Token &T) { const char *End = skipWhitespace(TagNameEnd, CommentEnd); - formTokenWithChars(T, End, tok::html_tag_close); - T.setHTMLTagCloseName(StringRef(TagNameBegin, TagNameEnd - TagNameBegin)); + formTokenWithChars(T, End, tok::html_end_tag); + T.setHTMLTagEndName(StringRef(TagNameBegin, TagNameEnd - TagNameBegin)); if (BufferPtr != CommentEnd && *BufferPtr == '>') - State = LS_HTMLCloseTag; + State = LS_HTMLEndTag; } -void Lexer::lexHTMLCloseTag(Token &T) { +void Lexer::lexHTMLEndTag(Token &T) { assert(BufferPtr != CommentEnd && *BufferPtr == '>'); formTokenWithChars(T, BufferPtr + 1, tok::html_greater); |