cleanup

Author: CarloLucibello

src/functor.jl

@@ -17,20 +17,14 @@ functor(::Type{<:AbstractArray}, x) = x, identity
 functor(::Type{<:AbstractArray{<:Number}}, x) = (), _ -> x
 
 function makefunctor(m::Module, T, fs = fieldnames(T))
-  if isempty(fs)
-    @eval m begin
-      $Functors.functor(::Type{<:$T}, x) = (), _ -> x
-    end
-  else
-    yᵢ = 0
-    escargs = map(fieldnames(T)) do f
-      f in fs ? :(y[$(yᵢ += 1)]) : :(x.$f)
-    end
-    escfs = [:($f=x.$f) for f in fs]
-    
-    @eval m begin
-      $Functors.functor(::Type{<:$T}, x) = (;$(escfs...)), y -> $T($(escargs...))
-    end
+  yᵢ = 0
+  escargs = map(fieldnames(T)) do f
+    f in fs ? :(y[$(yᵢ += 1)]) : :(x.$f)
+  end
+  escfs = [:($f=x.$f) for f in fs]
+  
+  @eval m begin
+    $Functors.functor(::Type{<:$T}, x) = (;$(escfs...)), y -> $T($(escargs...))
   end
 end
 
@@ -44,7 +38,7 @@ macro functor(args...)
   functorm(args...)
 end
 
-isleaf(@nospecialize(x)) = children(x) === ()
+isleaf(@nospecialize(x)) = isempty(children(x))
 
 children(x) = functor(x)[1]
 

test/basics.jl

@@ -23,7 +23,7 @@ struct NoChild{T}; x::T; end
   has_children = Foo(1, 2)
   @test Functors.isleaf(no_children)
   @test !Functors.isleaf(has_children)
-  @test Functors.children(no_children) == ()
+  @test Functors.children(no_children) == (;)
   @test Functors.children(has_children) == (x=1, y=2)
 end