Merge pull request #107 from andreasfertig/fixIssue106

Fix issue106

CodeGenerator.cpp

@@ -1094,21 +1094,33 @@ void CodeGenerator::InsertArg(const CXXNewExpr* stmt)
         });
     }
 
-    Dump(stmt);
-    Dump(stmt->getOperatorNew());
-
     if(const auto* ctorExpr = stmt->getConstructExpr()) {
         InsertArg(ctorExpr);
 
     } else {
-        mOutputFormatHelper.Append(GetName(stmt->getAllocatedType()));
+        auto name = GetName(stmt->getAllocatedType());
 
+        // Special handling for arrays. They differ from one to more dimensions.
         if(stmt->isArray()) {
-            mOutputFormatHelper.Append('[');
-            InsertArg(stmt->getArraySize());
-            mOutputFormatHelper.Append(']');
+            OutputFormatHelper ofm{};
+            CodeGenerator      codeGenerator{ofm};
+
+            ofm.Append("[");
+            codeGenerator.InsertArg(stmt->getArraySize());
+            ofm.Append(']');
+
+            // In case of multi dimension the first dimension is the getArraySize() while the others are part of the
+            // type included in GetName(...).
+            if(std::string::npos != name.find("[", 0)) {
+                InsertBefore(name, "[", ofm.GetString());
+            } else {
+                // here we have the single dimension case, the dimension is not part of GetName, so add it.
+                name.append(ofm.GetString());
+            }
         }
 
+        mOutputFormatHelper.Append(name);
+
         if(stmt->hasInitializer()) {
             InsertCurlysIfRequired(stmt->getInitializer());
         }

InsightsHelpers.cpp

@@ -334,7 +334,10 @@ std::string GetTypeNameAsParameter(const QualType& t, const std::string& varName
 {
     const bool isFunctionPointer = TestPlainSubType<LValueReferenceType, FunctionProtoType>(t);
     const bool isArrayRef        = TestPlainSubType<LValueReferenceType, ConstantArrayType>(t);
-    const bool isPointerToArray  = TestPlainSubType<PointerType, ConstantArrayType>(t);
+    // Special case for Issue81, auto returns an array-ref and to catch auto deducing an array (Issue106)
+    const bool isAutoType             = dyn_cast_or_null<AutoType>(t.getTypePtrOrNull());
+    const auto pointerToArrayBaseType = isAutoType ? t->getContainedAutoType()->getDeducedType() : t;
+    const bool isPointerToArray       = TestPlainSubType<PointerType, ConstantArrayType>(pointerToArrayBaseType);
 
     std::string typeName = details::GetName(t, unqualified);
 

tests/Issue106.cpp

@@ -0,0 +1,9 @@
+int main()
+{
+    auto p = new int[2][3][4];
+
+//    auto z = new int[1];
+
+//    auto x = new int;
+}
+

tests/Issue106.expect

@@ -0,0 +1,6 @@
+int main()
+{
+  int (*p)[3][4] = new int [2][3][4];
+}
+
+