commit 64da4e55c111f4733135e1780216609569767351
author Dmitri Gribenko <gribozavr@gmail.com> Wed Jul 18 23:01:58 2012 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Wed Jul 18 23:01:58 2012 +0000
tree 86516a74165194d5d35b39797960ad63b579764e
parent c0e8ad5fc389a6735b54f7e410ba169adbc88180

Comment parsing: don't parse whitespace before \endverbatim as a separate line of whitespace.


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

unittests/AST/CommentLexer.cpp

diff --git a/unittests/AST/CommentLexer.cpp b/unittests/AST/CommentLexer.cpp
index 6be5909..dd92df4 100644
--- a/unittests/AST/CommentLexer.cpp
+++ b/unittests/AST/CommentLexer.cpp
@@ -514,7 +514,7 @@
 
   lexString(Source, Toks);
 
-  ASSERT_EQ(11U, Toks.size());
+  ASSERT_EQ(10U, Toks.size());
 
   ASSERT_EQ(tok::text,                 Toks[0].getKind());
   ASSERT_EQ(StringRef(" "),            Toks[0].getText());
@@ -536,13 +536,10 @@
 
   ASSERT_EQ(tok::newline,              Toks[7].getKind());
 
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[8].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[8].getVerbatimBlockText());
+  ASSERT_EQ(tok::verbatim_block_end,   Toks[8].getKind());
+  ASSERT_EQ(StringRef("endverbatim"),  Toks[8].getVerbatimBlockName());
 
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[9].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  Toks[9].getVerbatimBlockName());
-
-  ASSERT_EQ(tok::newline,              Toks[10].getKind());
+  ASSERT_EQ(tok::newline,              Toks[9].getKind());
 }
 
 TEST_F(CommentLexerTest, VerbatimBlock7) {
@@ -558,7 +555,7 @@
 
   lexString(Source, Toks);
 
-  ASSERT_EQ(11U, Toks.size());
+  ASSERT_EQ(10U, Toks.size());
 
   ASSERT_EQ(tok::text,                 Toks[0].getKind());
   ASSERT_EQ(StringRef(" "),            Toks[0].getText());
@@ -575,19 +572,16 @@
   ASSERT_EQ(tok::verbatim_block_line,  Toks[4].getKind());
   ASSERT_EQ(StringRef(" Bbb"),         Toks[4].getVerbatimBlockText());
 
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[5].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[5].getVerbatimBlockText());
+  ASSERT_EQ(tok::verbatim_block_end,   Toks[5].getKind());
+  ASSERT_EQ(StringRef("endverbatim"),  Toks[5].getVerbatimBlockName());
 
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[6].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  Toks[6].getVerbatimBlockName());
+  ASSERT_EQ(tok::newline,              Toks[6].getKind());
 
-  ASSERT_EQ(tok::newline,              Toks[7].getKind());
+  ASSERT_EQ(tok::text,                 Toks[7].getKind());
+  ASSERT_EQ(StringRef(" "),            Toks[7].getText());
 
-  ASSERT_EQ(tok::text,                 Toks[8].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[8].getText());
-
+  ASSERT_EQ(tok::newline,              Toks[8].getKind());
   ASSERT_EQ(tok::newline,              Toks[9].getKind());
-  ASSERT_EQ(tok::newline,              Toks[10].getKind());
 }
 
 // Complex test for verbatim blocks.