commit 5676d32a23faf0506f5c295980c2876c862488d5
author Dmitri Gribenko <gribozavr@gmail.com> Wed Jun 27 23:28:29 2012 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Wed Jun 27 23:28:29 2012 +0000
tree 042622f2e745a376889a7d63aa2dfa8576382bcd
parent 8771872ab78fe4bd65393f94f2b1b6eb8b4ec6d3

Fix an infinite loop in comment lexer: we were not advancing in the input character stream when we saw a '<' that is not a start of an HTML tag.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159303 91177308-0d34-0410-b5e6-96231b3b80d8

unittests/AST/CommentLexer.cpp

diff --git a/unittests/AST/CommentLexer.cpp b/unittests/AST/CommentLexer.cpp
index a1e2427..5b4712d 100644
--- a/unittests/AST/CommentLexer.cpp
+++ b/unittests/AST/CommentLexer.cpp
@@ -683,6 +683,28 @@
 }
 
 TEST_F(CommentLexerTest, HTML2) {
+  const char *Source =
+    "// < tag";
+
+  std::vector<Token> Toks;
+
+  lexString(Source, Toks);
+
+  ASSERT_EQ(4U, Toks.size());
+
+  ASSERT_EQ(tok::text,         Toks[0].getKind());
+  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
+
+  ASSERT_EQ(tok::text,         Toks[1].getKind());
+  ASSERT_EQ(StringRef("<"),    Toks[1].getText());
+
+  ASSERT_EQ(tok::text,         Toks[2].getKind());
+  ASSERT_EQ(StringRef(" tag"), Toks[2].getText());
+
+  ASSERT_EQ(tok::newline,      Toks[3].getKind());
+}
+
+TEST_F(CommentLexerTest, HTML3) {
   const char *Sources[] = {
     "// <tag",
     "// <tag "
@@ -705,7 +727,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML3) {
+TEST_F(CommentLexerTest, HTML4) {
   const char *Source = "// <tag=";
 
   std::vector<Token> Toks;
@@ -726,7 +748,7 @@
   ASSERT_EQ(tok::newline,       Toks[3].getKind());
 }
 
-TEST_F(CommentLexerTest, HTML4) {
+TEST_F(CommentLexerTest, HTML5) {
   const char *Sources[] = {
     "// <tag attr",
     "// <tag attr "
@@ -752,7 +774,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML5) {
+TEST_F(CommentLexerTest, HTML6) {
   const char *Sources[] = {
     "// <tag attr=",
     "// <tag attr ="
@@ -780,7 +802,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML6) {
+TEST_F(CommentLexerTest, HTML7) {
   const char *Sources[] = {
     "// <tag attr=\"",
     "// <tag attr = \"",
@@ -813,7 +835,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML7) {
+TEST_F(CommentLexerTest, HTML8) {
   const char *Source = "// <tag attr=@";
 
   std::vector<Token> Toks;
@@ -839,7 +861,7 @@
   ASSERT_EQ(tok::newline,       Toks[5].getKind());
 }
 
-TEST_F(CommentLexerTest, HTML8) {
+TEST_F(CommentLexerTest, HTML9) {
   const char *Sources[] = {
     "// <tag attr=\"val\\\"\\'val",
     "// <tag attr=\"val\\\"\\'val\"",
@@ -872,7 +894,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML9) {
+TEST_F(CommentLexerTest, HTML10) {
   const char *Sources[] = {
     "// <tag attr=\"val\\\"\\'val\">",
     "// <tag attr=\'val\\\"\\'val\'>"
@@ -905,7 +927,7 @@
   }
 }
 
-TEST_F(CommentLexerTest, HTML10) {
+TEST_F(CommentLexerTest, HTML11) {
   const char *Source = "// </";
 
   std::vector<Token> Toks;
@@ -924,7 +946,7 @@
 }
 
 
-TEST_F(CommentLexerTest, HTML11) {
+TEST_F(CommentLexerTest, HTML12) {
   const char *Source = "// </@";
 
   std::vector<Token> Toks;
@@ -945,7 +967,7 @@
   ASSERT_EQ(tok::newline,        Toks[3].getKind());
 }
 
-TEST_F(CommentLexerTest, HTML12) {
+TEST_F(CommentLexerTest, HTML13) {
   const char *Sources[] = {
     "// </tag",
     "// </tag>",