better object parsing

PhilipDeegan · Sep 30, 2024 · 050ad4f · 050ad4f
1 parent c78569c
commit 050ad4f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -24,4 +24,5 @@ jobs:
         KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build -Op test_mod -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build test pack -Op test -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
+        KLOG=3 ./mkn build -dtOp format -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         ldd bin/build/mkn
diff --git a/inc/maiken/project.hpp b/inc/maiken/project.hpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace maiken {
 
 struct ProjectInfo {
-  std::string local /*&*/, profiles, name, version /*#*/, scm;
+  std::string local /*&*/, profiles, name, version /*#*/, scm, bon = "";
 
   ProjectInfo static PARSE_LINE(std::string const& line);
 };

diff --git a/mkn.yaml b/mkn.yaml
@@ -3,7 +3,7 @@
 name: mkn
 version: master
 property:
-  DATE: 29-SEP-2024
+  DATE: 30-SEP-2024
 
 parent: bin
 mode: none
@@ -67,11 +67,14 @@ profile:
   main: server.cpp
   mode: none
 
-- name: format
+- name: format_a
   mod:
   - name: clang.format
     version: ${version}
     init:
       style: file
       paths: .
 
+- name: format
+  mod: |
+    clang.format{init:{style: google, paths: .}}
diff --git a/src/maiken/mods.cpp b/src/maiken/mods.cpp
@@ -64,22 +64,13 @@ void maiken::Application::mod(mkn::kul::hash::set::String& mods, std::vector<YAM
     auto& node = mod_nodes.emplace_back();
 
     ProjectInfo pInfo = ProjectInfo::PARSE_LINE(mod);
-
-    auto& [local, profiles, proj, version, scm] = pInfo;
-    // KLOG(INF) << proj;
-    std::string objs;
+    auto& [local, profiles, proj, version, scm, curlies] = pInfo;
 
     if (!node[STR_SCM] && scm.size()) node[STR_SCM] = scm;
     if (!node[STR_PROFILE] && profiles.size()) node[STR_PROFILE] = profiles;
 
     {
-      auto lbrak = proj.find("{"), rbrak = proj.rfind("}");
-      if (lbrak != std::string::npos) {
-        if (rbrak == std::string::npos) KEXIT(1, "Invalid -m - missing right } bracket");
-        objs = proj.substr(lbrak), proj = proj.substr(0, lbrak);
-      }
-
-      auto am = proj.find("&"), ha = proj.find("#");
+      auto const am = proj.find("&"), ha = proj.find("#");
       if (proj == this->project().root()[STR_NAME].Scalar()) {
         node[STR_LOCAL] = ".";
         if (am != std::string::npos || ha != std::string::npos)
@@ -88,7 +79,7 @@ void maiken::Application::mod(mkn::kul::hash::set::String& mods, std::vector<YAM
                 "location");
       }
 
-      auto if_set = [&](auto& v, auto n) {
+      auto const if_set = [&](auto& v, auto n) {
         if (v.size()) n = v;
       };
       if_set(local, node[STR_LOCAL]);
@@ -108,8 +99,8 @@ void maiken::Application::mod(mkn::kul::hash::set::String& mods, std::vector<YAM
     }
     if (!proj.empty()) node[STR_NAME] = proj;
 
-    if (objs.size())
-      for (auto const p : mkn::kul::bon::from(objs)) node[p.first] = p.second;
+    if (curlies.size())
+      for (auto const p : mkn::kul::bon::from("{" + curlies + "}")) node[p.first] = p.second;
 
     YAML::Emitter out;
     out << node;

diff --git a/src/project.cpp b/src/project.cpp
@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maiken/project.hpp"
 
 maiken::ProjectInfo maiken::ProjectInfo::PARSE_LINE(std::string const& line) {
-  std::string local /*&*/, profiles, proj = line, version /*#*/, scm;
+  std::string local /*&*/, profiles, proj = line, version /*#*/, scm, bon;
 
   auto get_between = [&](auto& var, auto lbrak, auto rbrak) {
     auto between = maiken::string::between_rm_str(proj, lbrak, rbrak);
@@ -46,6 +46,8 @@ maiken::ProjectInfo maiken::ProjectInfo::PARSE_LINE(std::string const& line) {
 
   if (!get_between(scm, "(", ")")) KEXIT(1, "Invalid -m - missing right ) bracket");
   if (!get_between(profiles, "[", "]")) KEXIT(1, "Invalid -m - missing right ] bracket");
+  if (!get_between(bon, "{", "}")) KEXIT(1, "Invalid -m - missing right } bracket");
+
   mkn::kul::String::REPLACE_ALL(profiles, ",", " ");
 
   auto am = proj.find("&"), ha = proj.find("#");
@@ -61,7 +63,7 @@ maiken::ProjectInfo maiken::ProjectInfo::PARSE_LINE(std::string const& line) {
   if (version.size() == 0 && scm.size() && !Github::GET_LATEST(scm, version)) version = "";
 #endif
 
-  return {local, profiles, proj, version, scm.size() ? scm : proj};
+  return {local, profiles, proj, version, scm.size() ? scm : proj, bon};
 }
 
 mkn::kul::yaml::Validator maiken::Project::validator() const {