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

2 files changed, 157 insertions, 157 deletions

diff --git a/unittests/AST/CommentLexer.cpp b/unittests/AST/CommentLexer.cpp
index 471863924a..6be5909f8a 100644
--- a/unittests/AST/CommentLexer.cpp
+++ b/unittests/AST/CommentLexer.cpp
@@ -858,13 +858,13 @@ TEST_F(CommentLexerTest, HTML4) {
 
     ASSERT_EQ(3U, Toks.size());
 
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+    ASSERT_EQ(tok::text,           Toks[0].getKind());
+    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-    ASSERT_EQ(tok::newline,       Toks[2].getKind());
+    ASSERT_EQ(tok::newline,        Toks[2].getKind());
   }
 }
 
@@ -878,16 +878,16 @@ TEST_F(CommentLexerTest, HTML5) {
 
   ASSERT_EQ(4U, Toks.size());
 
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+  ASSERT_EQ(tok::text,           Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef("42"),    Toks[2].getText());
+  ASSERT_EQ(tok::text,           Toks[2].getKind());
+  ASSERT_EQ(StringRef("42"),     Toks[2].getText());
 
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
+  ASSERT_EQ(tok::newline,        Toks[3].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML6) {
@@ -899,18 +899,18 @@ TEST_F(CommentLexerTest, HTML6) {
 
   ASSERT_EQ(5U, Toks.size());
 
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+  ASSERT_EQ(tok::text,           Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-  ASSERT_EQ(tok::html_greater,  Toks[2].getKind());
+  ASSERT_EQ(tok::html_greater,   Toks[2].getKind());
 
-  ASSERT_EQ(tok::text,          Toks[3].getKind());
-  ASSERT_EQ(StringRef(" Meow"), Toks[3].getText());
+  ASSERT_EQ(tok::text,           Toks[3].getKind());
+  ASSERT_EQ(StringRef(" Meow"),  Toks[3].getText());
 
-  ASSERT_EQ(tok::newline,       Toks[4].getKind());
+  ASSERT_EQ(tok::newline,        Toks[4].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML7) {
@@ -922,16 +922,16 @@ TEST_F(CommentLexerTest, HTML7) {
 
   ASSERT_EQ(4U, Toks.size());
 
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+  ASSERT_EQ(tok::text,           Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef("="),     Toks[2].getText());
+  ASSERT_EQ(tok::text,           Toks[2].getKind());
+  ASSERT_EQ(StringRef("="),      Toks[2].getText());
 
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
+  ASSERT_EQ(tok::newline,        Toks[3].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML8) {
@@ -943,23 +943,23 @@ TEST_F(CommentLexerTest, HTML8) {
 
   ASSERT_EQ(7U, Toks.size());
 
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+  ASSERT_EQ(tok::text,           Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-  ASSERT_EQ(tok::html_ident,    Toks[2].getKind());
-  ASSERT_EQ(StringRef("attr"),  Toks[2].getHTMLIdent());
+  ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
+  ASSERT_EQ(StringRef("attr"),   Toks[2].getHTMLIdent());
 
-  ASSERT_EQ(tok::html_equals,   Toks[3].getKind());
+  ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
 
-  ASSERT_EQ(tok::html_greater,  Toks[4].getKind());
+  ASSERT_EQ(tok::html_greater,   Toks[4].getKind());
 
-  ASSERT_EQ(tok::text,          Toks[5].getKind());
-  ASSERT_EQ(StringRef(" Meow"), Toks[5].getText());
+  ASSERT_EQ(tok::text,           Toks[5].getKind());
+  ASSERT_EQ(StringRef(" Meow"),  Toks[5].getText());
 
-  ASSERT_EQ(tok::newline,       Toks[6].getKind());
+  ASSERT_EQ(tok::newline,        Toks[6].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML9) {
@@ -975,16 +975,16 @@ TEST_F(CommentLexerTest, HTML9) {
 
     ASSERT_EQ(4U, Toks.size());
 
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+    ASSERT_EQ(tok::text,           Toks[0].getKind());
+    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-    ASSERT_EQ(tok::html_ident,    Toks[2].getKind());
-    ASSERT_EQ(StringRef("attr"),  Toks[2].getHTMLIdent());
+    ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
+    ASSERT_EQ(StringRef("attr"),   Toks[2].getHTMLIdent());
 
-    ASSERT_EQ(tok::newline,       Toks[3].getKind());
+    ASSERT_EQ(tok::newline,        Toks[3].getKind());
   }
 }
 
@@ -1001,18 +1001,18 @@ TEST_F(CommentLexerTest, HTML10) {
 
     ASSERT_EQ(5U, Toks.size());
 
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+    ASSERT_EQ(tok::text,           Toks[0].getKind());
+    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-    ASSERT_EQ(tok::html_ident,    Toks[2].getKind());
-    ASSERT_EQ(StringRef("attr"),  Toks[2].getHTMLIdent());
+    ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
+    ASSERT_EQ(StringRef("attr"),   Toks[2].getHTMLIdent());
 
-    ASSERT_EQ(tok::html_equals,   Toks[3].getKind());
+    ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
 
-    ASSERT_EQ(tok::newline,       Toks[4].getKind());
+    ASSERT_EQ(tok::newline,        Toks[4].getKind());
   }
 }
 
@@ -1034,8 +1034,8 @@ TEST_F(CommentLexerTest, HTML11) {
     ASSERT_EQ(tok::text,               Toks[0].getKind());
     ASSERT_EQ(StringRef(" "),          Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open,      Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagStartName());
 
     ASSERT_EQ(tok::html_ident,         Toks[2].getKind());
     ASSERT_EQ(StringRef("attr"),       Toks[2].getHTMLIdent());
@@ -1058,21 +1058,21 @@ TEST_F(CommentLexerTest, HTML12) {
 
   ASSERT_EQ(6U, Toks.size());
 
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
+  ASSERT_EQ(tok::text,           Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_open, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),   Toks[1].getHTMLTagOpenName());
+  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagStartName());
 
-  ASSERT_EQ(tok::html_ident,    Toks[2].getKind());
-  ASSERT_EQ(StringRef("attr"),  Toks[2].getHTMLIdent());
+  ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
+  ASSERT_EQ(StringRef("attr"),   Toks[2].getHTMLIdent());
 
-  ASSERT_EQ(tok::html_equals,   Toks[3].getKind());
+  ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
 
-  ASSERT_EQ(tok::text,          Toks[4].getKind());
-  ASSERT_EQ(StringRef("@"),     Toks[4].getText());
+  ASSERT_EQ(tok::text,           Toks[4].getKind());
+  ASSERT_EQ(StringRef("@"),      Toks[4].getText());
 
-  ASSERT_EQ(tok::newline,       Toks[5].getKind());
+  ASSERT_EQ(tok::newline,        Toks[5].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML13) {
@@ -1093,8 +1093,8 @@ TEST_F(CommentLexerTest, HTML13) {
     ASSERT_EQ(tok::text,                  Toks[0].getKind());
     ASSERT_EQ(StringRef(" "),             Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open,         Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),           Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag,        Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),           Toks[1].getHTMLTagStartName());
 
     ASSERT_EQ(tok::html_ident,            Toks[2].getKind());
     ASSERT_EQ(StringRef("attr"),          Toks[2].getHTMLIdent());
@@ -1124,8 +1124,8 @@ TEST_F(CommentLexerTest, HTML14) {
     ASSERT_EQ(tok::text,                  Toks[0].getKind());
     ASSERT_EQ(StringRef(" "),             Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open,         Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),           Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag,        Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),           Toks[1].getHTMLTagStartName());
 
     ASSERT_EQ(tok::html_ident,            Toks[2].getKind());
     ASSERT_EQ(StringRef("attr"),          Toks[2].getHTMLIdent());
@@ -1157,8 +1157,8 @@ TEST_F(CommentLexerTest, HTML15) {
     ASSERT_EQ(tok::text,               Toks[0].getKind());
     ASSERT_EQ(StringRef(" "),          Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open,      Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagStartName());
 
     ASSERT_EQ(tok::html_slash_greater, Toks[2].getKind());
 
@@ -1182,8 +1182,8 @@ TEST_F(CommentLexerTest, HTML16) {
     ASSERT_EQ(tok::text,               Toks[0].getKind());
     ASSERT_EQ(StringRef(" "),          Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_open,      Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagOpenName());
+    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),        Toks[1].getHTMLTagStartName());
 
     ASSERT_EQ(tok::text,               Toks[2].getKind());
     ASSERT_EQ(StringRef("/"),          Toks[2].getText());
@@ -1204,13 +1204,13 @@ TEST_F(CommentLexerTest, HTML17) {
 
   ASSERT_EQ(3U, Toks.size());
 
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
+  ASSERT_EQ(tok::text,         Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_close, Toks[1].getKind());
-  ASSERT_EQ(StringRef(""),       Toks[1].getHTMLTagCloseName());
+  ASSERT_EQ(tok::html_end_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef(""),     Toks[1].getHTMLTagEndName());
 
-  ASSERT_EQ(tok::newline,        Toks[2].getKind());
+  ASSERT_EQ(tok::newline,      Toks[2].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML18) {
@@ -1222,16 +1222,16 @@ TEST_F(CommentLexerTest, HTML18) {
 
   ASSERT_EQ(4U, Toks.size());
 
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
+  ASSERT_EQ(tok::text,         Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_close, Toks[1].getKind());
-  ASSERT_EQ(StringRef(""),       Toks[1].getHTMLTagCloseName());
+  ASSERT_EQ(tok::html_end_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef(""),     Toks[1].getHTMLTagEndName());
 
-  ASSERT_EQ(tok::text,           Toks[2].getKind());
-  ASSERT_EQ(StringRef("@"),      Toks[2].getText());
+  ASSERT_EQ(tok::text,         Toks[2].getKind());
+  ASSERT_EQ(StringRef("@"),    Toks[2].getText());
 
-  ASSERT_EQ(tok::newline,        Toks[3].getKind());
+  ASSERT_EQ(tok::newline,      Toks[3].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML19) {
@@ -1243,13 +1243,13 @@ TEST_F(CommentLexerTest, HTML19) {
 
   ASSERT_EQ(3U, Toks.size());
 
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
+  ASSERT_EQ(tok::text,         Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
 
-  ASSERT_EQ(tok::html_tag_close, Toks[1].getKind());
-  ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagCloseName());
+  ASSERT_EQ(tok::html_end_tag, Toks[1].getKind());
+  ASSERT_EQ(StringRef("tag"),  Toks[1].getHTMLTagEndName());
 
-  ASSERT_EQ(tok::newline,        Toks[2].getKind());
+  ASSERT_EQ(tok::newline,      Toks[2].getKind());
 }
 
 TEST_F(CommentLexerTest, HTML20) {
@@ -1266,15 +1266,15 @@ TEST_F(CommentLexerTest, HTML20) {
 
     ASSERT_EQ(4U, Toks.size());
 
-    ASSERT_EQ(tok::text,           Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
+    ASSERT_EQ(tok::text,         Toks[0].getKind());
+    ASSERT_EQ(StringRef(" "),    Toks[0].getText());
 
-    ASSERT_EQ(tok::html_tag_close, Toks[1].getKind());
-    ASSERT_EQ(StringRef("tag"),    Toks[1].getHTMLTagCloseName());
+    ASSERT_EQ(tok::html_end_tag, Toks[1].getKind());
+    ASSERT_EQ(StringRef("tag"),  Toks[1].getHTMLTagEndName());
 
-    ASSERT_EQ(tok::html_greater,   Toks[2].getKind());
+    ASSERT_EQ(tok::html_greater, Toks[2].getKind());
 
-    ASSERT_EQ(tok::newline,        Toks[3].getKind());
+    ASSERT_EQ(tok::newline,      Toks[3].getKind());
   }
 }
 
diff --git a/unittests/AST/CommentParser.cpp b/unittests/AST/CommentParser.cpp
index c779a881d4..d2f87488de 100644
--- a/unittests/AST/CommentParser.cpp
+++ b/unittests/AST/CommentParser.cpp
@@ -275,18 +275,18 @@ struct NoArgs {};
   return ::testing::AssertionSuccess();
 }
 
-::testing::AssertionResult HasHTMLOpenTagAt(const Comment *C,
-                                            size_t Idx,
-                                            HTMLOpenTagComment *&HOT,
-                                            StringRef TagName) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, HOT);
+::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
+                                             size_t Idx,
+                                             HTMLStartTagComment *&HST,
+                                             StringRef TagName) {
+  ::testing::AssertionResult AR = GetChildAt(C, Idx, HST);
   if (!AR)
     return AR;
 
-  StringRef ActualTagName = HOT->getTagName();
+  StringRef ActualTagName = HST->getTagName();
   if (ActualTagName != TagName)
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment has name \"" << ActualTagName.str() << "\", "
+        << "HTMLStartTagComment has name \"" << ActualTagName.str() << "\", "
            "expected \"" << TagName.str() << "\"";
 
   return ::testing::AssertionSuccess();
@@ -294,18 +294,18 @@ struct NoArgs {};
 
 struct SelfClosing {};
 
-::testing::AssertionResult HasHTMLOpenTagAt(const Comment *C,
-                                            size_t Idx,
-                                            HTMLOpenTagComment *&HOT,
-                                            StringRef TagName,
-                                            SelfClosing) {
-  ::testing::AssertionResult AR = HasHTMLOpenTagAt(C, Idx, HOT, TagName);
+::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
+                                             size_t Idx,
+                                             HTMLStartTagComment *&HST,
+                                             StringRef TagName,
+                                             SelfClosing) {
+  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
   if (!AR)
     return AR;
 
-  if (!HOT->isSelfClosing())
+  if (!HST->isSelfClosing())
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment is not self-closing";
+        << "HTMLStartTagComment is not self-closing";
 
   return ::testing::AssertionSuccess();
 }
@@ -313,73 +313,73 @@ struct SelfClosing {};
 
 struct NoAttrs {};
 
-::testing::AssertionResult HasHTMLOpenTagAt(const Comment *C,
-                                            size_t Idx,
-                                            HTMLOpenTagComment *&HOT,
-                                            StringRef TagName,
-                                            NoAttrs) {
-  ::testing::AssertionResult AR = HasHTMLOpenTagAt(C, Idx, HOT, TagName);
+::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
+                                             size_t Idx,
+                                             HTMLStartTagComment *&HST,
+                                             StringRef TagName,
+                                             NoAttrs) {
+  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
   if (!AR)
     return AR;
 
-  if (HOT->isSelfClosing())
+  if (HST->isSelfClosing())
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment is self-closing";
+        << "HTMLStartTagComment is self-closing";
 
-  if (HOT->getAttrCount() != 0)
+  if (HST->getAttrCount() != 0)
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment has " << HOT->getAttrCount() << " attr(s), "
+        << "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), "
            "expected 0";
 
   return ::testing::AssertionSuccess();
 }
 
-::testing::AssertionResult HasHTMLOpenTagAt(const Comment *C,
-                                            size_t Idx,
-                                            HTMLOpenTagComment *&HOT,
-                                            StringRef TagName,
-                                            StringRef AttrName,
-                                            StringRef AttrValue) {
-  ::testing::AssertionResult AR = HasHTMLOpenTagAt(C, Idx, HOT, TagName);
+::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
+                                             size_t Idx,
+                                             HTMLStartTagComment *&HST,
+                                             StringRef TagName,
+                                             StringRef AttrName,
+                                             StringRef AttrValue) {
+  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
   if (!AR)
     return AR;
 
-  if (HOT->isSelfClosing())
+  if (HST->isSelfClosing())
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment is self-closing";
+        << "HTMLStartTagComment is self-closing";
 
-  if (HOT->getAttrCount() != 1)
+  if (HST->getAttrCount() != 1)
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment has " << HOT->getAttrCount() << " attr(s), "
+        << "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), "
            "expected 1";
 
-  StringRef ActualName = HOT->getAttr(0).Name;
+  StringRef ActualName = HST->getAttr(0).Name;
   if (ActualName != AttrName)
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment has attr \"" << ActualName.str() << "\", "
+        << "HTMLStartTagComment has attr \"" << ActualName.str() << "\", "
            "expected \"" << AttrName.str() << "\"";
 
-  StringRef ActualValue = HOT->getAttr(0).Value;
+  StringRef ActualValue = HST->getAttr(0).Value;
   if (ActualValue != AttrValue)
     return ::testing::AssertionFailure()
-        << "HTMLOpenTagComment has attr value \"" << ActualValue.str() << "\", "
+        << "HTMLStartTagComment has attr value \"" << ActualValue.str() << "\", "
            "expected \"" << AttrValue.str() << "\"";
 
   return ::testing::AssertionSuccess();
 }
 
-::testing::AssertionResult HasHTMLCloseTagAt(const Comment *C,
-                                             size_t Idx,
-                                             HTMLCloseTagComment *&HCT,
-                                             StringRef TagName) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, HCT);
+::testing::AssertionResult HasHTMLEndTagAt(const Comment *C,
+                                           size_t Idx,
+                                           HTMLEndTagComment *&HET,
+                                           StringRef TagName) {
+  ::testing::AssertionResult AR = GetChildAt(C, Idx, HET);
   if (!AR)
     return AR;
 
-  StringRef ActualTagName = HCT->getTagName();
+  StringRef ActualTagName = HET->getTagName();
   if (ActualTagName != TagName)
     return ::testing::AssertionFailure()
-        << "HTMLCloseTagComment has name \"" << ActualTagName.str() << "\", "
+        << "HTMLEndTagComment has name \"" << ActualTagName.str() << "\", "
            "expected \"" << TagName.str() << "\"";
 
   return ::testing::AssertionSuccess();
@@ -852,12 +852,12 @@ TEST_F(CommentParserTest, HTML1) {
 
     {
       ParagraphComment *PC;
-      HTMLOpenTagComment *HOT;
+      HTMLStartTagComment *HST;
       ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
       ASSERT_TRUE(HasChildCount(PC, 2));
         ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLOpenTagAt(PC, 1, HOT, "a", NoAttrs()));
+        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", NoAttrs()));
     }
   }
 }
@@ -874,12 +874,12 @@ TEST_F(CommentParserTest, HTML2) {
 
     {
       ParagraphComment *PC;
-      HTMLOpenTagComment *HOT;
+      HTMLStartTagComment *HST;
       ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
       ASSERT_TRUE(HasChildCount(PC, 2));
         ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLOpenTagAt(PC, 1, HOT, "br", SelfClosing()));
+        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "br", SelfClosing()));
     }
   }
 }
@@ -898,12 +898,12 @@ TEST_F(CommentParserTest, HTML3) {
 
     {
       ParagraphComment *PC;
-      HTMLOpenTagComment *HOT;
+      HTMLStartTagComment *HST;
       ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
       ASSERT_TRUE(HasChildCount(PC, 2));
         ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLOpenTagAt(PC, 1, HOT, "a", "href", ""));
+        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", "href", ""));
     }
   }
 }
@@ -920,12 +920,12 @@ TEST_F(CommentParserTest, HTML4) {
 
     {
       ParagraphComment *PC;
-      HTMLOpenTagComment *HOT;
+      HTMLStartTagComment *HST;
       ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
       ASSERT_TRUE(HasChildCount(PC, 2));
         ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLOpenTagAt(PC, 1, HOT, "a", "href", "bbb"));
+        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", "href", "bbb"));
     }
   }
 }
@@ -943,12 +943,12 @@ TEST_F(CommentParserTest, HTML5) {
 
     {
       ParagraphComment *PC;
-      HTMLCloseTagComment *HCT;
+      HTMLEndTagComment *HET;
       ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
       ASSERT_TRUE(HasChildCount(PC, 2));
         ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLCloseTagAt(PC, 1, HCT, "a"));
+        ASSERT_TRUE(HasHTMLEndTagAt(PC, 1, HET, "a"));
     }
   }
 }
@@ -965,17 +965,17 @@ TEST_F(CommentParserTest, HTML6) {
 
   {
     ParagraphComment *PC;
-    HTMLOpenTagComment *HOT;
-    HTMLCloseTagComment *HCT;
+    HTMLStartTagComment *HST;
+    HTMLEndTagComment *HET;
     ASSERT_TRUE(GetChildAt(FC, 0, PC));
 
     ASSERT_TRUE(HasChildCount(PC, 6));
       ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasHTMLOpenTagAt(PC, 1, HOT, "pre", NoAttrs()));
+      ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "pre", NoAttrs()));
       ASSERT_TRUE(HasTextWithNewlineAt(PC, 2, " Aaa"));
       ASSERT_TRUE(HasTextWithNewlineAt(PC, 3, " Bbb"));
       ASSERT_TRUE(HasTextAt(PC, 4, " "));
-      ASSERT_TRUE(HasHTMLCloseTagAt(PC, 5, HCT, "pre"));
+      ASSERT_TRUE(HasHTMLEndTagAt(PC, 5, HET, "pre"));
   }
 }