Move everything to a single file

Now the library is fully self-contained and doesn't require any
special flags to be used.  Macros are now shipped inside the library
itself and can be required by user code by requiring the same module
name as the library.

3 files changed, 6 insertions, 8 deletions

diff --git a/tests/core.fnl b/tests/core.fnl
index 3c8dae0..bd3a4aa 100644
--- a/tests/core.fnl
+++ b/tests/core.fnl
@@ -1,7 +1,7 @@
-(import-macros clj :init-macros)
 (require-macros :fennel-test)
 
-(local core (require :init))
+(import-macros clj (doto :cljlib require))
+(local core (require :cljlib))
 
 (deftest test-equality
   (testing "comparing base-types"
diff --git a/tests/fn.fnl b/tests/fn.fnl
index 83c45f5..eeee017 100644
--- a/tests/fn.fnl
+++ b/tests/fn.fnl
@@ -1,10 +1,9 @@
 (require-macros :fennel-test)
-(require-macros :init-macros)
+(require-macros (doto :cljlib require))
 (local (meta? fennel) (pcall require :fennel))
 
 (fn meta [x]
-  {:fnl/docstring (fennel.metadata:get x :fnl/docstring)
-   :fnl/arglist (fennel.metadata:get x :fnl/arglist)})
+  (fennel.metadata:get x))
 
 (deftest test-fn*
   (when meta?
diff --git a/tests/macros.fnl b/tests/macros.fnl
index 66cd158..3b3eeba 100644
--- a/tests/macros.fnl
+++ b/tests/macros.fnl
@@ -1,10 +1,9 @@
 (require-macros :fennel-test)
-(require-macros :init-macros)
+(require-macros (doto :cljlib require))
 (local (meta? fennel) (pcall require :fennel))
 
 (fn meta [x]
-  {:fnl/docstring (fennel.metadata:get x :fnl/docstring)
-   :fnl/arglist (fennel.metadata:get x :fnl/arglist)})
+  (fennel.metadata:get x))
 
 (deftest test-let-variants
   (testing "when-let"