@@ -1470,37 +1470,76 @@ fn comprehension_filter_bindings_are_available_to_later_qualifiers() {
14701470
14711471#[ test]
14721472fn comprehension_filter_bindings_reach_scope_sensitive_diagnostics ( ) {
1473+ // A later fun head or generator shadows N, so the earlier filter's N
1474+ // is genuinely unused as well as shadowed (erlc -Wall).
1475+ let cases: & [ ( & str , & str , & [ & str ] ) ] = & [
1476+ (
1477+ "case V of N -> <<1>>; _ -> <<0>> end" ,
1478+ "X <- [1], begin N = X, true end" ,
1479+ & [ ] ,
1480+ ) ,
1481+ (
1482+ "begin case V of true -> N = 1; false -> ok end, <<N>> end" ,
1483+ "X <- [1], begin N = X, true end" ,
1484+ & [ ] ,
1485+ ) ,
1486+ (
1487+ "begin case V of true -> N = 1; false -> N = 1 end, <<N>> end" ,
1488+ "X <- [1], begin N = X, true end" ,
1489+ & [ ] ,
1490+ ) ,
1491+ (
1492+ "begin F = fun(N) -> <<N>> end, F(V) end" ,
1493+ "X <- [1], begin N = X, true end" ,
1494+ & [ "unused_variable" , "shadowed_variable" ] ,
1495+ ) ,
1496+ (
1497+ "<<N>>" ,
1498+ "X <- [1], begin N = X, true end, N <- [V]" ,
1499+ & [ "unused_variable" , "shadowed_variable" ] ,
1500+ ) ,
1501+ (
1502+ "<<_N>>" ,
1503+ "X <- [V], begin _N = X, true end, begin _N = 1, true end" ,
1504+ & [ "match_underscore_var" ] ,
1505+ ) ,
1506+ (
1507+ "<<_N>>" ,
1508+ "X <- [true], X orelse begin _N = 1, true end, _N <- [V]" ,
1509+ & [ ] ,
1510+ ) ,
1511+ ( "<<N>>" , "_ <- [V], {N, N} <- [{1, 1}]" , & [ ] ) ,
1512+ ] ;
14731513 for ( open, close) in [ ( "[" , "]" ) , ( "<<" , ">>" ) ] {
1474- for ( template, qualifiers, expected) in [
1475- ( "case V of N -> <<1>>; _ -> <<0>> end" ,
1476- "X <- [1], begin N = X, true end" , None ) ,
1477- ( "begin case V of true -> N = 1; false -> ok end, <<N>> end" ,
1478- "X <- [1], begin N = X, true end" , None ) ,
1479- ( "begin case V of true -> N = 1; false -> N = 1 end, <<N>> end" ,
1480- "X <- [1], begin N = X, true end" , None ) ,
1481- ( "begin F = fun(N) -> <<N>> end, F(V) end" ,
1482- "X <- [1], begin N = X, true end" , Some ( "shadowed_variable" ) ) ,
1483- ( "<<N>>" , "X <- [1], begin N = X, true end, N <- [V]" ,
1484- Some ( "shadowed_variable" ) ) ,
1485- ( "<<_N>>" , "X <- [V], begin _N = X, true end, begin _N = 1, true end" ,
1486- Some ( "match_underscore_var" ) ) ,
1487- ( "<<_N>>" , "X <- [true], X orelse begin _N = 1, true end, _N <- [V]" , None ) ,
1488- ( "<<N>>" , "_ <- [V], {N, N} <- [{1, 1}]" , None ) ,
1489- ] {
1490- let source = format ! ( "-module(test). -export([f/1]). f(V) ->
1491- {open} ({template}) || {qualifiers} {close}." ) ;
1514+ for ( template, qualifiers, expected) in cases {
1515+ let source = format ! (
1516+ "-module(test). -export([f/1]). f(V) ->
1517+ {open} ({template}) || {qualifiers} {close}."
1518+ ) ;
14921519 let ( module, names) = parse_module ( & source) ;
14931520 let diagnostics = analyze_module ( & module, & names, None ) ;
14941521 assert ! (
1495- !diagnostics. iter( ) . any( |d| d. severity == nera_syntax:: error:: Severity :: Error ) ,
1522+ !diagnostics
1523+ . iter( )
1524+ . any( |d| d. severity == nera_syntax:: error:: Severity :: Error ) ,
14961525 "{source}\n {diagnostics:?}"
14971526 ) ;
1498- let relevant: Vec < _ > = diagnostics. iter ( ) . filter_map ( |d| d. code . as_deref ( ) )
1499- . filter ( |code| [ "unsafe_variable" , "exported_var" , "unreachable_clause" ,
1500- "unused_variable" , "shadowed_variable" , "match_underscore_var" ] . contains ( code) )
1527+ let relevant: Vec < _ > = diagnostics
1528+ . iter ( )
1529+ . filter_map ( |d| d. code . as_deref ( ) )
1530+ . filter ( |code| {
1531+ [
1532+ "unsafe_variable" ,
1533+ "exported_var" ,
1534+ "unreachable_clause" ,
1535+ "unused_variable" ,
1536+ "shadowed_variable" ,
1537+ "match_underscore_var" ,
1538+ ]
1539+ . contains ( code)
1540+ } )
15011541 . collect ( ) ;
1502- assert_eq ! ( relevant, expected. into_iter( ) . collect:: <Vec <_>>( ) ,
1503- "{source}\n {diagnostics:?}" ) ;
1542+ assert_eq ! ( relevant, * expected, "{source}\n {diagnostics:?}" ) ;
15041543 }
15051544 }
15061545}
0 commit comments