add support for subtyping

SBuercklin · May 8, 2023 · 38dac15 · 38dac15 · SBuercklin · May 8, 2023
1 parent b96fde2
commit 38dac15
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/private_struct.jl b/src/private_struct.jl
@@ -55,14 +55,9 @@ function find_private_fields(_ex)
     return Tuple(private_fields), out_ex
 end
 
-function get_struct_info(_ex)
-    sname = MacroTools.postwalk(_ex) do ex
-        @capture(ex, (struct ((sname_{X__}) | (sname_))
-            fields__
-        end)) || return ex
-        return sname
-    end
-    return sname
+function get_struct_info(ex)
+    sdef = MacroTools.splitstructdef(ex)
+    return sdef[:name]
 end
 
 function build_private_fields(struct_name, private_fields)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,14 +2,16 @@ using Test, PrivateFields
 const PF = PrivateFields
 
 @testset "Private Definitions" begin
-    @private_struct struct Foo{X,Y}
+    # Test with <: Any to verify subtyping workings
+    @private_struct struct Foo{X,Y} <: Any
         @private x::X
         y::Y
     end
 
     @test PF.private_fieldnames(Foo) == (:x,)
 
-    @private_struct struct Bar
+    # Test with <: Any to verify subtyping workings
+    @private_struct struct Bar <: Any
         x
         @private y
         z