Merge pull request #61 from aplavin/patch-1

fix setting real and abs

Project.toml

@@ -1,7 +1,7 @@
 name = "Accessors"
 uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
 authors = ["Takafumi Arakaki <[email protected]>", "Jan Weidner <[email protected]> and contributors"]
-version = "0.1.16"
+version = "0.1.17"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
@@ -22,6 +22,7 @@ InverseFunctions = "0.1.5"
 MacroTools = "0.4.4, 0.5"
 Requires = "0.5, 1.0"
 StaticNumbers = "0.3"
+Unitful = "1"
 julia = "1.3"
 
 [extras]
@@ -32,6 +33,7 @@ QuickTypes = "ae2dfa86-617c-530c-b392-ef20fdad97bb"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StaticNumbers = "c5e4b96a-f99f-5557-8ed2-dc63ef9b5131"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["Test", "PerformanceTestTools", "QuickTypes", "StaticArrays", "BenchmarkTools", "InteractiveUtils", "StaticNumbers"]
+test = ["Test", "PerformanceTestTools", "QuickTypes", "StaticArrays", "BenchmarkTools", "InteractiveUtils", "StaticNumbers", "Unitful"]

src/functionlenses.jl

@@ -48,11 +48,10 @@ delete(path, ::typeof(dirname)) = basename(path)
 ################################################################################
 ##### math
 ################################################################################
-set(x::Real, ::typeof(real), y) = y
-set(x,       ::typeof(real), y) = y + im*imag(x)
-set(x,       ::typeof(imag), y) = real(x) + im*y
-set(x,      ::typeof(angle), y) = abs(x) * cis(y)
-set(x,        ::typeof(abs), y) = y >= 0 ? y * sign(x) : throw(DomainError(y, "cannot set abs($x) to $y"))
+set(x::T,  ::typeof(real), y) where {T} = T === real(T) ? y : y + im*imag(x)
+set(x,     ::typeof(imag), y) = real(x) + im*y
+set(x,    ::typeof(angle), y) = abs(x) * cis(y)
+set(x,      ::typeof(abs), y) = y >= zero(y) ? y * sign(x) : throw(DomainError(y, "cannot set abs($x) to $y"))
 
 set(arr, ::typeof(normalize), val) = norm(arr) * val
 set(arr, ::typeof(norm), val)      = val/norm(arr) * arr # should we check val is positive?

test/test_functionlenses.jl

@@ -1,6 +1,7 @@
 module TestFunctionLenses
 using Test
 using Dates
+using Unitful
 using Accessors: test_getset_laws
 using Accessors
 
@@ -88,10 +89,12 @@ end
 end
 
 @testset "math" begin
-    x = 1
     @test 2.0       === @set real(1) = 2.0
+    @test 2.0 + 1im === @set real(1+1im) = 2.0
     @test 1.0 + 2im === @set imag(1) = 2.0
     @test 1.0 + 2im === @set imag(1+1im) = 2.0
+    @test 1u"m"         === @set real(2u"m") = 1u"m"
+    @test (2 + 1im)u"m" === @set imag(2u"m") = 1u"m"
 
     test_getset_laws(!, true, true, false)
     # no need for extensive testing: all invertible lenses are simply forwarded to InverseFunctions
@@ -102,6 +105,7 @@ end
     end
 
     x = 3 + 4im
+    @test @set(abs(-2u"m") = 1u"m") === -1u"m"
     @test @set(abs(x) = 10) ≈ 6 + 8im
     @test @set(angle(x) = π/2) ≈ 5im
     @test_throws DomainError @set(abs(x) = -10)