Merge pull request #14 from ExpressApp/inplace-definition

fix define structure via using

Author: artemeff

CHANGELOG.md

@@ -1,11 +1,17 @@
 ## Changelog
 
+## v1.2.1
+
+* Bug fixes
+  * Fix define structure via using
+
 ## v1.2.0
 
 * Enhancements
   * Add `struct` type
 
 ## v1.1.1
+
 * Enhancements
   * Definition in using macro
   * Add able to override fields

lib/construct.ex

@@ -31,21 +31,21 @@ defmodule Construct do
 
   @doc false
   defmacro __using__(opts \\ []) do
-    definition = Keyword.get(opts, :do)
+    {definition, opts} = Keyword.pop(opts, :do)
 
-    structure =
+    pre_ast =
       if definition do
         defstructure(definition)
       else
-        []
+        quote do
+          import Construct, only: [structure: 1]
+        end
       end
 
     quote do
       @behaviour Construct
 
-      import Construct, only: [structure: 1]
-
-      unquote(structure)
+      unquote(pre_ast)
 
       @type t :: %__MODULE__{}