Fixed #1985 (false positive: syntax error in try catch-block with for()-loop inside)

lib/tokenize.cpp

@@ -1792,6 +1792,18 @@ bool Tokenizer::tokenize(std::istream &code, const char FileName[], const std::s
             tok = tok->link();
         }
 
+        // skip executing scopes (ticket #1985)..
+        if (Token::simpleMatch(tok, "try {"))
+        {
+            tok = tok->next()->link();
+            while (Token::simpleMatch(tok, "} catch ("))
+            {
+                tok = tok->tokAt(2)->link();
+                if (Token::simpleMatch(tok, ") {"))
+                    tok = tok->next()->link();
+            }
+        }
+
         // not start of statement?
         if (tok->previous() && !Token::Match(tok, "[;{}]"))
             continue;

test/testtokenize.cpp

@@ -3691,6 +3691,16 @@ private:
             ASSERT_EQUALS("", errout.str());
         }
 
+        // ok code (ticket #1985)..
+        {
+            errout.str("");
+            std::istringstream istr("void f()\n"
+                                    "try { ;x<y; }");
+            Tokenizer tokenizer(0, this);
+            tokenizer.tokenize(istr, "test.cpp");
+            ASSERT_EQUALS("", errout.str());
+        }
+
         // bad code.. missing ">"
         {
             errout.str("");