Skip to content

Add functions: reversible? sorted? special-symbol? parse-uuid #375

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

Open
brandoncorrea wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add functions: reversible? sorted? special-symbol? parse-uuid #375

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions clj/src/cljd/core.cljd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,10 @@
(-rseq [coll]
"Returns a seq of the items in coll in reversed order."))

(defn ^bool reversible?
"Returns true if coll satisfies? IReversible"
[coll] (satisfies? IReversible coll))

(defn rseq
"Returns, in constant time, a seq of the items in rev (which
can be a vector or sorted-map), in reverse order. If rev is empty returns nil"
Expand All @@ -1679,6 +1683,10 @@
"Like -sorted-seq bur returns a sequence in descending order.
from and to MUST NOT be swapped, they are interpreted as per -sorted-seq."))

(defn ^bool sorted?
"Returns true if coll satisfies ISorted"
[coll] (satisfies? ISorted coll))

(defn subseq
"sc must be a sorted collection, test(s) one of <, <=, > or
>=. Returns a seq of those entries with keys ek for
Expand Down Expand Up @@ -1967,6 +1975,13 @@
[x]
(boolean (and (symbol? x) (namespace x) true)))

(defn ^bool special-symbol?
"Returns true if x names a special form"
[x]
(contains? '#{. & set! dart/is? dart/await dart/async-barrier dart/run-zoned dart/assert dart/type-like
throw new ns try catch finally case* quote do var let* loop* recur if fn* letfn def
reify* deftype* defprotocol* defmethod* defmulti* extend-type-protocol*} x))

(defn symbol
"Returns a Symbol with the given namespace and name. Arity-1 works
on strings, keywords, and vars."
Expand Down Expand Up @@ -9458,6 +9473,19 @@ specified.
(double/tryParse s)
(throw (ArgumentError (parsing-err s)))))

(def ^:private uuid-regex
#"^[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]$")

(defn parse-uuid
"Parse a string representing a UUID and return a UUID instance,
or nil if parse fails.

Grammar: https://docs.oracle.com/javase/8/docs/api/java/util/UUID.html#toString--"
[s]
(if (string? s)
(when (re-matches uuid-regex s) (uuid s))
(throw (ArgumentError. (parsing-err s)))))

(defn ^bool? parse-boolean
{:doc "Parse strings \"true\" or \"false\" and return a boolean, or nil if invalid"
:added "1.11"}
Expand Down
8 changes: 1 addition & 7 deletions clj/src/cljd/reader.cljd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,15 +585,9 @@
(defn unquote-splicing? [form]
(and (seq? form) (= 'cljd.core/unquote-splicing (first form))))

;; TODO: should not be in reader.cljd
(defn special-form? [form]
(contains? '#{. set! dart/is? dart/await dart/async-barrier dart/run-zoned dart/assert dart/type-like
throw new ns try case* quote do var let* loop* recur if fn* letfn def reify* deftype*
defprotocol* defmethod* defmulti* extend-type-protocol*} form))

(defn- syntax-quote [form]
(cond
(special-form? form) (list 'quote form)
(special-symbol? form) (list 'quote form)
(symbol? form)
(let [nsform (namespace form)
nameform (name form)]
Expand Down
34 changes: 33 additions & 1 deletion clj/test/cljd/test_clojure/parse.cljd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns cljd.test-clojure.parse
(:require
[clojure.test :refer [deftest is are]]))
[clojure.test :refer [deftest is are testing]]))

(def max-int-32 0x7fffffff) ;; 2147483647
(def max-int-64 0x7fffffffffffffff) ;; 9223372036854775807
Expand Down Expand Up @@ -88,6 +88,38 @@

(is true res)))

(deftest test-parse-uuid
(are [x] (uuid? (parse-uuid x))
"e2c6efed-dabf-4f55-90bd-58f2c22863be"
"1f43838a-80fc-4a8a-be89-306a343ac867")

(testing "lower and upper case"
(let [uuid-lower (parse-uuid "cb048ac2-5e0b-439e-a59f-dfdf11651be0")
uuid-upper (parse-uuid "CB048AC2-5E0B-439E-A59F-DFDF11651BE0")]
(is (= uuid-lower uuid-upper))
(is (uuid? uuid-lower))
(is (uuid? uuid-upper))))

(testing "invalid format"
(are [x] (nil? (parse-uuid x))
""
"0"
"abc123"
"000000000-0000-0000-0000-000000000000" ;; extra leading
"00000000-0000-0000-0000-0000000000000")) ;; extra trailing

(testing "bad input"
(are [x] (thrown? ArgumentError (parse-uuid x))
nil
0
0.0
:foo
'foo
[]
'()
{}
#{})))

(deftest test-parse-boolean
(is (identical? true (parse-boolean "true")))
(is (identical? false (parse-boolean "false")))
Expand Down
76 changes: 56 additions & 20 deletions clj/test/cljd/test_clojure/predicates.cljd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,29 +143,28 @@

(def pred-val-table
(let [now (DateTime/now)
;; uuid (java.util.UUID/randomUUID)
uuid (random-uuid)
;; barray (byte-array 0)
iarray (int-array 0)
uri (Uri/parse "http://clojure.org")]
[
[identity int? pos-int? neg-int? nat-int? double? boolean? indexed? seqable? ident? #_uuid? #_decimal? inst? uri? #_bytes?]
[0 true false false true false false false false false #_false #_false false false #_false]
[1 true true false true false false false false false #_false #_false false false #_false]
[-1 true false true false false false false false false #_false #_false false false #_false]
[1.0 false false false false true false false false false #_false #_false false false #_false]
[true false false false false false true false false false #_false #_false false false #_false]
[[] false false false false false false true true false #_false #_false false false #_false]
[nil false false false false false false true true false #_false #_false false false #_false]
[{} false false false false false false false true false #_false #_false false false #_false]
[:foo false false false false false false false false true #_false #_false false false #_false]
['foo false false false false false false false false true #_false #_false false false #_false]
#_[0.0M false false false false false false false false false #_false #_true false false #_false]
#_[0N false false false false false false false false false #_false #_false false false #_false]
#_[uuid false false false false false false false false false #_true #_false false false #_false]
[uri false false false false false false false false false #_false #_false false true #_false]
[now false false false false false false false false false #_false #_false true false #_false]
[iarray false false false false false false true true false #_false #_false false false #_false]
#_[barray false false false false false false false true false #_false #_false false false #_true]]))
[[identity int? pos-int? neg-int? nat-int? double? boolean? indexed? seqable? reversible? ident? uuid? #_decimal? inst? uri? #_bytes?]
[0 true false false true false false false false false false false #_false false false #_false]
[1 true true false true false false false false false false false #_false false false #_false]
[-1 true false true false false false false false false false false #_false false false #_false]
[1.0 false false false false true false false false false false false #_false false false #_false]
[true false false false false false true false false false false false #_false false false #_false]
[[] false false false false false false true true true false false #_false false false #_false]
[nil false false false false false false true true false false false #_false false false #_false]
[{} false false false false false false false true false false false #_false false false #_false]
[:foo false false false false false false false false false true false #_false false false #_false]
['foo false false false false false false false false false true false #_false false false #_false]
#_[0.0M false false false false false false false false false false false #_true false false #_false]
#_[0N false false false false false false false false false false false #_false false false #_false]
[uuid false false false false false false false false false false true #_false false false #_false]
[uri false false false false false false false false false false false #_false false true #_false]
[now false false false false false false false false false false false #_false true false #_false]
[iarray false false false false false false true true false false false #_false false false #_false]
#_[barray false false false false false false false true false false false #_false false false #_true]]))

(deftest test-preds
(let [[preds & rows] pred-val-table]
Expand All @@ -175,6 +174,24 @@
(is (= ((nth preds i) v) (nth row i))
(pr-str (list (get-fn-name (nth preds i)) v))))))))

(deftest test-sorted?
(are [x] (not (sorted? x))
nil
0
-1.0
true
:abc
""
[]
#{}
{}
[1 2 3])
(are [x] (sorted? x)
(sorted-map)
(sorted-map-by compare :foo :bar)
(sorted-set)
(sorted-set-by compare :foo :bar)))

;; Special double predicates

(deftest test-double-preds
Expand All @@ -201,3 +218,22 @@
(is (thrown? Error (infinite? nil-value)))
(is (thrown? Error (infinite? kw-value))))
)

(deftest test-special-symbol?
(are [x] (not (special-symbol? x))
nil
true
false
"foo"
0
0.0
:foo
'foo/bar
'defn
'require
'letfn*
'ns/ns)
(are [x] (special-symbol? x)
'. '& 'set! 'if 'def 'throw 'new 'ns 'try 'catch 'finally 'do 'var 'letfn 'quote 'recur
'dart/is? 'dart/await 'dart/async-barrier 'dart/run-zoned 'dart/assert 'dart/type-like
'case* 'let* 'loop* 'fn* 'reify* 'deftype* 'defprotocol* 'defmethod* 'defmulti* 'extend-type-protocol*))