[light] Forward trigger args as Ts... so inner-lambda calls type-check

This commit is contained in:
J. Nick Koston
2026-05-03 17:26:39 -05:00
parent 5483b27bbf
commit 22252ef5b5
2 changed files with 12 additions and 12 deletions
+8 -5
View File
@@ -37,13 +37,16 @@ template<bool HasTransitionLength, typename... Ts> class ToggleAction : public A
// Trigger args are forwarded to the apply function so user lambdas // Trigger args are forwarded to the apply function so user lambdas
// (e.g. `brightness: !lambda "return x;"`) keep working. // (e.g. `brightness: !lambda "return x;"`) keep working.
// //
// Trigger args are forwarded as `const std::remove_reference_t<Ts> &...` // Trigger args are forwarded as `Ts...`. The previous `const Ts &...`
// (instead of `const Ts &...`) so codegen can emit the same form in the // form caused codegen to emit `const T &` for each arg in the apply
// apply lambda's parameter list without producing `const T & &` for // lambda's parameter list, which is invalid C++ source text when T is
// triggers whose Ts already carries a reference (e.g. `std::string &`). // already a reference (e.g. `const std::string & &` for triggers that
// pass `std::string &`). Forwarding `Ts...` lets the codegen reuse the
// trigger's `args` types unchanged for both the apply lambda and any
// inner field lambdas, so they always type-match.
template<typename... Ts> class LightControlAction : public Action<Ts...> { template<typename... Ts> class LightControlAction : public Action<Ts...> {
public: public:
using ApplyFn = void (*)(LightState *, LightCall &, const std::remove_reference_t<Ts> &...); using ApplyFn = void (*)(LightState *, LightCall &, Ts...);
LightControlAction(LightState *parent, ApplyFn apply) : parent_(parent), apply_(apply) {} LightControlAction(LightState *parent, ApplyFn apply) : parent_(parent), apply_(apply) {}
void play(const Ts &...x) override { void play(const Ts &...x) override {
+4 -7
View File
@@ -230,16 +230,13 @@ async def light_control_to_code(config, action_id, template_arg, args):
f"call.set_effect(static_cast<uint32_t>({_resolve_effect_index(config)}));" f"call.set_effect(static_cast<uint32_t>({_resolve_effect_index(config)}));"
) )
# Match LightControlAction::ApplyFn signature: `const std::remove_reference_t<T> &` # Match LightControlAction::ApplyFn signature: forward trigger args as Ts...
# for each trigger arg so non-reference Ts stay no-copy (`const T &`) and # so the apply lambda's parameter types match both ApplyFn and the
# reference Ts collapse correctly without producing `const T & &`. # inner field lambdas (which are generated from `args` directly).
apply_args = [ apply_args = [
(LightState.operator("ptr"), "parent"), (LightState.operator("ptr"), "parent"),
(LightCall.operator("ref"), "call"), (LightCall.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( apply_lambda = LambdaExpression(
["\n".join(body_lines)], ["\n".join(body_lines)],