Clang Import: Fix AST for 'new S;'

danmar · danmar · commit 9ed4dc419906 · 2020-10-29T20:52:09.000+01:00
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -694,6 +694,10 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         return createTokensCall(tokenList);
     if (nodeType == CXXNewExpr) {
         Token *newtok = addtoken(tokenList, "new");
+        if (children.size() == 1 && children[0]->nodeType == CXXConstructExpr) {
+            newtok->astOperand1(children[0]->createTokens(tokenList));
+            return newtok;
+        }
         std::string type = getType();
         if (type.find("*") != std::string::npos)
             type = type.erase(type.rfind("*"));
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -55,7 +55,8 @@ class TestClangImport: public TestFixture {
         TEST_CASE(cxxMethodDecl1);
         TEST_CASE(cxxMethodDecl2);
         TEST_CASE(cxxMethodDecl3);
-        TEST_CASE(cxxNewExpr);
+        TEST_CASE(cxxNewExpr1);
+        TEST_CASE(cxxNewExpr2);
         TEST_CASE(cxxNullPtrLiteralExpr);
         TEST_CASE(cxxOperatorCallExpr);
         TEST_CASE(cxxRecordDecl1);
@@ -504,7 +505,7 @@ class TestClangImport: public TestFixture {
                       "void foo ( ) { }", parse(clang));
     }
 
-    void cxxNewExpr() {
+    void cxxNewExpr1() {
         const char clang[] = "|-VarDecl 0x3a97680 <1.cpp:2:1, col:14> col:6 i 'int *' cinit\n"
                              "| `-CXXNewExpr 0x3a97d18 <col:10, col:14> 'int *' Function 0x3a97778 'operator new' 'void *(unsigned long)'\n"
                              "`-VarDecl 0x3a97d80 <line:3:1, col:21> col:6 j 'int *' cinit\n"
@@ -516,6 +517,17 @@ class TestClangImport: public TestFixture {
                       parse(clang));
     }
 
+    void cxxNewExpr2() {
+        const char clang[] = "|-FunctionDecl 0x59a188 <line:7:1, line:9:1> line:7:11 f 'struct S *()'\n"
+                             "| `-CompoundStmt 0x5c4318 <col:15, line:9:1>\n"
+                             "|   `-ReturnStmt 0x5c4308 <line:8:3, col:14>\n"
+                             "|     `-CXXNewExpr 0x5c42c8 <col:10, col:14> 'S *' Function 0x59a378 'operator new' 'void *(unsigned long)'\n"
+                             "|       `-CXXConstructExpr 0x5c42a0 <col:14> 'S' 'void () noexcept'";
+        ASSERT_EQUALS("struct S * f ( ) {\n"
+                      "return new S ( ) ; }",
+                      parse(clang));
+    }
+
     void cxxNullPtrLiteralExpr() {
         const char clang[] = "`-VarDecl 0x2a7d650 <1.cpp:1:1, col:17> col:13 p 'const char *' cinit\n"
                              "  `-ImplicitCastExpr 0x2a7d708 <col:17> 'const char *' <NullToPointer>\n"
