Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add :simplify-guard keyword argument to check-via-reader and check-file. #21

Merged
merged 1 commit into from
Mar 23, 2012
Merged

Add :simplify-guard keyword argument to check-via-reader and check-file. #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/jonase/kibit/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,14 @@
a reader and returns a lazy sequence of the result of unification
(`simplify` function)."
([reader & kw-opts]
(let [{:keys [rules verbose]
:or {rules all-rules,
(let [{:keys [rules simplify-guard verbose]
:or {rules all-rules
simplify-guard unique-alt?
verbose false}} (apply hash-map kw-opts)]
(if verbose
(keep #(simplify-one % rules)
(keep #(simplify-one % rules simplify-guard)
(mapcat expr-seq (read-file (LineNumberingPushbackReader. reader))))
(keep #(simplify % rules) (read-file (LineNumberingPushbackReader. reader)))))))
(keep #(simplify % rules simplify-guard) (read-file (LineNumberingPushbackReader. reader)))))))

;; The results from simplify get passed to a `reporter`.
;; A reporter can be any function that expects a single map.
Expand All @@ -161,12 +162,13 @@
"Checks every expression (including sub-expressions) in a clojure
source file against the rules and processes them with a reporter"
([source-file & kw-opts]
(let [{:keys [rules verbose reporter]
(let [{:keys [rules simplify-guard verbose reporter]
:or {rules all-rules
simplify-guard unique-alt?
verbose false
reporter reporters/cli-reporter}} (apply hash-map kw-opts)]
(with-open [reader (io/reader source-file)]
(doseq [simplify-map (check-via-reader
reader :rules rules :verbose verbose)]
reader :rules rules :verbose verbose :simplify-guard simplify-guard)]
(reporter simplify-map))))))