@@ -12,8 +12,11 @@ module Data.Text.Validator (
1212
1313import qualified Data.Text as T
1414import Data.Char
15+import Data.Limits
1516
1617isValidChar :: Char -> Bool
18+isValidChar '\n' = True
19+isValidChar '\r' = True
1720isValidChar = isPrint
1821
1922class HasValidatableText t where
@@ -29,16 +32,6 @@ instance (HasValidatableText t) => HasValidatableText (ExtraPredicate t) where
2932 validateText (t `ExtraPredicate` p) = validateText t && p t
3033
3134
32−
33−-- instance (Traversable f) => HasValidatableText (RangeableText (ExtraPredicate (f String))) where
34−-- validateText ((t `ExtraPredicate` p) `RangeableText` lims) = p t && validateText (t `RangeableText` lims)
35−
36−-- instance HasValidatableText (RangeableText (ExtraPredicate (f T.Text))) where
37−-- validateText ((t `ExtraPredicate` p) `RangeableText` lims) = p t && validateText (t `RangeableText` lims)
38−
39−-- instance (Foldable f) => HasValidatableText (RangeableText (ExtraPredicate (f T.Text))) where
40−-- validateText ((t `ExtraPredicate` p) `RangeableText` lims) = p t && validateText (t `RangeableText` lims)
41−
4235infixl 5 ~<
4336(~<) :: t -> Int -> RangeableText t
4437t ~< n = t <~> (0, n)
@@ -59,16 +52,8 @@ instance HasValidatableText (RangeableText T.Text) where
5952 where
6053 len = T.length t
6154
62−-- instance HasValidatableText (RangeableText T.Text) where
63−-- validateText (t `RangeableText` (lower, upper)) = len >= lower && len <= upper
64−-- where
65−-- len = T.length t
66−
67−-- instance (Traversable t, HasValidatableText v) => HasValidatableText (t v) where
68−-- validateText = all validateText
69−
7055instance HasValidatableText T.Text where
71− validateText t = T.all isValidChar t && (not . T.null) t
56+ validateText t = T.all isValidChar t && (not . T.null) t && T.length t < globalTextLimit
7257
7358instance HasValidatableText String where
74− validateText t = all isValidChar t && length t > 0
59+ validateText t = all isValidChar t && length t > 0 && length t < globalTextLimit