From 0a1d10bf2f8e14c78610da467aed67a039dc66d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 2 Jan 2016 23:09:44 +0100 Subject: [PATCH] Tokenizer: Add &|&&| to Tokenizer::isFunctionHead() --- lib/tokenize.cpp | 2 +- lib/tokenize.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index c82a5bce5..04f3278c3 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -58,7 +58,7 @@ const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &end return nullptr; if (tok->str() == "(") tok = tok->link(); - if (Token::Match(tok, ") const| [;:{]")) { + if (Token::Match(tok, ") const| &|&&| [;:{]")) { tok = tok->next(); if (tok->isName()) tok = tok->next(); diff --git a/lib/tokenize.h b/lib/tokenize.h index 7f2d9c3e0..4f575b08a 100644 --- a/lib/tokenize.h +++ b/lib/tokenize.h @@ -525,8 +525,6 @@ public: */ static std::string simplifyString(const std::string &source); -private: - /** * is token pointing at function head? * @param tok A '(' or ')' token in a possible function head @@ -535,6 +533,7 @@ private: */ const Token * isFunctionHead(const Token *tok, const std::string &endsWith) const; +private: /** * simplify "while (0)" */