Skip to content

Improve BigInt and BigDecimal support #1

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

Improve BigInt and BigDecimal support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fa3be0
Add failing tests for parsing numbers ending with period, M, or N
samumbach Apr 14, 2015
30ad80d
Accept well-formed BigInt and BigDecimal literals
samumbach Apr 14, 2015
8af6fd1
Extract common regular expression to a var
samumbach Apr 14, 2015
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
6 changes: 4 additions & 2 deletions src/valip/predicates.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Clojure implementations."
[cljs.reader :refer [read-string]])
(:refer-clojure :exclude [read-string]))

(def ^:private number-re #"\s*[+-]?\d+(\.\d*M?|M|N)?\s*")

(defn present?
"Returns false if x is nil or blank, true otherwise."
[x]
Expand Down Expand Up @@ -49,7 +51,7 @@ Clojure implementations."
(defn decimal-string?
"Returns true if the string represents a decimal number."
[s]
(boolean (re-matches #"\s*[+-]?\d+(\.\d+(M|M|N)?)?\s*" s)))
(boolean (re-matches number-re s)))

(defn digits?
"Returns true if a string consists only of numerical digits."
Expand All @@ -62,7 +64,7 @@ Clojure implementations."
(boolean (re-matches #"[A-Za-z0-9]+" s)))

(defn- parse-number [x]
(if (and (string? x) (re-matches #"\s*[+-]?\d+(\.\d+M|M|N)?\s*" x))
(if (and (string? x) (re-matches number-re x))
(read-string x)))

(defn gt
Expand Down
34 changes: 34 additions & 0 deletions test/valip/test/predicates.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
(is (decimal-string? " 8 "))
(is (decimal-string? "1.1"))
(is (decimal-string? "3.14159"))
(is (not (decimal-string? "N")))
(is (not (decimal-string? "M")))
(is (decimal-string? "3N"))
(is (decimal-string? "3M"))
(is (not (decimal-string? "3.N")))
(is (decimal-string? "3.M"))
(is (not (decimal-string? "3.14159N")))
(is (decimal-string? "3.14159M"))
(is (not (decimal-string? "foo")))
(is (not (decimal-string? "10x")))
(is (not (decimal-string? ""))))
Expand Down Expand Up @@ -97,6 +105,32 @@
(is (not ((lte 10) "11")))
(is (not ((lte 10) ""))))

(deftest comparing-bigint-bigdec
(are [input is-lt is-lte is-gte is-gt]
(and (= is-lt (boolean ((lt 10) input)))
(= is-lte (boolean ((lte 10) input)))
(= is-gte (boolean ((gte 10) input)))
(= is-gt (boolean ((gt 10) input))))
"9" true true false false
"9N" true true false false
"9M" true true false false
"9." true true false false
"9.M" true true false false
"9.99" true true false false
"9.99M" true true false false
"10" false true true false
"10N" false true true false
"10M" false true true false
"10." false true true false
"10.M" false true true false
"10.0" false true true false
"10.0M" false true true false
"10.01" false false true true
"10.01M" false false true true
"11" false false true true
"11N" false false true true
"11M" false false true true))

(deftest test-over
(is (= over gt)))

Expand Down