Allow kwdef macro outside of definition of struct (#18)

* Allow kwdef macro outside of definition of struct * Update test_ProtoStruct.jl * better matching * Update ProtoStruct.jl * Update ProtoStruct.jl --------- Co-authored-by: Simon Christ <[email protected]>
BeastyBlacksmith · Oct 13, 2023 · 32acc26 · 32acc26
1 parent 77ed9ed
commit 32acc26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/ProtoStruct.jl b/src/ProtoStruct.jl
@@ -1,4 +1,8 @@
 macro proto( expr )
+    if expr.head == :macrocall && expr.args[1] == Symbol("@kwdef")
+        expr = expr.args[3]
+    end
+
     if expr.head != Symbol("struct")
         throw(ArgumentError("Expected expression to be a type definition."))
     end

diff --git a/test/test_ProtoStruct.jl b/test/test_ProtoStruct.jl
@@ -57,6 +57,16 @@ end
     @test tw.E == "yepp"
 end
 
+@proto @kwdef struct TestMacroOutside
+    A::Int = 1
+end
+
+@testset "@kwdef macro outside" begin
+    tw = TestMacroOutside()
+    @test tw isa TestMacroOutside
+    @test tw.A == 1
+end
+
 @proto mutable struct TestMutation
     F::Int
     G::Float64