Split and merge manifest value/comment pair differently depending on whether it is multiline or not

4 files changed, 141 insertions, 6 deletions

diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx
index 6924321..56c614a 100644
--- a/tests/manifest-parser/driver.cxx
+++ b/tests/manifest-parser/driver.cxx
@@ -164,14 +164,18 @@ namespace butl
 
     // Manifest value splitting (into the value/comment pair).
     //
+    // Single-line.
+    //
     {
-      auto p (manifest_parser::split_comment ("value\\; text ; comment text"));
-      assert (p.first == "value; text" && p.second == "comment text");
+      auto p (manifest_parser::split_comment (
+                "\\value\\\\\\; text ; comment text"));
+
+      assert (p.first == "\\value\\; text" && p.second == "comment text");
     }
 
     {
-      auto p (manifest_parser::split_comment ("value"));
-      assert (p.first == "value" && p.second == "");
+      auto p (manifest_parser::split_comment ("value\\"));
+      assert (p.first == "value\\" && p.second == "");
     }
 
     {
@@ -179,6 +183,59 @@ namespace butl
       assert (p.first == "" && p.second == "comment");
     }
 
+    // Multi-line.
+    //
+    {
+      auto p (manifest_parser::split_comment ("value\n;"));
+      assert (p.first == "value" && p.second == "");
+    }
+
+    {
+      auto p (manifest_parser::split_comment ("value\ntext\n"));
+      assert (p.first == "value\ntext\n" && p.second == "");
+    }
+
+    {
+      auto p (manifest_parser::split_comment ("value\ntext\n;"));
+      assert (p.first == "value\ntext" && p.second == "");
+    }
+
+    {
+      auto p (manifest_parser::split_comment ("value\ntext\n;\n"));
+      assert (p.first == "value\ntext" && p.second == "");
+    }
+
+    {
+      auto p (manifest_parser::split_comment ("\n\\\nvalue\ntext\n"
+                                              ";\n"
+                                              "\n\n comment\ntext"));
+
+      assert (p.first == "\n\\\nvalue\ntext" && p.second ==
+              "\n\n comment\ntext");
+    }
+
+    {
+      auto p (manifest_parser::split_comment ("\n;\ncomment"));
+      assert (p.first == "" && p.second == "comment");
+    }
+
+    {
+      auto p (manifest_parser::split_comment (";\ncomment"));
+      assert (p.first == "" && p.second == "comment");
+    }
+
+    {
+      auto p (manifest_parser::split_comment (";\n"));
+      assert (p.first == "" && p.second == "");
+    }
+
+    {
+      auto p (manifest_parser::split_comment (
+                "\\;\n\\\\;\n\\\\\\;\n\\\\\\\\;\n\\\\\\\\\\;"));
+
+      assert (p.first == ";\n\\;\n\\;\n\\\\;\n\\\\;" && p.second == "");
+    }
+
     // UTF-8.
     //
     assert (test (":1\n#\xD0\xB0\n\xD0\xB0y\xD0\xB0:\xD0\xB0z\xD0\xB0",
diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx
index 5dc5862..c63a729 100644
--- a/tests/manifest-roundtrip/driver.cxx
+++ b/tests/manifest-roundtrip/driver.cxx
@@ -22,11 +22,16 @@ using namespace butl;
 // -m
 //    Serialize multi-line manifest values using the v2 form.
 //
+// -s
+//    Split values into the value/comment pairs and merge them back before
+//    printing.
+//
 int
 main (int argc, const char* argv[])
 try
 {
   bool multiline_v2 (false);
+  bool split (false);
 
   for (int i (1); i != argc; ++i)
   {
@@ -34,6 +39,8 @@ try
 
     if (v == "-m")
       multiline_v2 = true;
+    else if (v == "-s")
+      split = true;
   }
 
   // Read/write in binary mode.
@@ -61,6 +68,12 @@ try
     else
       eom = false;
 
+    if (split)
+    {
+      const auto& vc (manifest_parser::split_comment (nv.value));
+      nv.value = manifest_serializer::merge_comment (vc.first, vc.second);
+    }
+
     s.next (nv.name, nv.value);
   }
 }
diff --git a/tests/manifest-roundtrip/testscript b/tests/manifest-roundtrip/testscript
index e0a15cc..a228b0f 100644
--- a/tests/manifest-roundtrip/testscript
+++ b/tests/manifest-roundtrip/testscript
@@ -76,3 +76,43 @@ $* -m <<EOF >>EOF
   c:\windows\\
   \
   EOF
+
+: split-merge-comment
+:
+$* -s <<EOF >>EOF
+  : 1
+  info:\
+  value
+  text
+  \
+  info:\
+  value
+  text
+  ;
+  comment
+  \
+  info:\
+  ;
+  comment
+  text
+  \
+  info:\
+  value
+  \;
+  \\
+  ;
+  comment
+  \
+  info:\
+  value
+  \\;
+  ;
+  comment
+  \
+  info:\
+  value
+  \\\\;
+  ;
+  comment
+  \
+  EOF
diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx
index be3ae25..a003fa4 100644
--- a/tests/manifest-serializer/driver.cxx
+++ b/tests/manifest-serializer/driver.cxx
@@ -251,12 +251,37 @@ main ()
 
   // Manifest value/comment merging.
   //
-  assert (manifest_serializer::merge_comment ("value; text", "comment") ==
-          "value\\; text; comment");
+  // Single-line.
+  //
+  assert (manifest_serializer::merge_comment ("value\\; text", "comment") ==
+          "value\\\\\\; text; comment");
 
   assert (manifest_serializer::merge_comment ("value text", "") ==
           "value text");
 
+  // Multi-line.
+  //
+  assert (manifest_serializer::merge_comment ("value\n;\ntext", "comment") ==
+          "value\n\\;\ntext\n;\ncomment");
+
+  assert (manifest_serializer::merge_comment ("value\n\\;\ntext\n",
+                                              "comment") ==
+          "value\n\\\\;\ntext\n\n;\ncomment");
+
+  assert (manifest_serializer::merge_comment ("value\n\\\\;\ntext\n",
+                                              "comment") ==
+          "value\n\\\\\\\\;\ntext\n\n;\ncomment");
+
+
+  assert (manifest_serializer::merge_comment ("value\n\\\ntext", "comment") ==
+          "value\n\\\ntext\n;\ncomment");
+
+  assert (manifest_serializer::merge_comment ("\\", "comment\n") ==
+          "\\\n;\ncomment\n");
+
+  assert (manifest_serializer::merge_comment ("", "comment\ntext") ==
+          ";\ncomment\ntext");
+
   // Filtering.
   //
   assert (test ({{"","1"},{"a","abc"},{"b","bca"},{"c","cab"},{"",""},{"",""}},