Merge branch release-2021

[alexxy/gromacs.git] / src / gromacs / utility / keyvaluetree.cpp

diff --git a/src/gromacs/utility/keyvaluetree.cpp b/src/gromacs/utility/keyvaluetree.cpp
index ab7a55ea54fa761b89338628c86affd7166197ac..24fa2b3fd4845e5323f91a667bfc352da10c5ac0 100644 (file)
--- a/src/gromacs/utility/keyvaluetree.cpp
+++ b/src/gromacs/utility/keyvaluetree.cpp
@@ -113,6 +113,22 @@ void dumpKeyValueTree(TextWriter* writer, const KeyValueTreeObject& tree)
             dumpKeyValueTree(writer, value.asObject());
             writer->wrapperSettings().setIndent(oldIndent);
         }
+        else if (value.isArray()
+                 && std::all_of(value.asArray().values().begin(),
+                                value.asArray().values().end(),
+                                [](const auto& elem) { return elem.isObject(); }))
+        {
+            // Array containing only objects
+            writer->writeString(prop.key());
+            writer->writeLine(":");
+            int oldIndent = writer->wrapperSettings().indent();
+            writer->wrapperSettings().setIndent(oldIndent + 2);
+            for (const auto& elem : value.asArray().values())
+            {
+                dumpKeyValueTree(writer, elem.asObject());
+            }
+            writer->wrapperSettings().setIndent(oldIndent);
+        }
         else
         {
             int indent = writer->wrapperSettings().indent();
@@ -123,8 +139,10 @@ void dumpKeyValueTree(TextWriter* writer, const KeyValueTreeObject& tree)
                 writer->writeString("[");
                 for (const auto& elem : value.asArray().values())
                 {
-                    GMX_RELEASE_ASSERT(!elem.isObject() && !elem.isArray(),
-                                       "Arrays of objects not currently implemented");
+                    GMX_RELEASE_ASSERT(
+                            !elem.isObject() && !elem.isArray(),
+                            "Only arrays of simple types and array of objects are implemented. "
+                            "Arrays of arrays and mixed arrays are not supported.");
                     writer->writeString(" ");
                     writer->writeString(simpleValueToString(elem));
                 }