Try making the error collector non-constexpr?

davidgiven · davidgiven · commit 8b6073ccbb03 · 2025-08-18T22:14:48.000+02:00
diff --git 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: {}",

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ namespace grammar`
`93`	`93`	`};`
`94`	`94`	`};`
`95`	`95`
`96`		`-struct _error_collector`
	`96`	`+struct error_collector`
`97`	`97`	`{`
`98`	`98`	`struct _sink`
`99`	`99`	`{`
`@@ -128,17 +128,16 @@ struct _error_collector`
`128`	`128`	`}`
`129`	`129`	`};`
`130`	`130`
`131`		`- constexpr auto sink() const`
	`131`	`+ auto sink() const`
`132`	`132`	`{`
`133`	`133`	`return _sink{};`
`134`	`134`	`}`
`135`	`135`	`};`
`136`		`-constexpr auto error_collector = _error_collector();`
`137`	`136`
`138`	`137`	`std::vector<CylinderHead> parseCylinderHeadsString(const std::string& s)`
`139`	`138`	`{`
`140`	`139`	`auto input = lexy::string_input(s);`
`141`		`- auto result = lexy::parse<grammar::chs>(input, error_collector);`
	`140`	`+ auto result = lexy::parse<grammar::chs>(input, error_collector());`
`142`	`141`	`if (result.is_error())`
`143`	`142`	`{`
`144`	`143`	`error(fmt::format("track descriptor parse error: {}",`