Skip to content

Commit 0d928a1

Browse files
committed
Merge branch 'pr-1138' into stack-1.0.5
2 parents 86fec35 + c13445e commit 0d928a1

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

src/Char.elm

+15-19
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module Char exposing
2525
@docs toCode, fromCode
2626
-}
2727

28-
import Basics exposing (Bool, Int, (&&), (||), (>=), (<=))
28+
import Basics exposing (Bool, Int, (&&), (||), (>=), (<=), (==), (/=))
2929
import Elm.Kernel.Char
3030

3131

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

6868

69-
{-| Detect upper case ASCII characters.
69+
{-| Detect upper case Unicode characters.
7070
7171
isUpper 'A' == True
7272
isUpper 'B' == True
7373
...
7474
isUpper 'Z' == True
7575
76+
isUpper 'Σ' == True
77+
7678
isUpper '0' == False
7779
isUpper 'a' == False
7880
isUpper '-' == False
79-
isUpper 'Σ' == False
8081
-}
8182
isUpper : Char -> Bool
8283
isUpper char =
83-
let
84-
code =
85-
toCode char
86-
in
87-
code <= 0x5A && 0x41 <= code
84+
(char == toUpper char)
85+
&& (char /= toLower char)
8886

8987

90-
{-| Detect lower case ASCII characters.
88+
{-| Detect lower case Unicode characters.
9189
9290
isLower 'a' == True
9391
isLower 'b' == True
9492
...
9593
isLower 'z' == True
9694
95+
isLower 'π' == True
96+
9797
isLower '0' == False
9898
isLower 'A' == False
9999
isLower '-' == False
100-
isLower 'π' == False
101100
-}
102101
isLower : Char -> Bool
103102
isLower char =
104-
let
105-
code =
106-
toCode char
107-
in
108-
0x61 <= code && code <= 0x7A
103+
(char == toLower char)
104+
&& (char /= toUpper char)
109105

110106

111-
{-| Detect upper case and lower case ASCII characters.
107+
{-| Detect upper case and lower case Unicode characters.
112108
113109
isAlpha 'a' == True
114110
isAlpha 'b' == True
115111
isAlpha 'E' == True
116112
isAlpha 'Y' == True
113+
isAlpha 'π' == True
117114
118115
isAlpha '0' == False
119116
isAlpha '-' == False
120-
isAlpha 'π' == False
121117
-}
122118
isAlpha : Char -> Bool
123119
isAlpha char =
124120
isLower char || isUpper char
125121

126122

127-
{-| Detect upper case and lower case ASCII characters.
123+
{-| Detect upper case and lower case Unicode characters.
128124
129125
isAlphaNum 'a' == True
130126
isAlphaNum 'b' == True
131127
isAlphaNum 'E' == True
132128
isAlphaNum 'Y' == True
133129
isAlphaNum '0' == True
134130
isAlphaNum '7' == True
131+
isAlphaNum 'π' == True
135132
136133
isAlphaNum '-' == False
137-
isAlphaNum 'π' == False
138134
-}
139135
isAlphaNum : Char -> Bool
140136
isAlphaNum char =

0 commit comments

Comments
 (0)