improve inference

Author: aplavin

src/getsetall.jl

@@ -31,9 +31,12 @@ getall(obj, ::Properties) = getproperties(obj) |> values
 getall(obj, o::If) = o.modify_condition(obj) ? (obj,) : ()
 getall(obj, f) = (f(obj),)
 
-setall(obj, ::Properties, vs::Tuple) = setproperties(obj, NamedTuple{propertynames(obj)}(vs))
-setall(obj::NamedTuple{NS}, ::Elements, vs::Tuple) where {NS} = NamedTuple{NS}(vs)
-setall(obj::NTuple{N, Any}, ::Elements, vs) where {N} = (@assert length(vs) == N; Tuple(vs))
+function setall(obj, ::Properties, vs)
+    names = propertynames(obj)
+    setproperties(obj, NamedTuple{names}(NTuple{length(names)}(vs)))
+end
+setall(obj::NamedTuple{NS}, ::Elements, vs) where {NS} = NamedTuple{NS}(NTuple{length(NS)}(vs))
+setall(obj::NTuple{N, Any}, ::Elements, vs) where {N} = (@assert length(vs) == N; NTuple{N}(vs))
 setall(obj::AbstractArray, ::Elements, vs::AbstractArray) = (@assert length(obj) == length(vs); reshape(vs, size(obj)))
 setall(obj::AbstractArray, ::Elements, vs) = setall(obj, Elements(), collect(vs))
 setall(obj, o::If, vs) = error("Not supported")

test/test_getsetall.jl

@@ -66,15 +66,20 @@ if VERSION >= v"1.6"  # for ComposedFunction
 end
 
 @testset "setall" begin
-    @test (2,) === @inferred setall((1,), Elements(), (2,))
-    @test (2,) === setall((1,), Elements(), [2,])
-    @test [2,] == @inferred setall([1,], Elements(), (2,))
-    @test [2,] == @inferred setall([1,], Elements(), [2,])
+    for o in [Elements(), Properties()]
+        @test (a=2, b=3) === @inferred setall((a=1, b="2"), o, (2, 3))
+        @test (a=2, b="3") === @inferred setall((a=1, b="2"), o, (2, "3"))
+        @test (a=2, b=3) === @inferred setall((a=1, b="2"), o, [2, 3])
+    end
+    @test (2, 3) === @inferred setall((1, "2"), Elements(), (2, 3))
+    @test (2, "3") === @inferred setall((1, "2"), Elements(), (2, "3"))
+    @test (2, 3) === @inferred setall((1, "2"), Elements(), [2, 3])
+    @test [2, 3] == @inferred setall([1, "2"], Elements(), (2, 3))
+    @test [2, "3"] == @inferred setall([1, "2"], Elements(), (2, "3"))
+    @test [2, 3] == @inferred setall([1, "2"], Elements(), [2, 3])
 
     obj = (a=1, b=2.0, c='3')
     @test (a="aa", b=2.0, c='3') === @inferred setall(obj, @optic(_.a), ("aa",))
-    @test (a="aa", b=1, c='5') === @inferred setall(obj, Properties(), ("aa", 1, '5'))
-    @test (a="aa", b=1, c='5') === @inferred setall(obj, Elements(), ("aa", 1, '5'))
     @test (a=9, b=19.0, c='4') === @inferred setall(obj, @optic(_ |> Elements() |> _ + 1), (10, 20.0, '5'))
 
     obj = (a=1, b=((c=3, d=4), (c=5, d=6)))