move interpolate

pleasetrythisathome · Nov 25, 2014 · deeb8e0 · deeb8e0
1 parent 45796a1
commit deeb8e0
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/bardo/interpolate.cljx b/src/bardo/interpolate.cljx
@@ -95,19 +95,9 @@
                  [1 (_ :guard sequential?)] (take (count end) v)
                  [_ _] v))))))
 
-(defprotocol IInterpolate (-interpolate [start end]))
+(declare interpolate)
 
-(defn interpolate [start end]
-  (let [wrapped (some->> [start end]
-                         (apply wrap-nil)
-                         (apply wrap-errors)
-                         (apply wrap-infinite))]
-    (let [can-interpolate (mapv #(satisfies? IInterpolate %) wrapped)]
-      (if (apply = true can-interpolate)
-        ((apply wrap-size wrapped) (apply -interpolate wrapped))
-        (do
-          (throw
-           (#+cljs js/Exception #+clj Exception. (str "Cannot interpolate between " start " and " end))))))))
+(defprotocol IInterpolate (-interpolate [start end]))
 
 (extend-protocol IInterpolate
 
@@ -140,3 +130,15 @@
                          (map k)
                          (apply interpolate)
                          (#(% t)))])))))
+
+(defn interpolate [start end]
+  (let [wrapped (some->> [start end]
+                         (apply wrap-nil)
+                         (apply wrap-errors)
+                         (apply wrap-infinite))]
+    (let [can-interpolate (mapv #(satisfies? IInterpolate %) wrapped)]
+      (if (apply = true can-interpolate)
+        ((apply wrap-size wrapped) (apply -interpolate wrapped))
+        (do
+          (throw
+           (#+cljs js/Exception #+clj Exception. (str "Cannot interpolate between " start " and " end))))))))