Skip to content

updated cuerdas to the latest version #29

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated cuerdas to the latest version #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5779a3
updated cuerdas to the latest version
yogthos Sep 5, 2021
4e0243c
added missing helper functions
yogthos Sep 8, 2021
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
2 changes: 1 addition & 1 deletion deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:deps {funcool/cuerdas {:mvn/version "2.2.0"}}
{:deps {funcool/cuerdas {:mvn/version "2021.05.29-0"}}
:paths ["src"]
:aliases
{:dev
Expand Down
31 changes: 29 additions & 2 deletions src/struct/core.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@

;; --- Impl details

(defn parse-number
"General purpose function for parse number like
string to number. It works with both integers
and floats."
[s]
(if (nil? s)
#?(:cljs js/NaN :clj Double/NaN)
(if (numeric? s)
(edn/read-string s)
#?(:cljs js/NaN :clj Double/NaN))))

(defn parse-int
"Return the number value in integer form."
[s]
(cond
(number? s)
(int s)

(and (string? s)
(re-matches #"-?\d+(\.\d+)?" s))
#?(:clj (.longValue (java.math.BigDecimal. ^String s))
:cljs (js/parseInt s 10))

:else
#?(:clj Double/NaN
:cljs js/NaN)))

(def ^:private map' #?(:cljs cljs.core/map
:clj clojure.core/map))

Expand Down Expand Up @@ -215,7 +242,7 @@
{:message "must be a number"
:optional true
:validate #(or (number? %) (and (string? %) (str/numeric? %)))
:coerce #(if (number? %) % (str/parse-number %))})
:coerce #(if (number? %) % (parse-number %))})

(def integer
{:message "must be a integer"
Expand All @@ -227,7 +254,7 @@
{:message "must be a long"
:optional true
:validate #(or (number? %) (and (string? %) (str/numeric? %)))
:coerce #(if (number? %) (int %) (str/parse-int %))})
:coerce #(if (number? %) (int %) (parse-int %))})

(def boolean
{:message "must be a boolean"
Expand Down