From 8b6073ccbb03d351ec94b4ae6b5ba1f2a171e6ef Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Mon, 18 Aug 2025 22:14:48 +0200
Subject: [PATCH] Try making the error collector non-constexpr?

---
 lib/data/locations.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/data/locations.cc b/lib/data/locations.cc
index e462f8b1..631cd052 100644
--- a/lib/data/locations.cc
+++ b/lib/data/locations.cc
@@ -93,7 +93,7 @@ namespace grammar
     };
 };
 
-struct _error_collector
+struct error_collector
 {
     struct _sink
     {
@@ -128,17 +128,16 @@ struct _error_collector
         }
     };
 
-    constexpr auto sink() const
+    auto sink() const
     {
         return _sink{};
     }
 };
-constexpr auto error_collector = _error_collector();
 
 std::vector<CylinderHead> parseCylinderHeadsString(const std::string& s)
 {
     auto input = lexy::string_input(s);
-    auto result = lexy::parse<grammar::chs>(input, error_collector);
+    auto result = lexy::parse<grammar::chs>(input, error_collector());
     if (result.is_error())
     {
         error(fmt::format("track descriptor parse error: {}",