1 files changed, 299 insertions, 187 deletions

diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx
index f157039..d11ba8f 100644
--- a/tests/manifest-parser/driver.cxx
+++ b/tests/manifest-parser/driver.cxx
@@ -19,240 +19,352 @@
 import std.core;
 import std.io;
 #endif
+import butl.optional;
 import butl.manifest_parser;
 #else
+#include <libbutl/optional.mxx>
 #include <libbutl/manifest-parser.mxx>
 #endif
 
 using namespace std;
-using namespace butl;
 
-using pairs = vector<pair<string, string>>;
+namespace butl
+{
+  using butl::optional;
+  using butl::nullopt;
 
-static bool
-test (const char* manifest,
-      const pairs& expected,
-      manifest_parser::filter_function = {});
+  using pairs = vector<pair<string, string>>;
 
-static bool
-fail (const char* manifest);
+  static optional<pairs>
+  to_pairs (optional<vector<manifest_name_value>>&&);
 
-int
-main ()
-{
-  // Whitespaces and comments.
-  //
-  assert (test (" \t", {{"",""}}));
-  assert (test (" \t\n \n\n", {{"",""}}));
-  assert (test ("# one\n  #two", {{"",""}}));
+  static bool
+  equal (const optional<pairs>& actual, const optional<pairs>& expected);
 
-  // Test encountering eos at various points.
+  // Test manifest as it is represented in the stream, including format
+  // version and end-of-manifest values.
   //
-  assert (test ("", {{"",""}}));
-  assert (test (" ", {{"",""}}));
-  assert (test ("\n", {{"",""}}));
-  assert (fail ("a"));
-  assert (test (":1\na:", {{"","1"},{"a", ""},{"",""},{"",""}}));
+  static bool
+  test (const char* manifest,
+        const pairs& expected,
+        manifest_parser::filter_function = {});
 
-  // Invalid manifests.
-  //
-  assert (fail ("a:"));          // format version pair expected
-  assert (fail (":"));           // format version value expected
-  assert (fail (":9"));          // unsupported format version
-  assert (fail ("a"));           // ':' expected after name
-  assert (fail ("a b"));         // ':' expected after name
-  assert (fail ("a\tb"));        // ':' expected after name
-  assert (fail ("a\nb"));        // ':' expected after name
-  assert (fail (":1\na:b\n:9")); // unsupported format version
-
-  // Empty manifest.
-  //
-  assert (test (":1", {{"","1"},{"",""},{"",""}}));
-  assert (test (" \t :1", {{"","1"},{"",""},{"",""}}));
-  assert (test (" \t : 1", {{"","1"},{"",""},{"",""}}));
-  assert (test (" \t : 1 ", {{"","1"},{"",""},{"",""}}));
-  assert (test (":1\n", {{"","1"},{"",""},{"",""}}));
-  assert (test (":1 \n", {{"","1"},{"",""},{"",""}}));
-
-  // Single manifest.
-  //
-  assert (test (":1\na:x", {{"","1"},{"a", "x"},{"",""},{"",""}}));
-  assert (test (":1\na:x\n", {{"","1"},{"a","x"},{"",""},{"",""}}));
-  assert (test (":1\na:x\nb:y",
-                {{"","1"},{"a","x"},{"b","y"},{"",""},{"",""}}));
-  assert (test (":1\na:x\n\tb : y\n  #comment",
-                {{"","1"},{"a","x"},{"b","y"},{"",""},{"",""}}));
-
-  // Multiple manifests.
-  //
-  assert (test (":1\na:x\n:\nb:y",
-                {{"","1"},{"a", "x"},{"",""},
-                 {"","1"},{"b", "y"},{"",""},{"",""}}));
-  assert (test (":1\na:x\n:1\nb:y",
-                {{"","1"},{"a", "x"},{"",""},
-                 {"","1"},{"b", "y"},{"",""},{"",""}}));
-  assert (test (":1\na:x\n:\nb:y\n:\nc:z\n",
-                {{"","1"},{"a", "x"},{"",""},
-                 {"","1"},{"b", "y"},{"",""},
-                 {"","1"},{"c", "z"},{"",""},{"",""}}));
-
-  // Name parsing.
-  //
-  assert (test (":1\nabc:", {{"","1"},{"abc",""},{"",""},{"",""}}));
-  assert (test (":1\nabc :", {{"","1"},{"abc",""},{"",""},{"",""}}));
-  assert (test (":1\nabc\t:", {{"","1"},{"abc",""},{"",""},{"",""}}));
+  static bool
+  fail (const char* manifest);
 
-  // Simple value parsing.
+  // Test manifest as it is returned by parse_manifest(), without the special
+  // format version and end-of-manifest values.
   //
-  assert (test (":1\na: \t xyz \t ", {{"","1"},{"a","xyz"},{"",""},{"",""}}));
+  static bool
+  test_parse (const char* manifest, const optional<pairs>& expected);
 
-  // Simple value escaping.
-  //
-  assert (test (":1\na:x\\", {{"","1"},{"a","x"},{"",""},{"",""}}));
-  assert (test (":1\na:x\\\ny", {{"","1"},{"a","xy"},{"",""},{"",""}}));
-  assert (test (":1\na:x\\\\\nb:",
-                {{"","1"},{"a","x\\"},{"b",""},{"",""},{"",""}}));
-  assert (test (":1\na:x\\\\\\\nb:",
-                {{"","1"},{"a","x\\\\"},{"b",""},{"",""},{"",""}}));
-
-  // Simple value literal newline.
-  //
-  assert (test (":1\na:x\\\n\\", {{"","1"},{"a","x\n"},{"",""},{"",""}}));
-  assert (test (":1\na:x\\\n\\\ny", {{"","1"},{"a","x\ny"},{"",""},{"",""}}));
-  assert (test (":1\na:x\\\n\\\ny\\\n\\\nz",
-                {{"","1"},{"a","x\ny\nz"},{"",""},{"",""}}));
+  static bool
+  fail_parse (const char* manifest);
 
-  // Multi-line value parsing.
-  //
-  assert (test (":1\na:\\", {{"","1"},{"a", ""},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n", {{"","1"},{"a", ""},{"",""},{"",""}}));
-  assert (test (":1\na:\\x", {{"","1"},{"a", "\\x"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n\\", {{"","1"},{"a", ""},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n\\\n", {{"","1"},{"a", ""},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n\\x\n\\",
-                {{"","1"},{"a", "\\x"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\nx\ny", {{"","1"},{"a", "x\ny"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n \n#\t\n\\",
-                {{"","1"},{"a", " \n#\t"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\n\n\n\\", {{"","1"},{"a", "\n"},{"",""},{"",""}}));
-
-  // Multi-line value escaping.
-  //
-  assert (test (":1\na:\\\nx\\", {{"","1"},{"a","x"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\nx\\\ny\n\\",
-                {{"","1"},{"a","xy"},{"",""},{"",""}}));
-  assert (test (":1\na:\\\nx\\\\\n\\\nb:",
-                {{"","1"},{"a","x\\"},{"b",""},{"",""},{"",""}}));
-  assert (test (":1\na:\\\nx\\\\\\\n\\\nb:",
-                {{"","1"},{"a","x\\\\"},{"b",""},{"",""},{"",""}}));
-
-  // Manifest value splitting (into the value/comment pair).
-  //
+  int
+  main ()
   {
-    auto p (manifest_parser::split_comment ("value\\; text ; comment text"));
-    assert (p.first == "value; text" && p.second == "comment text");
+    // Whitespaces and comments.
+    //
+    assert (test (" \t", {{"",""}}));
+    assert (test (" \t\n \n\n", {{"",""}}));
+    assert (test ("# one\n  #two", {{"",""}}));
+
+    // Test encountering eos at various points.
+    //
+    assert (test ("", {{"",""}}));
+    assert (test (" ", {{"",""}}));
+    assert (test ("\n", {{"",""}}));
+    assert (fail ("a"));
+    assert (test (":1\na:", {{"","1"},{"a", ""},{"",""},{"",""}}));
+
+    // Invalid manifests.
+    //
+    assert (fail ("a:"));          // format version pair expected
+    assert (fail (":"));           // format version value expected
+    assert (fail (":9"));          // unsupported format version
+    assert (fail ("a"));           // ':' expected after name
+    assert (fail ("a b"));         // ':' expected after name
+    assert (fail ("a\tb"));        // ':' expected after name
+    assert (fail ("a\nb"));        // ':' expected after name
+    assert (fail (":1\na:b\n:9")); // unsupported format version
+
+    // Empty manifest.
+    //
+    assert (test (":1", {{"","1"},{"",""},{"",""}}));
+    assert (test (" \t :1", {{"","1"},{"",""},{"",""}}));
+    assert (test (" \t : 1", {{"","1"},{"",""},{"",""}}));
+    assert (test (" \t : 1 ", {{"","1"},{"",""},{"",""}}));
+    assert (test (":1\n", {{"","1"},{"",""},{"",""}}));
+    assert (test (":1 \n", {{"","1"},{"",""},{"",""}}));
+
+    // Single manifest.
+    //
+    assert (test (":1\na:x", {{"","1"},{"a", "x"},{"",""},{"",""}}));
+    assert (test (":1\na:x\n", {{"","1"},{"a","x"},{"",""},{"",""}}));
+    assert (test (":1\na:x\nb:y",
+                  {{"","1"},{"a","x"},{"b","y"},{"",""},{"",""}}));
+    assert (test (":1\na:x\n\tb : y\n  #comment",
+                  {{"","1"},{"a","x"},{"b","y"},{"",""},{"",""}}));
+
+    // Multiple manifests.
+    //
+    assert (test (":1\na:x\n:\nb:y",
+                  {{"","1"},{"a", "x"},{"",""},
+                   {"","1"},{"b", "y"},{"",""},{"",""}}));
+    assert (test (":1\na:x\n:1\nb:y",
+                  {{"","1"},{"a", "x"},{"",""},
+                   {"","1"},{"b", "y"},{"",""},{"",""}}));
+    assert (test (":1\na:x\n:\nb:y\n:\nc:z\n",
+                  {{"","1"},{"a", "x"},{"",""},
+                   {"","1"},{"b", "y"},{"",""},
+                   {"","1"},{"c", "z"},{"",""},{"",""}}));
+
+    // Name parsing.
+    //
+    assert (test (":1\nabc:", {{"","1"},{"abc",""},{"",""},{"",""}}));
+    assert (test (":1\nabc :", {{"","1"},{"abc",""},{"",""},{"",""}}));
+    assert (test (":1\nabc\t:", {{"","1"},{"abc",""},{"",""},{"",""}}));
+
+    // Simple value parsing.
+    //
+    assert (test (":1\na: \t xyz \t ",
+                  {{"","1"},{"a","xyz"},{"",""},{"",""}}));
+
+    // Simple value escaping.
+    //
+    assert (test (":1\na:x\\", {{"","1"},{"a","x"},{"",""},{"",""}}));
+    assert (test (":1\na:x\\\ny", {{"","1"},{"a","xy"},{"",""},{"",""}}));
+    assert (test (":1\na:x\\\\\nb:",
+                  {{"","1"},{"a","x\\"},{"b",""},{"",""},{"",""}}));
+    assert (test (":1\na:x\\\\\\\nb:",
+                  {{"","1"},{"a","x\\\\"},{"b",""},{"",""},{"",""}}));
+
+    // Simple value literal newline.
+    //
+    assert (test (":1\na:x\\\n\\", {{"","1"},{"a","x\n"},{"",""},{"",""}}));
+    assert (test (":1\na:x\\\n\\\ny",
+                  {{"","1"},{"a","x\ny"},{"",""},{"",""}}));
+    assert (test (":1\na:x\\\n\\\ny\\\n\\\nz",
+                  {{"","1"},{"a","x\ny\nz"},{"",""},{"",""}}));
+
+    // Multi-line value parsing.
+    //
+    assert (test (":1\na:\\", {{"","1"},{"a", ""},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n", {{"","1"},{"a", ""},{"",""},{"",""}}));
+    assert (test (":1\na:\\x", {{"","1"},{"a", "\\x"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n\\", {{"","1"},{"a", ""},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n\\\n", {{"","1"},{"a", ""},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n\\x\n\\",
+                  {{"","1"},{"a", "\\x"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\nx\ny", {{"","1"},{"a", "x\ny"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n \n#\t\n\\",
+                  {{"","1"},{"a", " \n#\t"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\n\n\n\\", {{"","1"},{"a", "\n"},{"",""},{"",""}}));
+
+    // Multi-line value escaping.
+    //
+    assert (test (":1\na:\\\nx\\", {{"","1"},{"a","x"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\nx\\\ny\n\\",
+                  {{"","1"},{"a","xy"},{"",""},{"",""}}));
+    assert (test (":1\na:\\\nx\\\\\n\\\nb:",
+                  {{"","1"},{"a","x\\"},{"b",""},{"",""},{"",""}}));
+    assert (test (":1\na:\\\nx\\\\\\\n\\\nb:",
+                  {{"","1"},{"a","x\\\\"},{"b",""},{"",""},{"",""}}));
+
+    // Manifest value splitting (into the value/comment pair).
+    //
+    {
+      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 ("; comment"));
+      assert (p.first == "" && p.second == "comment");
+    }
+
+    // Filtering.
+    //
+    assert (test (":1\na: abc\nb: bca\nc: cab",
+                  {{"","1"},{"a","abc"},{"c","cab"},{"",""},{"",""}},
+                  [] (manifest_name_value& nv) {return nv.name != "b";}));
+
+    assert (test (":1\na: abc\nb: bca",
+                  {{"","1"},{"ax","abc."},{"bx","bca."},{"",""},{"",""}},
+                  [] (manifest_name_value& nv)
+                  {
+                    if (!nv.name.empty ())
+                    {
+                      nv.name += 'x';
+                      nv.value += '.';
+                    }
+
+                    return true;
+                  }));
+
+    // Test parse_manifest().
+    //
+    test_parse ("", nullopt);
+    test_parse (":1", pairs ());
+    test_parse (":1\na: abc\nb: cde", pairs ({{"a", "abc"}, {"b", "cde"}}));
+
+    fail_parse ("# abc");
+    fail_parse ("a: abc");
+
+    // Parse the manifest list.
+    //
+    {
+      istringstream is (":1\na: abc\nb: bcd\n:\nx: xyz");
+      is.exceptions (istream::failbit | istream::badbit);
+      manifest_parser p (is, "");
+
+      equal (to_pairs (try_parse_manifest (p)),
+            pairs ({{"a", "abc"}, {"b", "bcd"}}));
+
+      equal (to_pairs (try_parse_manifest (p)), pairs ({{"x", "xyz"}}));
+      equal (to_pairs (try_parse_manifest (p)), nullopt);
+    }
+
+    return 0;
   }
 
+  static ostream&
+  operator<< (ostream& os, const pairs& ps)
   {
-    auto p (manifest_parser::split_comment ("value"));
-    assert (p.first == "value" && p.second == "");
+    os << '{';
+
+    bool f (true);
+    for (const auto& p: ps)
+      os << (f ? (f = false, "") : ",")
+         << '{' << p.first << ',' << p.second << '}';
+
+    os << '}';
+    return os;
   }
 
+  static ostream&
+  operator<< (ostream& os, const optional<pairs>& ps)
   {
-    auto p (manifest_parser::split_comment ("; comment"));
-    assert (p.first == "" && p.second == "comment");
+    return ps ? (os << *ps) : (os << "[null]");
   }
 
-  // Filtering.
-  //
-  assert (test (":1\na: abc\nb: bca\nc: cab",
-                {{"","1"},{"a","abc"},{"c","cab"},{"",""},{"",""}},
-                [] (manifest_name_value& nv) {return nv.name != "b";}));
-
-  assert (test (":1\na: abc\nb: bca",
-                {{"","1"},{"ax","abc."},{"bx","bca."},{"",""},{"",""}},
-                [] (manifest_name_value& nv)
-                {
-                  if (!nv.name.empty ())
-                  {
-                    nv.name += 'x';
-                    nv.value += '.';
-                  }
-
-                  return true;
-                }));
-}
+  static bool
+  equal (const optional<pairs>& a, const optional<pairs>& e)
+  {
+    if (a != e)
+    {
+      cerr << "actual: " << a << endl
+           << "expect: " << e << endl;
 
-static ostream&
-operator<< (ostream& os, const pairs& ps)
-{
-  os << '{';
+      return false;
+    }
 
-  bool f (true);
-  for (const auto& p: ps)
-    os << (f ? (f = false, "") : ",")
-       << '{' << p.first << ',' << p.second << '}';
+    return true;
+  }
 
-  os << '}';
-  return os;
-}
+  static optional<pairs>
+  to_pairs (optional<vector<manifest_name_value>>&& nvs)
+  {
+    if (!nvs)
+      return nullopt;
 
-static pairs
-parse (const char* m, manifest_parser::filter_function f = {})
-{
-  istringstream is (m);
-  is.exceptions (istream::failbit | istream::badbit);
-  manifest_parser p (is, "", move (f));
+    pairs r;
+    for (manifest_name_value& nv: *nvs)
+      r.emplace_back (move (nv.name), move (nv.value));
 
-  pairs r;
+    return r;
+  }
 
-  for (bool eom (true), eos (false); !eos; )
+  static pairs
+  parse (const char* m, manifest_parser::filter_function f = {})
   {
-    manifest_name_value nv (p.next ());
+    istringstream is (m);
+    is.exceptions (istream::failbit | istream::badbit);
+    manifest_parser p (is, "", move (f));
 
-    if (nv.empty ()) // End pair.
+    pairs r;
+
+    for (bool eom (true), eos (false); !eos; )
     {
-      eos = eom;
-      eom = true;
+      manifest_name_value nv (p.next ());
+
+      if (nv.empty ()) // End pair.
+      {
+        eos = eom;
+        eom = true;
+      }
+      else
+        eom = false;
+
+      r.emplace_back (move (nv.name), move (nv.value));
     }
-    else
-      eom = false;
 
-    r.emplace_back (move (nv.name), move (nv.value));
+    return r;
   }
 
-  return r;
-}
-
-static bool
-test (const char* m, const pairs& e, manifest_parser::filter_function f)
-{
-  pairs r (parse (m, move (f)));
+  static bool
+  test (const char* m, const pairs& e, manifest_parser::filter_function f)
+  {
+    return equal (parse (m, move (f)), e);
+  }
 
-  if (r != e)
+  static bool
+  fail (const char* m)
   {
-    cerr << "actual: " << r << endl
-         << "expect: " << e << endl;
+    try
+    {
+      pairs r (parse (m));
+      cerr << "nofail: " << r << endl;
+      return false;
+    }
+    catch (const manifest_parsing&)
+    {
+      //cerr << e << endl;
+    }
 
-    return false;
+    return true;
   }
 
-  return true;
-}
-
-static bool
-fail (const char* m)
-{
-  try
+  static bool
+  test_parse (const char* m, const optional<pairs>& e)
   {
-    pairs r (parse (m));
-    cerr << "nofail: " << r << endl;
-    return false;
+    istringstream is (m);
+    is.exceptions (istream::failbit | istream::badbit);
+    manifest_parser p (is, "");
+
+    return equal (to_pairs (try_parse_manifest (p)), e);
   }
-  catch (const manifest_parsing&)
+
+  static bool
+  fail_parse (const char* m)
   {
-    //cerr << e << endl;
+    try
+    {
+      istringstream is (m);
+      is.exceptions (istream::failbit | istream::badbit);
+      manifest_parser p (is, "");
+
+      optional<pairs> r (to_pairs (parse_manifest (p)));
+      cerr << "nofail: " << r << endl;
+      return false;
+    }
+    catch (const manifest_parsing&)
+    {
+      //cerr << e << endl;
+    }
+
+    return true;
   }
+}
 
-  return true;
+int
+main ()
+{
+  return butl::main ();
 }