From ec59f1d9df5cdb83bc2a528e6ed49f46ea0a7a7e Mon Sep 17 00:00:00 2001 From: PKEuS Date: Mon, 30 Jun 2014 13:38:59 +0200 Subject: [PATCH] matchcompiler.py: Check Token::type() before comparing Token::str() against "||" or "|" --- tools/matchcompiler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/matchcompiler.py b/tools/matchcompiler.py index 1d3b01518..95c6b6585 100755 --- a/tools/matchcompiler.py +++ b/tools/matchcompiler.py @@ -106,9 +106,9 @@ class MatchCompiler: elif tok == '%op%': return 'tok->isOp()' elif tok == '%or%': - return '(tok->str()==' + self._insertMatchStr('|') + ')/* | */' + return '(tok->type() == Token::eBitOp && tok->str()==' + self._insertMatchStr('|') + ')/* | */' elif tok == '%oror%': - return '(tok->str()==' + self._insertMatchStr('||') + ')/* || */' + return '(tok->type() == Token::eLogicalOp && tok->str()==' + self._insertMatchStr('||') + ')/* || */' elif tok == '%str%': return '(tok->type()==Token::eString)' elif tok == '%type%':