Added support for P0960: Allow initializing aggregates from a parenth…

…esized list of values
andreasfertig · Jun 11, 2024 · 1b4bf2d · 1b4bf2d
1 parent 8e4c57b
commit 1b4bf2d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CodeGenerator.cpp b/CodeGenerator.cpp
@@ -1316,7 +1316,9 @@ void CodeGenerator::InsertArg(const VarDecl* stmt)
                     if(not(ctorExpr and ctorExpr->getConstructor()->isDefaultConstructor() and
                            ctorExpr->getConstructor()->getParent()->hasTrivialDefaultConstructor())) {
 
-                        mOutputFormatHelper.Append(hlpAssing);
+                        if(not isa<CXXParenListInitExpr>(init)) {
+                            mOutputFormatHelper.Append(hlpAssing);
+                        }
 
                         if(GetInsightsOptions().ShowLifetime and init->isXValue() and
                            stmt->getType()->isRValueReferenceType()) {
@@ -2005,6 +2007,12 @@ void CodeGenerator::InsertArg(const ParenExpr* stmt)
 }
 //-----------------------------------------------------------------------------
 
+void CodeGenerator::InsertArg(const CXXParenListInitExpr* stmt)
+{
+    WrapInParens([&]() { ForEachArg(stmt->getInitExprs(), [&](const auto& init) { InsertArg(init); }); });
+}
+//-----------------------------------------------------------------------------
+
 void CodeGenerator::InsertArg(const UnaryOperator* stmt)
 {
     StringRef  opCodeName = UnaryOperator::getOpcodeStr(stmt->getOpcode());

diff --git a/CodeGeneratorTypes.h b/CodeGeneratorTypes.h
@@ -133,6 +133,7 @@ SUPPORTED_STMT(ConceptSpecializationExpr)
 SUPPORTED_STMT(RequiresExpr)
 SUPPORTED_STMT(StmtExpr)
 SUPPORTED_STMT(SourceLocExpr)
+SUPPORTED_STMT(CXXParenListInitExpr)
 SUPPORTED_STMT(CppInsightsCommentStmt)
 
 #undef IGNORED_DECL

diff --git a/tests/p0960Test.cpp b/tests/p0960Test.cpp
@@ -0,0 +1,11 @@
+struct Point {
+  int y;
+  int x = 2;
+  int z;
+};
+
+int main()
+{
+  Point p (2, 3, 4);
+}
+