Permalink
Browse files

Started moving form utils into parsing

  • Loading branch information...
1 parent 84e25ce commit de136a06845a76599bb15e4ffd272e2393525613 @marick committed Jan 26, 2013
@@ -1,7 +1,7 @@
(ns ^{:doc "Mostly functions for identifying semi-sweet expects, and for converting
midje.sweet arrow forms into semi-sweet expcet forms."}
midje.parsing.1-to-explicit-form.expects
- (:use [midje.util.treelike :only [tree-variant]]
+ (:use midje.parsing.util.form-utils
[midje.util.namespace :only [matches-symbols-in-semi-sweet-or-sweet-ns?]]
[midje.util.form-utils :only [first-named?]]
[midje.parsing.util.zip :only [skip-to-rightmost-leaf n-times remove-moving-right]]
@@ -2,7 +2,8 @@
midje.parsing.util.arrows
(:use midje.clojure.core
midje.parsing.arrow-symbols
- [midje.util form-utils treelike namespace])
+ midje.parsing.util.form-utils
+ [midje.util form-utils namespace])
(:require [clojure.zip :as zip]))
;; Arrow groupings
@@ -1,8 +1,11 @@
-(ns midje.util.treelike
+(ns ^{:doc "Utility functions dealing with checking or tranforming forms or zippers."}
+ midje.parsing.util.form-utils
+ (:use midje.clojure.core
+ [utilize.seq :only (first-truthy-fn)])
(:require [clojure.zip :as zip]))
-
+
+
(defn tree-variant [treelike]
(letfn [(is-zipper? [treelike]
(:zip/make-node (meta treelike)))]
(if (is-zipper? treelike) :zipper :form)))
-
@@ -1,7 +1,7 @@
(ns ^{:doc "Utility functions dealing with checking or tranforming forms."}
midje.util.form-utils
(:use midje.clojure.core
- [midje.util.treelike :only [tree-variant]]
+ [midje.parsing.util.form-utils]
[utilize.seq :only (first-truthy-fn)])
(:require [clojure.zip :as zip]))
@@ -1,6 +1,6 @@
(ns midje.util.namespace
(:use midje.clojure.core
- midje.util.treelike)
+ midje.parsing.util.form-utils)
(:require [clojure.zip :as zip]))

0 comments on commit de136a0

Please sign in to comment.