tidy up pattern code, coverage

Author: AntonOresten

src/patterns/ellipses.jl

@@ -105,7 +105,7 @@ end
         return t
     end
 
-    new_left = Tuple((..) ∈ flatten(t) ? replace_in_tuple(t) : t for t in left)
-    new_right = (..) ∈ flatten(right) ? replace_in_tuple(right) : right
+    new_left = Tuple(replace_in_tuple(t) for t in left)
+    new_right = replace_in_tuple(right)
     :($(new_left --> new_right))
 end

src/patterns/parse.jl

@@ -63,7 +63,6 @@ end
 
 const SpecialToken = Dict(:* => (*), :_ => (-), :... => (..))
 get_special_token(symbol) = get(SpecialToken, symbol, symbol)
-mapfilter(f, pred, xs) = map(f, filter(pred, xs))
 
 # Recursively map special tokens inside possibly nested tuples
 map_special_tokens(x) = x

src/patterns/patterns.jl

@@ -3,9 +3,6 @@ include("utils.jl")
 const ArrowPatternSideNestedTuple = Tuple{Vararg{Union{Symbol,Int,EllipsisNotation.Ellipsis}}}
 const ArrowPatternSide = Tuple{Vararg{Union{Symbol,Int,EllipsisNotation.Ellipsis,ArrowPatternSideNestedTuple}}}
 
-is_valid_token(x) = x isa Union{Symbol,Int,EllipsisNotation.Ellipsis}
-is_valid_token(x::Tuple) = all(is_valid_token, x) && all(!(y isa Tuple && any(z -> z isa Tuple, (y,))) for y in ())
-
 function is_valid_side(x)
     x isa Tuple || return false
     for el in x

test/patterns.jl

@@ -65,6 +65,7 @@ using Test
             @test einops"* i" == Val((*, :i))
             @test einops"i *" == Val((:i, *))
             @test einops"i i" == Val((:i, :i))
+            @test einops"i 1 ..." == Val((:i, 1, ..))  # test map_special_tokens fallback for Int and ..
         end
 
         @testset "parsing errors" begin