Fix unwrap_rec for singleton types

tkf · Nov 14, 2019 · fd02484 · fd02484
1 parent 10cc459
commit fd02484
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/ChainCutters.jl b/src/ChainCutters.jl
@@ -92,7 +92,9 @@ Base.setindex(x::Const, I...) = _cut(Base.setindex(unwrap(x), I...))
 Base.setindex(x::Variable, I...) = _uncut(Base.setindex(unwrap(x), I...))
 
 @inline unwrap_rec(x::T) where T =
-    if Base.isstructtype(T)
+    if Base.issingletontype(T)
+        x
+    elseif Base.isstructtype(T)
         constructorof(T)(unwrap_rec(fieldvalues(x))...)
     else
         x

diff --git a/test/test_misc.jl b/test/test_misc.jl
@@ -5,5 +5,6 @@ using Setfield
 using Test
 
 @test unwrap_rec(@lens _.a[$1]) === @lens _.a[$1]
+@test unwrap_rec(Val(1)) === Val(1)
 
 end  # module