cleanup: parser modifications

Author: oakmac

src/json_path/parser.clj

@@ -8,24 +8,22 @@
 (def boolean-ops
   {"&&" :and, "||" :or})
 
-(def boolean-ops-strings (set (keys boolean-ops)))
-
 (def comparator-ops
   {"=" :eq, "!=" :neq, "<" :lt, "<=" :lt-eq, ">" :gt, ">=" :gt-eq})
 
+(def boolean-ops-strings (set (keys boolean-ops)))
+(def comparator-ops-strings (set (keys comparator-ops)))
+
 (defn parse-boolean-expr [expr]
   (let [lhs (take-while #(not (boolean-ops-strings %)) expr)
         op (first (drop-while #(not (boolean-ops-strings %)) expr))
         rhs (rest (drop-while #(not (boolean-ops-strings %)) expr))]
     [(boolean-ops op) (parse-expr lhs) (parse-expr rhs)]))
 
 (defn parse-comparator-expr [expr]
-  (let [supported-ops (set (keys comparator-ops))
-        lhs (take-while #(not (supported-ops %)) expr)
-        op (first (drop-while #(not (supported-ops %)) expr))
-        rhs (rest (drop-while #(not (supported-ops %)) expr))]
-    ; (if (nil? op)
-    ;   [:some (parse lhs)])
+  (let [lhs (take-while #(not (comparator-ops-strings %)) expr)
+        op (first (drop-while #(not (comparator-ops-strings %)) expr))
+        rhs (rest (drop-while #(not (comparator-ops-strings %)) expr))]
     [(comparator-ops op) (parse lhs) (parse rhs)]))
 
 (defn parse-expr [expr]
@@ -34,10 +32,6 @@
     (some (set (keys comparator-ops)) expr) (parse-comparator-expr expr)
     :else [:some (parse expr)]))
 
-  ; (if (some boolean-ops-strings expr)
-  ;   (parse-boolean-expr expr)
-  ;   (parse-comparator-expr expr)))
-
 (defn parse-indexer [remaining]
   (let [next (first remaining)]
     (cond