more leaves

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6' # Replace this with the minimum Julia version that your package supports.
+          - '1.10' # Replace this with the minimum Julia version that your package supports.
           - '1'   # automatically expands to the latest stable 1.x release of Julia
           - 'nightly'
         os:

docs/src/index.md

@@ -65,6 +65,7 @@ The following types instead are explicitly marked as leaves in Functors.jl:
 - `Number`.
 - `AbstractArray{<:Number}`, except for the wrappers `Transpose`, `Adjoint`, and `PermutedDimsArray`.
 - `AbstractRNG`.
+- `AbstractString`, `AbstractChar`, `AbstractPattern`, `AbstractMatch`.
 
 This is because in typical application the internals of these are abstracted away and it is not desirable to traverse them.
 

src/base.jl

@@ -4,6 +4,10 @@
 
 @leaf Number
 @leaf AbstractArray{<:Number}
+@leaf AbstractString
+@leaf AbstractChar
+@leaf AbstractMatch
+@leaf AbstractPattern
 @leaf AbstractRNG
 
 ###

test/base.jl

@@ -180,12 +180,28 @@ end
     @test collect(x) isa Vector{<:Tuple{Complex, Complex}}
 end
 
-@testset "AbstractString is not leaf" begin
+@testset "AbstractString is leaf" begin
   struct DummyString <: AbstractString
     str::String
   end
   s = DummyString("hello")
-  @test !Functors.isleaf(s)
+  @test Functors.isleaf(s)
+end
+@testset "AbstractPattern is leaf" begin
+  struct DummyPattern <: AbstractPattern
+    pat::Regex
+  end
+  p = DummyPattern(r"\d+")
+  @test Functors.isleaf(p)
+  @test Functors.isleaf(r"\d+")  
+end
+@testset "AbstractChar is leaf" begin
+  struct DummyChar <: AbstractChar
+    ch::Char
+  end
+  c = DummyChar('a')
+  @test Functors.isleaf(c)
+  @test Functors.isleaf('a')
 end
 
 @testset "AbstractDict is functor" begin