Merge pull request #12 from jw3126/issue11

fix unassigned keywords (#11)

.travis.yml

@@ -4,7 +4,6 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
   - '0.7'
   - '1.0'
   - nightly

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.6
+julia 0.7-
 MacroTools 0.3.2
 Compat 0.15.0

src/QuickTypes.jl

@@ -5,9 +5,8 @@ module QuickTypes
 using MacroTools: @capture, prewalk, @match, splitarg
 import Compat
 
-export @qmutable, @qstruct  # Julia 0.6
-export @qtype, @qimmutable  # Julia 0.5
-export @qmutable_fp, @qstruct_fp  # Julia 0.6
+export @qmutable, @qstruct
+export @qmutable_fp, @qstruct_fp
 export @qstruct_np, @qmutable_np
 
 const special_kwargs = [:_define_show, :_concise_show]
@@ -203,7 +202,8 @@ function qexpansion(def, mutable, fully_parametric, narrow_types)
             push!(constr_kwargs, kwarg)
         else
             push!(new_args, arg_name)
-            push!(constr_kwargs, Expr(:kw, arg_name, default))
+            push!(constr_kwargs, 
+                  default === nothing ? arg_name : Expr(:kw, arg_name, default))
         end
         push!(reg_kwargs, kwarg)
         push!(kwfields, :($arg_name::$arg_type))
@@ -284,17 +284,11 @@ unless `_define_show=false` (eg. `@qstruct(x, y; _define_show=false)`).
 macro qstruct(def)
     return qexpansion(def, false, false, false)
 end
-macro qimmutable(def)  # 0.5 and below
-    return qexpansion(def, false, false, false)
-end
 
 """ Quick mutable struct definition. See ?@qstruct """
 macro qmutable(def)
     return qexpansion(def, true, false, false)
 end
-macro qtype(def)   # 0.5 and below
-    return qexpansion(def, true, false, false)
-end
 
 # -----------------------------------------------------------------------------
 # Fully-parametric

test/runtests.jl

@@ -18,9 +18,7 @@ c = Car(10; manufacturer=("Danone", "Hershey"))
 # Check that the fields are in the right order
 @test collect(fieldnames(Car)) == [:size, :nwheels, :manufacturer, :brand]
 # This is essentially the definition of these functions.
-# This works in Julia 0.6, but not in 0.5. Since it's not part of the exported API,
-# we diable the test.
-# @test construct(roottypeof(c), fieldsof(c)...) == c
+@test construct(roottypeof(c), fieldsof(c)...) == c
 @test type_parameters(Vector{Int}) == Base.Core.svec(Int64, 1)
 @test tuple_parameters(Tuple{Int, Float64}) == Base.Core.svec(Int64, Float64)
 @inferred roottypeof(1=>2) == Pair
@@ -91,3 +89,5 @@ convert_f(foo) = convert(foo.a, 10)
 @inferred convert_f(Foo_np(Int, 2))
 @test fieldtype(typeof(Foo_np(Int, 2)), :a) == Type{Int64}
 
+@qstruct Issue11(;no_default_value)
+@test_throws UndefKeywordError Issue11()