compound assignment

Author: danmar

lib/clangimport.cpp

@@ -414,9 +414,11 @@ namespace clangimport {
 
 std::string clangimport::AstNode::getSpelling() const
 {
-    if (mJsonObject.count("name") == 0)
-        return {};
-    return mJsonObject.at("name").get<std::string>();
+    if (mJsonObject.count("opcode") > 0)
+        return mJsonObject.at("opcode").get<std::string>();
+    if (mJsonObject.count("name") > 0)
+        return mJsonObject.at("name").get<std::string>();
+    return {};
 }
 
 std::string clangimport::AstNode::getQualType() const
@@ -751,7 +753,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     }
     if (mKind == BinaryOperator) {
         Token *tok1 = getChild(0)->createTokens(tokenList);
-        Token *binop = addtoken(tokenList, mJsonObject.at("opcode").get<std::string>());
+        Token *binop = addtoken(tokenList, getSpelling());
         Token *tok2 = children[1]->createTokens(tokenList);
         binop->astOperand1(tok1);
         binop->astOperand2(tok2);
@@ -1249,16 +1251,16 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return addtoken(tokenList, getSpelling());
     }
     if (mKind == UnaryOperator) {
-        const std::string& opcode = mJsonObject.at("opcode").get<std::string>();
+        const std::string& spelling = getSpelling();
         const bool postfix = mJsonObject.count("isPostfix") > 0 && mJsonObject.at("isPostfix").get<bool>();
         if (postfix) {
             Token* tok = getChild(0)->createTokens(tokenList);
-            Token *unaryOp = addtoken(tokenList, opcode);
+            Token *unaryOp = addtoken(tokenList, spelling);
             setValueType(unaryOp);
             unaryOp->astOperand1(tok);
             return unaryOp;
         } else {
-            Token *unaryOp = addtoken(tokenList, opcode);
+            Token *unaryOp = addtoken(tokenList, spelling);
             setValueType(unaryOp);
             unaryOp->astOperand1(getChild(0)->createTokens(tokenList));
             return unaryOp;

test/cli/clang-import_test.py

@@ -364,7 +364,7 @@ def test_tokens_function2(tmp_path):
 def test_tokens_function3(tmp_path):
     test_file = tmp_path / 'test.cpp'
     stdout = _run_cppcheck_debug(test_file, '\nint x; void foo(){ x |= 1 << 30; }')
-    assert '2: int ...void foo ( int x@var1 , int y@var2 ) { }' in stdout
+    assert '2: int x@var1 ; void foo ( ) { x@var1 |=@exprUNIQUE 1 <<@exprUNIQUE 30 ; }\n' in stdout
 
 def test_tokens_for(tmp_path):
     test_file = tmp_path / 'test.cpp'