@@ -64,27 +64,25 @@ impl IrBuilder {
6464
6565 // ── 3. Analyse free variables ──
6666 let captured_vars = self . collect_lc_captures ( & groups, body_expr) ;
67- let num_captured = captured_vars. len ( ) as u32 ;
6867
6968 // ── 4. Pre-generate helper function names for all generators ──
70- let mut helpers: Vec < ( AtomId , String , u32 ) > = Vec :: new ( ) ; // (name_id, mangled, arity )
69+ let mut helpers: Vec < ( AtomId , String ) > = Vec :: new ( ) ; // (name_id, mangled)
7170 let prefix = if finalize_as_binary { "bc" } else { "lc" } ;
72- for k in 0 ..n {
71+ for _ in 0 ..n {
7372 let id = self . lc_counter ;
7473 self . lc_counter += 1 ;
7574 let name_str = format ! ( "__{prefix}_{id}" ) ;
7675 let mangled = format ! ( "{}__{prefix}_{id}" , self . module_name. 0 ) ;
7776 let name_id = self . fresh_atom_id ( ) ;
7877 self . atom_names . insert ( name_id, name_str) ;
79- // params: iter + acc + k tails + k heads + captured
80- let arity = 2 + 2 * k as u32 + num_captured;
81- self . module_functions
82- . insert ( ( name_id, arity) , mangled. clone ( ) ) ;
83- helpers. push ( ( name_id, mangled, arity) ) ;
78+ helpers. push ( ( name_id, mangled) ) ;
8479 }
8580
8681 // ── 5. Build all helper functions ──
8782 let saved = self . save_state ( ) ;
83+ // Each completed helper records the names its filters introduced.
84+ // Later helpers carry their values, not expressions to evaluate again.
85+ let mut filter_bindings = Vec :: new ( ) ;
8886
8987 for k in 0 ..n {
9088 if k > 0 {
@@ -97,7 +95,7 @@ impl IrBuilder {
9795 self . next_block = 0 ;
9896 self . scopes = vec ! [ HashMap :: new( ) ] ;
9997 }
100- self . build_lc_helper ( k, n, & groups, & helpers, & captured_vars, body_expr, finalize_as_binary, & bin_flags) ?;
98+ self . build_lc_helper ( k, n, & groups, & helpers, & captured_vars, body_expr, finalize_as_binary, & bin_flags, & mut filter_bindings ) ?;
10199 }
102100
103101 self . restore_state ( saved) ;
@@ -234,7 +232,8 @@ impl IrBuilder {
234232 }
235233
236234 /// Capture expression reads before the generator that shadows their name.
237- /// Earlier generator values travel through head parameters, not captures.
235+ /// Earlier generator and filter values travel through helper parameters,
236+ /// not captures.
238237 fn collect_lc_captures (
239238 & mut self ,
240239 groups : & [ GeneratorGroup < ' _ > ] ,
@@ -313,7 +312,7 @@ impl IrBuilder {
313312 /// Build one LC helper function (helper_k of n total).
314313 ///
315314 /// Parameters for helper_k:
316- /// iter_k, acc, tail_0…tail_{k-1}, head_0…head_{k-1}, captured…
315+ /// iter_k, acc, tail_0…tail_{k-1}, head_0…head_{k-1}, captured…, filter_values…
317316 ///
318317 /// The accumulator collects elements in reverse order. When the outermost
319318 /// helper (k==0) reaches the nil case, it reverses the accumulator via
@@ -324,13 +323,14 @@ impl IrBuilder {
324323 k : usize ,
325324 n : usize ,
326325 groups : & [ GeneratorGroup < ' _ > ] ,
327- helpers : & [ ( AtomId , String , u32 ) ] , // (name_id, mangled, arity )
326+ helpers : & [ ( AtomId , String ) ] , // (name_id, mangled)
328327 captured_vars : & [ ( AtomId , VarId ) ] ,
329328 body_expr : & ast:: Expr ,
330329 finalize_as_binary : bool ,
331330 bin_gen_flags : & [ bool ] ,
331+ filter_bindings : & mut Vec < Vec < AtomId > > ,
332332 ) -> Result < ( ) , LowerError > {
333- let ( helper_name_id, ref helper_mangled, helper_arity ) = helpers[ k] ;
333+ let ( helper_name_id, ref helper_mangled) = helpers[ k] ;
334334 // Each helper is its own function. Deferred tails recorded while
335335 // building the previous helper name that helper's variables.
336336 self . match_contexts . clear ( ) ;
@@ -355,6 +355,18 @@ impl IrBuilder {
355355 self . bind_var ( * name, param) ;
356356 }
357357
358+ // Preserve one slot per binding layer, even if a later generator
359+ // shadows the same name. Resuming an outer helper needs its old value.
360+ let filter_params: Vec < Vec < ( AtomId , VarId ) > > = filter_bindings. iter ( )
361+ . map ( |names| names. iter ( ) . map ( |name| ( * name, self . fresh_var ( ) ) ) . collect ( ) )
362+ . collect ( ) ;
363+ let carried_filters: Vec < VarId > = filter_params. iter ( ) . flatten ( )
364+ . map ( |( _, var) | * var) . collect ( ) ;
365+ let helper_arity = 2 + 2 * k as u32 + env_params. len ( ) as u32
366+ + carried_filters. len ( ) as u32 ;
367+ self . module_functions . insert ( ( helper_name_id, helper_arity) , helper_mangled. clone ( ) ) ;
368+ let mut new_filter_names = Vec :: new ( ) ;
369+
358370 // ── Nil block ──
359371 let nil_block = self . fresh_block_with_id ( ) ;
360372 self . start_block ( nil_block) ;
@@ -390,6 +402,7 @@ impl IrBuilder {
390402 chain_args. push ( * item) ;
391403 }
392404 chain_args. extend_from_slice ( & env_params) ;
405+ chain_args. extend ( filter_params[ ..k - 1 ] . iter ( ) . flatten ( ) . map ( |( _, var) | * var) ) ;
393406 self . set_terminator ( Terminator :: TailCall (
394407 CallTarget :: Local ( helpers[ k - 1 ] . 0 ) ,
395408 chain_args,
@@ -414,6 +427,9 @@ impl IrBuilder {
414427 // segment size), so they are extracted before it runs.
415428 for j in 0 ..k {
416429 self . bind_generator_pattern ( & groups[ j] . 0 , head_params[ j] , false ) ;
430+ for ( name, var) in & filter_params[ j] {
431+ self . bind_var ( * name, * var) ;
432+ }
417433 }
418434
419435 let generator_inputs = self . collect_all_bindings ( ) ;
@@ -442,11 +458,12 @@ impl IrBuilder {
442458 ( generator_scopes, generator_match_contexts)
443459 } ;
444460
461+ let before_filters = self . collect_all_bindings ( ) ;
445462 let filters = & groups[ k] . 2 ;
446463 let is_innermost = k == n - 1 ;
447464
448465 // Helper: build args for a self tail-call.
449- // self(tail_var, acc_var, tail_0…tail_{k-1}, head_0…head_{k-1}, captured…)
466+ // self(tail_var, acc_var, tail_0…tail_{k-1}, head_0…head_{k-1}, captured…, filter_values… )
450467 let build_self_args = |tail_params : & [ VarId ] ,
451468 head_params : & [ VarId ] ,
452469 env_params : & [ VarId ] ,
@@ -457,6 +474,7 @@ impl IrBuilder {
457474 a. extend_from_slice ( tail_params) ;
458475 a. extend_from_slice ( head_params) ;
459476 a. extend_from_slice ( env_params) ;
477+ a. extend_from_slice ( & carried_filters) ;
460478 a
461479 } ;
462480
@@ -487,6 +505,7 @@ impl IrBuilder {
487505 inner_args. extend_from_slice ( & head_params) ;
488506 inner_args. push ( head_var) ;
489507 inner_args. extend_from_slice ( & env_params) ;
508+ inner_args. extend_from_slice ( & carried_filters) ;
490509 self . set_terminator ( Terminator :: TailCall (
491510 CallTarget :: Local ( helpers[ k + 1 ] . 0 ) ,
492511 inner_args,
@@ -531,6 +550,21 @@ impl IrBuilder {
531550 self_args,
532551 ) ) ;
533552 } else {
553+ // Lowering may retain names from skipped short-circuit
554+ // operands. Only definite exports can cross helper boundaries.
555+ let mut definite = HashSet :: new ( ) ;
556+ for filter in filters {
557+ crate :: warnings:: collect_exported_bindings ( filter, & mut definite) ;
558+ }
559+ new_filter_names = definite. into_iter ( )
560+ . filter ( |name| !before_filters. contains_key ( name)
561+ && self . lookup_var ( * name) . is_some ( ) ) . collect ( ) ;
562+ new_filter_names. sort_by_key ( |name| name. 0 ) ;
563+ // Materialize deferred tails before passing them to a helper.
564+ let new_filter_values: Vec < VarId > = new_filter_names. iter ( ) . map ( |name| {
565+ let var = self . lookup_var ( * name) . expect ( "filter binding exists" ) ;
566+ self . materialize_bound_variable ( * name, var)
567+ } ) . collect ( ) ;
534568 let next_iter = self . lower_expr ( groups[ k + 1 ] . 1 , false ) ?;
535569
536570 let mut inner_args = vec ! [ next_iter, acc_param] ;
@@ -539,6 +573,8 @@ impl IrBuilder {
539573 inner_args. extend_from_slice ( & head_params) ;
540574 inner_args. push ( head_var) ;
541575 inner_args. extend_from_slice ( & env_params) ;
576+ inner_args. extend_from_slice ( & carried_filters) ;
577+ inner_args. extend_from_slice ( & new_filter_values) ;
542578 self . set_terminator ( Terminator :: TailCall (
543579 CallTarget :: Local ( helpers[ k + 1 ] . 0 ) ,
544580 inner_args,
@@ -627,6 +663,7 @@ impl IrBuilder {
627663 all_params. extend_from_slice ( & tail_params) ;
628664 all_params. extend_from_slice ( & head_params) ;
629665 all_params. extend_from_slice ( & env_params) ;
666+ all_params. extend_from_slice ( & carried_filters) ;
630667 let mut helper_func = IrFunction {
631668 name : helper_name_id,
632669 arity : helper_arity,
@@ -643,6 +680,7 @@ impl IrBuilder {
643680 #[ cfg( test) ]
644681 crate :: passes:: assert_valid ( & helper_func, "after helper yield insertion" ) ;
645682 self . functions . push ( helper_func) ;
683+ filter_bindings. push ( new_filter_names) ;
646684
647685 Ok ( ( ) )
648686 }
0 commit comments