commit 3f38bf2d441fac379c427f86153fbb0cb41256c6
author Dmitri Gribenko <gribozavr@gmail.com> Fri Jul 13 00:44:24 2012 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Fri Jul 13 00:44:24 2012 +0000
tree 85044422828656cba608b746c8e3e6937697aeb9
parent 3d986980bd02594b1a5aa7b9f9f68d201621ced7

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

lib/AST/CommentLexer.cpp

diff --git a/lib/AST/CommentLexer.cpp b/lib/AST/CommentLexer.cpp
index 1f4955d..5b411ca 100644
--- a/lib/AST/CommentLexer.cpp
+++ b/lib/AST/CommentLexer.cpp
@@ -273,11 +273,11 @@
   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 @@
         }
         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 @@
   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::setupAndLexHTMLCloseTag(Token &T) {
+void Lexer::setupAndLexHTMLEndTag(Token &T) {
   assert(BufferPtr[0] == '<' && BufferPtr[1] == '/');
 
   const char *TagNameBegin = skipWhitespace(BufferPtr + 2, CommentEnd);
@@ -585,14 +585,14 @@
 
   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);