Call unifier/prep in defrules, other clean up

Author: NoahTheDuke

.clj-kondo/config.edn

@@ -0,0 +1 @@
+{:lint-as {kibit.rules.util/defrules clj-kondo.lint-as/def-catch-all}}

src/kibit/check.clj

@@ -1,7 +1,6 @@
 (ns kibit.check
   "Kibit's integration point and public API"
   (:require [clojure.java.io :as io]
-            [clojure.core.logic.unifier :as unifier]
             [kibit.core :as core]
             [kibit.rules :as core-rules]
             [kibit.reporters :as reporters]
@@ -67,12 +66,13 @@
   "Construct the canonical simplify-map
   given an expression and a simplified expression."
   [expr simplified-expr]
-  {:expr       expr
-   :line       (-> expr meta :line)
-   :column     (-> expr meta :column)
-   :end-line   (-> expr meta :end-line)
-   :end-column (-> expr meta :end-column)
-   :alt        simplified-expr})
+  (let [expr-meta (meta expr)]
+    {:expr       expr
+     :line       (:line expr-meta)
+     :column     (:column expr-meta)
+     :end-line   (:end-line expr-meta)
+     :end-column (:end-column expr-meta)
+     :alt        simplified-expr}))
 
 ;; ### Guarding the check
 
@@ -169,7 +169,6 @@
         (merge default-args
                {:resolution :toplevel}
                (apply hash-map kw-opts))
-        rules (map unifier/prep rules)
         simplify-fn #((res->simplify resolution) % rules)]
     (check-aux expr simplify-fn guard)))
 
@@ -178,7 +177,6 @@
   (let [{:keys [rules guard resolution init-ns]}
         (merge default-args
                (apply hash-map kw-opts))
-        rules (map unifier/prep rules)
         simplify-fn #((res->simplify resolution) % rules)]
     (keep #(check-aux % simplify-fn guard)
           ((res->read-seq resolution) reader init-ns))))

src/kibit/rules/arithmetic.clj

@@ -23,7 +23,4 @@
   [(dec (Math/exp ?x)) (Math/expm1 ?x)]
 
   ;;ugly rounding tricks
-  [(long (+ ?x 0.5)) (Math/round ?x)]
-)
-
-
+  [(long (+ ?x 0.5)) (Math/round ?x)])

src/kibit/rules/control_structures.clj

@@ -21,24 +21,3 @@
    (while ?test . ?exprs)]
   [(let ?binding (do . ?exprs)) (let ?binding . ?exprs)]
   [(loop ?binding (do . ?exprs)) (loop ?binding . ?exprs)])
-
-(comment
-  (when (not (pred? x y)) (f x y))
-
-  (if (all-streams-complete?)
-    (do
-      (deliver @all-clear :true)
-      (info "All streams complete.")))
-
-  (if (pred? x)
-    (do (action a)
-        (action b)
-        (if-let [x (f a b c)
-                 y (g a b c)
-                 z (h a b c)]
-          (do (+ 1 0)
-              (= 1 1)
-              (< 1 0)))
-        (action d)
-        (action f))
-    nil))

src/kibit/rules/util.clj

@@ -12,7 +12,8 @@
 
 (defmacro defrules [name & rules]
   `(let [rules# (for [rule# '~rules]
-                  (if (raw-rule? rule#)
-                    (eval rule#) ;; raw rule, no need to compile
-                    (compile-rule rule#)))]
+                  (unifier/prep
+                    (if (raw-rule? rule#)
+                      (eval rule#) ;; raw rule, no need to compile
+                      (compile-rule rule#))))]
      (def ~name (vec rules#))))