aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/test/lux/control/parser/text.lux
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/test/lux/control/parser/text.lux')
-rw-r--r--stdlib/source/test/lux/control/parser/text.lux60
1 files changed, 31 insertions, 29 deletions
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index dd5f4d6a8..486fc8798 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -13,7 +13,7 @@
["%" format (#+ format)]
["." unicode #_
["#" set]
- ["#/." segment]]]
+ ["#/." block]]]
[number
["n" nat]]
[collection
@@ -83,52 +83,52 @@
(..should-fail out-of-range (/.range offset limit)))))
(do {! random.monad}
[expected (random.char unicode.ascii/upper-alpha)
- invalid (random.filter (|>> (unicode/segment.within? unicode/segment.basic-latin/upper-alpha) not)
- (random.char unicode.full))]
+ invalid (random.filter (|>> (unicode/block.within? unicode/block.basic-latin/upper-alpha) not)
+ (random.char unicode.character))]
(_.cover [/.upper]
(and (..should-pass (text.from-code expected) /.upper)
(..should-fail (text.from-code invalid) /.upper))))
(do {! random.monad}
[expected (random.char unicode.ascii/lower-alpha)
- invalid (random.filter (|>> (unicode/segment.within? unicode/segment.basic-latin/lower-alpha) not)
- (random.char unicode.full))]
+ invalid (random.filter (|>> (unicode/block.within? unicode/block.basic-latin/lower-alpha) not)
+ (random.char unicode.character))]
(_.cover [/.lower]
(and (..should-pass (text.from-code expected) /.lower)
(..should-fail (text.from-code invalid) /.lower))))
(do {! random.monad}
[expected (\ ! map (n.% 10) random.nat)
- invalid (random.char (unicode.set [unicode/segment.number-forms (list)]))]
+ invalid (random.char (unicode.set [unicode/block.number-forms (list)]))]
(_.cover [/.decimal]
(and (..should-pass (\ n.decimal encode expected) /.decimal)
(..should-fail (text.from-code invalid) /.decimal))))
(do {! random.monad}
[expected (\ ! map (n.% 8) random.nat)
- invalid (random.char (unicode.set [unicode/segment.number-forms (list)]))]
+ invalid (random.char (unicode.set [unicode/block.number-forms (list)]))]
(_.cover [/.octal]
(and (..should-pass (\ n.octal encode expected) /.octal)
(..should-fail (text.from-code invalid) /.octal))))
(do {! random.monad}
[expected (\ ! map (n.% 16) random.nat)
- invalid (random.char (unicode.set [unicode/segment.number-forms (list)]))]
+ invalid (random.char (unicode.set [unicode/block.number-forms (list)]))]
(_.cover [/.hexadecimal]
(and (..should-pass (\ n.hex encode expected) /.hexadecimal)
(..should-fail (text.from-code invalid) /.hexadecimal))))
(do {! random.monad}
[expected (random.char unicode.ascii/alpha)
invalid (random.filter (function (_ char)
- (not (or (unicode/segment.within? unicode/segment.basic-latin/upper-alpha char)
- (unicode/segment.within? unicode/segment.basic-latin/lower-alpha char))))
- (random.char unicode.full))]
+ (not (or (unicode/block.within? unicode/block.basic-latin/upper-alpha char)
+ (unicode/block.within? unicode/block.basic-latin/lower-alpha char))))
+ (random.char unicode.character))]
(_.cover [/.alpha]
(and (..should-pass (text.from-code expected) /.alpha)
(..should-fail (text.from-code invalid) /.alpha))))
(do {! random.monad}
[expected (random.char unicode.ascii/alpha-num)
invalid (random.filter (function (_ char)
- (not (or (unicode/segment.within? unicode/segment.basic-latin/upper-alpha char)
- (unicode/segment.within? unicode/segment.basic-latin/lower-alpha char)
- (unicode/segment.within? unicode/segment.basic-latin/decimal char))))
- (random.char unicode.full))]
+ (not (or (unicode/block.within? unicode/block.basic-latin/upper-alpha char)
+ (unicode/block.within? unicode/block.basic-latin/lower-alpha char)
+ (unicode/block.within? unicode/block.basic-latin/decimal char))))
+ (random.char unicode.character))]
(_.cover [/.alpha-num]
(and (..should-pass (text.from-code expected) /.alpha-num)
(..should-fail (text.from-code invalid) /.alpha-num))))
@@ -152,11 +152,12 @@
(..should-fail invalid /.space))))
(do {! random.monad}
[#let [num-options 3]
- options (|> (random.char unicode.full)
- (random.set n.hash num-options)
- (\ ! map (|>> set.to-list
- (list\map text.from-code)
- (text.join-with ""))))
+ chars (random.set n.hash num-options
+ (random.char unicode.character))
+ #let [options (|> chars
+ set.to-list
+ (list\map text.from-code)
+ (text.join-with ""))]
expected (\ ! map (function (_ value)
(|> options
(text.nth (n.% num-options value))
@@ -165,7 +166,7 @@
invalid (random.filter (|>> text.from-code
(text.contains? options)
not)
- (random.char unicode.full))]
+ (random.char unicode.character))]
(_.cover [/.one-of /.one-of! /.character-should-be]
(and (..should-pass (text.from-code expected) (/.one-of options))
(..should-fail (text.from-code invalid) (/.one-of options))
@@ -175,10 +176,11 @@
(..should-pass! (text.from-code expected) (/.one-of! options))
(..should-fail (text.from-code invalid) (/.one-of! options))
(..should-fail' (text.from-code invalid) (/.one-of! options)
- /.character-should-be))))
+ /.character-should-be)
+ )))
(do {! random.monad}
[#let [num-options 3]
- options (|> (random.char unicode.full)
+ options (|> (random.char unicode.character)
(random.set n.hash num-options)
(\ ! map (|>> set.to-list
(list\map text.from-code)
@@ -191,7 +193,7 @@
expected (random.filter (|>> text.from-code
(text.contains? options)
not)
- (random.char unicode.full))]
+ (random.char unicode.character))]
(_.cover [/.none-of /.none-of! /.character-should-not-be]
(and (..should-pass (text.from-code expected) (/.none-of options))
(..should-fail (text.from-code invalid) (/.none-of options))
@@ -396,9 +398,9 @@
(text\= expected actual))))))
(do {! random.monad}
[invalid (random.ascii/upper-alpha 1)
- expected (random.filter (|>> (unicode/segment.within? unicode/segment.basic-latin/upper-alpha)
+ expected (random.filter (|>> (unicode/block.within? unicode/block.basic-latin/upper-alpha)
not)
- (random.char unicode.full))
+ (random.char unicode.character))
#let [upper! (/.one-of! "ABCDEFGHIJKLMNOPQRSTUVWXYZ")]]
(_.cover [/.not /.not! /.expected-to-fail]
(and (..should-pass (text.from-code expected) (/.not /.upper))
@@ -416,9 +418,9 @@
[upper (random.ascii/upper-alpha 1)
lower (random.ascii/lower-alpha 1)
invalid (random.filter (function (_ char)
- (not (or (unicode/segment.within? unicode/segment.basic-latin/upper-alpha char)
- (unicode/segment.within? unicode/segment.basic-latin/lower-alpha char))))
- (random.char unicode.full))
+ (not (or (unicode/block.within? unicode/block.basic-latin/upper-alpha char)
+ (unicode/block.within? unicode/block.basic-latin/lower-alpha char))))
+ (random.char unicode.character))
#let [upper! (/.one-of! "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
lower! (/.one-of! "abcdefghijklmnopqrstuvwxyz")]]
(_.cover [/.and /.and!]