From 1d86fb1738e4307afd014b1589d77613f023bb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 10 Apr 2011 11:55:15 +0200 Subject: [PATCH] Tokenizer: Code cleanup. Use %oror% to simplify code. --- lib/tokenize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 89b13d9c4..627544009 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -6110,7 +6110,7 @@ void Tokenizer::simplifyIfNot() { for (Token *tok = _tokens; tok; tok = tok->next()) { - if (tok->str() == "(" || tok->str() == "||" || tok->str() == "&&") + if (Token::Match(tok, "(|&&|%oror%")) { tok = tok->next(); while (tok && tok->str() == "(") @@ -6181,7 +6181,7 @@ void Tokenizer::simplifyIfNotNull() { Token *deleteFrom = NULL; - if (tok->str() == "(" || tok->str() == "||" || tok->str() == "&&") + if (Token::Match(tok, "(|&&|%oror%")) { tok = tok->next();