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

1 files changed, 61 insertions, 4 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",