add hasbatteries

Author: jw3126

Project.toml

@@ -1,7 +1,7 @@
 name = "StructHelpers"
 uuid = "4093c41a-2008-41fd-82b8-e3f9d02b504f"
 authors = ["Jan Weidner <jw3126@gmail.com> and contributors"]
-version = "1.1.2"
+version = "1.3"
 
 [deps]
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"

src/StructHelpers.jl

@@ -29,6 +29,15 @@ function hash_eq_as(obj)
     Tuple(getproperties(obj))
 end
 
+"""
+    hasbatteries(T::Type)::Bool
+
+Check if `@batteries` or `@enumbatteries` was applied to `T`.
+"""
+function hasbatteries(::Type)::Bool
+    false
+end
+
 @inline function structural_eq(o1, o2)
     getproperties(o1) == getproperties(o2)
 end
@@ -233,9 +242,18 @@ macro batteries(T, kw...)
         def = :($ST.StructType(::Type{<:$T}) = $ST.Struct())
         push!(ret.args, def)
     end
+    push!(ret.args, def_hasbatteries(T))
     return esc(ret)
 end
 
+function def_hasbatteries(T)
+    :(
+        function ($hasbatteries)(::Type{<:$T})
+            true
+        end
+    )
+end
+
 function error_parse_macro_kw(kw; comment=nothing)
     msg = """
     Expected a keyword argument of the form name = value.
@@ -427,6 +445,7 @@ macro enumbatteries(T, kw...)
         def = def_selfconstructor(T)
         push!(ret.args, def)
     end
+    push!(ret.args, def_hasbatteries(T))
     return esc(ret)
 end
 

test/runtests.jl

@@ -55,6 +55,9 @@ struct SNoIsEqual; a; end
     @test Skw(1,[]) == Skw(1,[])
     @test SNoHash(1,[]) == SNoHash(1,[])
     @test SVanilla(1,[]) != SVanilla(1,[])
+    @test SH.hasbatteries(SBatteries)
+    @test !SH.hasbatteries(SVanilla)
+    @test !SH.hasbatteries(Tuple)
 
     @test isequal(SBatteries(NaN, 1), SBatteries(NaN, 1))
     @test !isequal(SBatteries(1, 1), SBatteries(NaN, 1))
@@ -117,14 +120,17 @@ struct SNoIsEqual; a; end
     @test NoSelfCtor(NoSelfCtor(1)).a === NoSelfCtor(1)
 end
 
-@enum Color Red Blue Green
+@enum EnumNoBatteries UsesGas UsesPlug UsesMuscles
 
+@enum Color Red Blue Green
 @enumbatteries Color string_conversion = true symbol_conversion = true selfconstructor = false
 
 @enum Shape Circle Square 
 @enumbatteries Shape symbol_conversion =true
 
 @testset "@enumbatteries" begin
+    @test SH.hasbatteries(Color)
+    @test !SH.hasbatteries(EnumNoBatteries)
     @test Red === @inferred Color("Red")
     @test Red === @inferred convert(Color, "Red")
     @test "Red" === @inferred String(Red)