move macros to macros.cljc

carocad · Aug 16, 2020 · 4198acc · 4198acc
1 parent c51928a
commit 4198acc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/test/parcera/macros.cljc b/test/parcera/macros.cljc
@@ -1,7 +1,19 @@
 (ns parcera.macros
   "Some of our tests use `slurp`, which ClojureScript lacks"
   #?(:clj (:refer-clojure :exclude [slurp]))
-  #?(:cljs (:require-macros [parcera.macros])))
+  #?(:cljs (:require-macros [parcera.macros]))
+  (:require [clojure.test :refer [is]]
+            [parcera.core :as parcera]))
 
 #?(:clj (defmacro slurp* [file]
           (clojure.core/slurp file)))
+
+#?(:clj (defmacro roundtrip
+          "checks parcera can parse and write back the exact same input code"
+          [input]
+          `(is (= ~input (parcera/code (parcera/ast ~input))))))
+
+
+#?(:clj (defmacro valid?
+          [input]
+          `(is (not (parcera/failure? (parcera/ast ~input))))))
diff --git a/test/parcera/test_cases.cljc b/test/parcera/test_cases.cljc
@@ -5,7 +5,7 @@
             [clojure.test.check.properties :as prop]
             [clojure.test.check :as tc]
             [parcera.core :as parcera]
-            [parcera.macros :refer [slurp*]]))
+            [parcera.macros :refer [slurp* roundtrip valid?]]))
 
 
 (defn- nested?
@@ -32,17 +32,6 @@
          (<= (:column end) (:column (last ends))))))
 
 
-(defmacro roundtrip
-  "checks parcera can parse and write back the exact same input code"
-  [input]
-  `(is (= ~input (parcera/code (parcera/ast ~input)))))
-
-
-(defmacro valid?
-  [input]
-  `(is (not (parcera/failure? (parcera/ast ~input)))))
-
-
 (def validity
   "The grammar definition of parcera is valid for any clojure value. Meaning
   that for any clojure value, parcera can create an AST for it"