Refactored out the equality rules into a new rule set

winks · Mar 19, 2012 · 8adf570 · 8adf570
1 parent ce6aec0
commit 8adf570
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/jonase/kibit/rules/arithmetic.clj b/src/jonase/kibit/rules/arithmetic.clj
@@ -6,22 +6,6 @@
   [(+ 1 ?x) (inc ?x)]
   [(- ?x 1) (dec ?x)]
 
-  [(= 0 ?x)  (zero? ?x)]
-  [(= ?x 0)  (zero? ?x)]
-  [(== 0 ?x) (zero? ?x)]
-  [(== ?x 0) (zero? ?x)]
-
-  [(< 0 ?x)  (pos? ?x)]
-  [(> ?x 0)  (pos? ?x)]
-  [(<= 1 ?x) (pos? ?x)]
-
-  [(< ?x 0) (neg? ?x)]
-
-  [(= ?x ?x)  true]
-  [(== ?x ?x) true]
-  [(zero? 0)  true]
-
   [(* ?x (* . ?xs)) (* ?x . ?xs)]
   [(+ ?x (+ . ?xs)) (+ ?x . ?xs)])
 
-
diff --git a/src/jonase/kibit/rules/equality.clj b/src/jonase/kibit/rules/equality.clj
@@ -0,0 +1,23 @@
+(ns jonase.kibit.rules.equality
+  (:use [jonase.kibit.rules.util :only [defrules]]))
+
+(defrules rules
+  ;; not=
+  [(not (= . ?args)) (not= . ?args)]
+
+  ;; zero?
+  [(= 0 ?x)  (zero? ?x)]
+  [(= ?x 0)  (zero? ?x)]
+  [(== 0 ?x) (zero? ?x)]
+  [(== ?x 0) (zero? ?x)]
+
+  [(< 0 ?x)  (pos? ?x)]
+  [(> ?x 0)  (pos? ?x)]
+  [(<= 1 ?x) (pos? ?x)]
+
+  [(< ?x 0) (neg? ?x)]
+
+  [(= ?x ?x)  true]
+  [(== ?x ?x) true]
+  [(zero? 0)  true])
+