From 9bdff0be148ab9ab29e51f69b75138064bd574eb Mon Sep 17 00:00:00 2001 From: modeco80 Date: Mon, 21 Oct 2024 12:38:39 -0400 Subject: [PATCH] fix parse bug I accidentally introduced --- vxheaven_parse.cpp | 4 ++-- vxorg.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vxheaven_parse.cpp b/vxheaven_parse.cpp index e5114ef..799488b 100644 --- a/vxheaven_parse.cpp +++ b/vxheaven_parse.cpp @@ -31,7 +31,7 @@ namespace vxorg { std::string sample_name {}; std::vector parent_list {}; vxorg::VxHeavenTree::Node* parent = node->parent_node(); - + while(parent) { if(parent->data().name.empty()) break; @@ -101,7 +101,7 @@ namespace vxorg { } if(split.size() > 4) { - auto subvariants = std::span(split.data() + 4, split.size() - 4); + auto subvariants = std::span(split.data() + 3, split.size() - 3); auto leaf = family_leaf; for(auto& subvariant : subvariants) { diff --git a/vxorg.cpp b/vxorg.cpp index 9082c23..a4969ee 100644 --- a/vxorg.cpp +++ b/vxorg.cpp @@ -13,11 +13,14 @@ int main() { // walk the resulting tree tree.walk([](auto* node) { - auto tab_count = node->parent_count(); + auto tabulation_level = node->parent_count(); auto& data = node->data(); - for(auto i = 0; i < tab_count; ++i) - std::printf("\t"); + if(tabulation_level != 0) { + for(auto i = 0; i < tabulation_level; ++i) { + std::printf("\t"); + } + } if(data.name.empty()) { std::printf("(root)\n");