From 79eb0adf9db942609b22d55ff764d1e759453543 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 12 Jul 2024 22:33:14 +0200
Subject: [PATCH] dropEmptyInitThenConcatStringSep: Check that we don't drop...

... initial empty strings.

The tests pass, which is encouraging.
---
 src/libexpr/symbol-table.hh | 5 +++++
 src/libutil/util.hh         | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/libexpr/symbol-table.hh b/src/libexpr/symbol-table.hh
index b85725e12..c7a3563b0 100644
--- a/src/libexpr/symbol-table.hh
+++ b/src/libexpr/symbol-table.hh
@@ -41,6 +41,11 @@ public:
     }
 
     friend std::ostream & operator <<(std::ostream & os, const SymbolStr & symbol);
+
+    bool empty() const
+    {
+        return s->empty();
+    }
 };
 
 /**
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 66cef62ed..c545afd9e 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -40,6 +40,13 @@ template<class C>
 std::string dropEmptyInitThenConcatStringsSep(const std::string_view sep, const C & ss)
 {
     size_t size = 0;
+
+    for (auto & i : ss) {
+        // Make sure we don't rely on the empty item ignoring behavior
+        assert(!i.empty());
+        break;
+    }
+
     // need a cast to string_view since this is also called with Symbols
     for (const auto & s : ss) size += sep.size() + std::string_view(s).size();
     std::string s;