Skip to content
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.

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

Make Char.isLower and Char.isUpper Unicode-aware (2nd try) #1138

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
34 changes: 15 additions & 19 deletions src/Char.elm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module Char exposing
@docs toCode, fromCode
-}

import Basics exposing (Bool, Int, (&&), (||), (>=), (<=))
import Basics exposing (Bool, Int, (&&), (||), (>=), (<=), (==), (/=))
import Elm.Kernel.Char


Expand Down Expand Up @@ -66,75 +66,71 @@ type Char = Char -- NOTE: The compiler provides the real implementation.
-- CLASSIFICATION


{-| Detect upper case ASCII characters.
{-| Detect upper case Unicode characters.

isUpper 'A' == True
isUpper 'B' == True
...
isUpper 'Z' == True

isUpper 'Σ' == True

isUpper '0' == False
isUpper 'a' == False
isUpper '-' == False
isUpper 'Σ' == False
-}
isUpper : Char -> Bool
isUpper char =
let
code =
toCode char
in
code <= 0x5A && 0x41 <= code
(char == toUpper char)
&& (char /= toLower char)


{-| Detect lower case ASCII characters.
{-| Detect lower case Unicode characters.

isLower 'a' == True
isLower 'b' == True
...
isLower 'z' == True

isLower 'π' == True

isLower '0' == False
isLower 'A' == False
isLower '-' == False
isLower 'π' == False
-}
isLower : Char -> Bool
isLower char =
let
code =
toCode char
in
0x61 <= code && code <= 0x7A
(char == toLower char)
&& (char /= toUpper char)


{-| Detect upper case and lower case ASCII characters.
{-| Detect upper case and lower case Unicode characters.

isAlpha 'a' == True
isAlpha 'b' == True
isAlpha 'E' == True
isAlpha 'Y' == True
isAlpha 'π' == True

isAlpha '0' == False
isAlpha '-' == False
isAlpha 'π' == False
-}
isAlpha : Char -> Bool
isAlpha char =
isLower char || isUpper char


{-| Detect upper case and lower case ASCII characters.
{-| Detect upper case and lower case Unicode characters.

isAlphaNum 'a' == True
isAlphaNum 'b' == True
isAlphaNum 'E' == True
isAlphaNum 'Y' == True
isAlphaNum '0' == True
isAlphaNum '7' == True
isAlphaNum 'π' == True

isAlphaNum '-' == False
isAlphaNum 'π' == False
-}
isAlphaNum : Char -> Bool
isAlphaNum char =
Expand Down