File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1832,7 +1832,7 @@ void Tokenizer::combineOperators()
18321832 const char c2 = tok->next ()->str ()[0 ];
18331833
18341834 // combine +-*/ and =
1835- if (c2 == ' =' && (std::strchr (" +-*/%& |^=!<>" , c1))) {
1835+ if (c2 == ' =' && (std::strchr (" +-*/%|^=!<>" , c1))) {
18361836 tok->str (tok->str () + c2);
18371837 tok->deleteNext ();
18381838 continue ;
Original file line number Diff line number Diff line change @@ -911,6 +911,7 @@ class TestTokenizer : public TestFixture {
911911 ASSERT_EQUALS (" ; public: ;" , tokenizeAndStringify (" ;public:;" , false ));
912912 ASSERT_EQUALS (" ; __published: ;" , tokenizeAndStringify (" ;__published:;" , false ));
913913 ASSERT_EQUALS (" a . public : ;" , tokenizeAndStringify (" a.public:;" , false ));
914+ ASSERT_EQUALS (" void f ( x & = 2 ) ;" , tokenizeAndStringify (" void f(x &= 2);" , false ));
914915 }
915916
916917 void concatenateNegativeNumber () {
You can’t perform that action at this time.
0 commit comments