Fixed danmar#6586 (Tokenizer: '>>' is wrongly tokenized as '> >' - if (n1 < len>>1))

danmar · danmar · commit aacd9b9f6b64 · 2015-04-03T20:25:49.000+02:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -305,7 +305,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         // ,/>
         while (Token::Match(tok, ">|>>")) {
             if (level == 0)
-                return numberOfParameters;
+                return ((tok->str() == ">") ? numberOfParameters : 0);
             --level;
             if (tok->str() == ">>") {
                 if (level == 0)
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -1150,6 +1150,7 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(1U, templateParameters("<const int> x;"));
         ASSERT_EQUALS(1U, templateParameters("<int const *> x;"));
         ASSERT_EQUALS(1U, templateParameters("<const struct C> x;"));
+        ASSERT_EQUALS(0U, templateParameters("<len>>x;"));
     }
 
     void templateParameters1() {

Original file line number	Diff line number	Diff line change
`@@ -1150,6 +1150,7 @@ class TestSimplifyTemplate : public TestFixture {`
`1150`	`1150`	`ASSERT_EQUALS(1U, templateParameters("<const int> x;"));`
`1151`	`1151`	`ASSERT_EQUALS(1U, templateParameters("<int const *> x;"));`
`1152`	`1152`	`ASSERT_EQUALS(1U, templateParameters("<const struct C> x;"));`
	`1153`	`+ ASSERT_EQUALS(0U, templateParameters("<len>>x;"));`
`1153`	`1154`	`}`
`1154`	`1155`
`1155`	`1156`	`void templateParameters1() {`