[valve] Use const remove_reference_t<T> & to avoid copies of non-ref Ts

This commit is contained in:
J. Nick Koston
2026-05-03 16:56:14 -05:00
parent fb6920a5b1
commit 431385ebc1
2 changed files with 12 additions and 6 deletions
+7 -3
View File
@@ -251,11 +251,15 @@ async def valve_control_to_code(config, action_id, template_arg, args):
else:
body_lines.append(f"call.{setter}({cg.safe_exp(value)});")
# Match ControlAction::ApplyFn signature: trigger args forwarded
# by-value as Ts...
# Match ControlAction::ApplyFn signature: `const std::remove_reference_t<T> &`
# for each trigger arg so non-reference Ts stay no-copy (`const T &`) and
# reference Ts collapse correctly without producing `const T & &`.
apply_args = [
(ValveCall.operator("ref"), "call"),
*args,
*(
(cg.RawExpression(f"const std::remove_reference_t<{cg.safe_exp(t)}> &"), n)
for t, n in args
),
]
apply_lambda = LambdaExpression(
["\n".join(body_lines)],
+5 -3
View File
@@ -53,11 +53,13 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
// Trigger args are forwarded to the apply function so user lambdas
// (e.g. `position: !lambda "return x;"`) keep working.
//
// Ts... must be forwarded by-value: `const T &` is ill-formed when T is
// already a reference type (some triggers pass `std::string &`).
// Trigger args are forwarded as `const std::remove_reference_t<Ts> &...`
// (instead of `const Ts &...`) so codegen can emit the same form in the
// apply lambda's parameter list without producing `const T & &` for
// triggers whose Ts already carries a reference (e.g. `std::string &`).
template<typename... Ts> class ControlAction : public Action<Ts...> {
public:
using ApplyFn = void (*)(ValveCall &, Ts...);
using ApplyFn = void (*)(ValveCall &, const std::remove_reference_t<Ts> &...);
ControlAction(Valve *valve, ApplyFn apply) : valve_(valve), apply_(apply) {}
void play(const Ts &...x) override {