Add variadic string concatenation ||
This commit is contained in:
parent
25097af134
commit
61cf6eda5a
1 changed files with 2 additions and 2 deletions
|
|
@ -440,7 +440,7 @@
|
||||||
:regex :regexp})
|
:regex :regexp})
|
||||||
|
|
||||||
(def ^:private infix-ops
|
(def ^:private infix-ops
|
||||||
(-> #{"mod" "and" "or" "xor" "<>" "<=" ">="
|
(-> #{"mod" "and" "or" "xor" "<>" "<=" ">=" "||"
|
||||||
"in" "not-in" "like" "not-like" "regexp"
|
"in" "not-in" "like" "not-like" "regexp"
|
||||||
"is" "is-not" "not=" "!=" "regex"}
|
"is" "is-not" "not=" "!=" "regex"}
|
||||||
(into (map str "+-*/%|&^=<>"))
|
(into (map str "+-*/%|&^=<>"))
|
||||||
|
|
@ -492,7 +492,7 @@
|
||||||
(sequential? x)
|
(sequential? x)
|
||||||
(let [op (first x)
|
(let [op (first x)
|
||||||
op-ignore-nil #{:and :or}
|
op-ignore-nil #{:and :or}
|
||||||
op-variadic #{:and :or :+ :*}]
|
op-variadic #{:and :or :+ :* :||}]
|
||||||
(if (keyword? op)
|
(if (keyword? op)
|
||||||
(cond (infix-ops op)
|
(cond (infix-ops op)
|
||||||
(if (op-variadic op) ; no aliases here, no special semantics
|
(if (op-variadic op) ; no aliases here, no special semantics
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue