bon++

Author: PhilipDeegan

inc/mkn/kul/bon.hpp

@@ -81,19 +81,17 @@ class ob {
 
  private:
   static void BUILD(BonParsableNode const& node, ob& o) {
-    KLOG(INF) << node.ss.str() << " " << o.p;
-
     if (!node.nodes.size())
       o.a = node.ss.str();
     else
       o.v = node.ss.str();
 
     mkn::kul::String::TRIM(o.a);
     mkn::kul::String::TRIM(o.v);
-    if (o.v.back() == ':')) {
-        o.v = o.v.substr(0, o.v.size() - 1);
-        mkn::kul::String::TRIM(o.v);
-      }
+    if (o.v.back() == ':') {
+      o.v = o.v.substr(0, o.v.size() - 1);
+      mkn::kul::String::TRIM(o.v);
+    }
 
     for (auto const& n : node.nodes) {
       o.c.emplace_back().p = &o;
@@ -113,15 +111,25 @@ class ob {
     auto vals = mkn::kul::String::ESC_SPLIT(o.a, ',');
     if (o.a.find(":") == std::string::npos) {  // list
 
-      for (std::size_t i = 0; i < vals.size(); ++i) {
-        auto p = mkn::kul::String::ESC_SPLIT(vals[i], ':');
-        KLOG(INF) << p[0];
+      if (vals.size() == 1) {
+        auto p = mkn::kul::String::ESC_SPLIT(vals[0], ':');
+
         if (p.size() == 1) {
           mkn::kul::String::TRIM(p);
-          n.push_back(p[0]);
+          n = p[0];
         } else
           KEXCEPTION("FAIL");
-      }
+
+      } else
+        for (std::size_t i = 0; i < vals.size(); ++i) {
+          auto p = mkn::kul::String::ESC_SPLIT(vals[i], ':');
+
+          if (p.size() == 1) {
+            mkn::kul::String::TRIM(p);
+            n.push_back(p[0]);
+          } else
+            KEXCEPTION("FAIL");
+        }
     } else  // map
       for (auto const& v : vals) {
         auto p = mkn::kul::String::ESC_SPLIT(v, ':');
@@ -178,11 +186,8 @@ YAML::Node from(std::string const& s) {
 
   if (open) c_check();
   for (auto const& o : obs) nodes.emplace_back(o.to_yaml());
-  auto const ret = YAML::Node(nodes);
-  YAML::Emitter out;
-  out << ret;
-  KLOG(INF) << out.c_str();
-  return ret;
+  assert(obs.size() == 1);
+  return obs[0].to_yaml();
 }
 
 }  // namespace bon

test/test_yaml/bon.cpp

@@ -0,0 +1,19 @@
+
+
+#include "gtest/gtest.h"
+
+#include "mkn/kul/bon.hpp"
+
+TEST(Bon, parseString) {
+  auto node = mkn::kul::bon::from("{rofl:{copter}}");
+
+  for (auto const& el : node) {
+    EXPECT_EQ(el.first.as<std::string>(), "rofl");
+    EXPECT_EQ(el.second.as<std::string>(), "copter");
+  }
+}
+
+int main(int argc, char* argv[]) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}