improve error messages

jw3126 · Sep 16, 2021 · 7f5aaae · 7f5aaae
1 parent 750129c
commit 7f5aaae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/StructHelpers.jl b/src/StructHelpers.jl
@@ -39,6 +39,8 @@ const BATTERIES_DEFAULTS = (
     getproperties=true, constructorof=true,
 )
 
+const ALLOWED_KW = keys(BATTERIES_DEFAULTS)
+
 """
 
     @batteries T [options]
@@ -61,13 +63,20 @@ end
 """
 macro batteries(T, kw...)
     nt = parse_all_macro_kw(kw)
-    for pname in propertynames(nt)
+    for (pname, val) in pairs(nt)
         if !(pname in propertynames(BATTERIES_DEFAULTS))
             error("""
                 Unsupported keyword.
                 Offending Keyword: $pname
                 allowed: $ALLOWED_KW
-                Got: $kw
+                Got: $nt
+            """)
+        end
+        if !(val isa Bool)
+            error("""
+                All options must be literally `true` or `false`.
+                Got: $nt
+                Offending Keyword: $pname
             """)
         end
     end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -62,4 +62,9 @@ struct Empty2 end
     @test Empty1() !== Empty2()
     @test Empty1() != Empty2()
     @test hash(Empty1()) != hash(Empty2())
+
+    struct SErrors;a;b;c;end
+    @test_throws Exception @macroexpand @batteries SErrors kwconstructor="true"
+    @test_throws Exception @macroexpand @batteries SErrors nonsense=true
+    @macroexpand @batteries SErrors kwconstructor=true
 end