fix #14034: AST broken for 'or' keyword (danmar#7698)

Author: ludviggunne

lib/tokenize.cpp

@@ -7682,7 +7682,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
             if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=]"))
                 return false;
 
-            if (!Token::Match(tok->previous(), "%name%|%num%|%char%|)|]|> %name% %name%|%num%|%char%|%op%|("))
+            if (!Token::Match(tok->previous(), "%name%|%num%|%char%|%str%|)|]|> %name% %name%|%num%|%char%|%op%|%str%|("))
                 continue;
             if (Token::Match(tok->next(), "%assign%|%or%|%oror%|&&|*|/|%|^") && !Token::Match(tok->previous(), "%num%|%char%|) %name% *"))
                 continue;

test/testtokenize.cpp

@@ -405,6 +405,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astdecltypescope);
         TEST_CASE(astdesignatedinit);
         TEST_CASE(astrvaluedecl);
+        TEST_CASE(astorkeyword);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -6205,6 +6206,7 @@ class TestTokenizer : public TestFixture {
         tokenizer.simplifySpaceshipOperator();
         tokenizer.createLinks();
         tokenizer.createLinks2();
+        tokenizer.simplifyCAlternativeTokens();
         tokenizer.list.front()->assignIndexes();
 
         // set varid..
@@ -7188,6 +7190,10 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("varstdmove::var(=", testAst("std::string&& var = std::move(var);"));
     }
 
+    void astorkeyword() {
+        ASSERT_EQUALS("ifsp.\"\"==sp.0==||(", testAst("void f() { if (s.p == \"\" or s.p == 0) {} }"));
+    }
+
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
     template<size_t size>
     bool isStartOfExecutableScope_(int offset, const char (&code)[size], const char* file, int line) {