git.iko.soy/elk
on master help sign in
Switch fromString to fromText
17a8c76Evan Czaplicki
src/Elm/Compiler/Module.hs+34−34
compare with master
unifiedsplit
@@ -4,7 +4,7 @@ module Elm.Compiler.Module
4 ( Interface, Interfaces
4 ( Interface, Interfaces
5 , ModuleName.Raw
5 , ModuleName.Raw
6 , nameToPath
6 , nameToPath
7− , nameToString, nameFromString
7+ , nameToString, nameFromText
8 , hyphenate, dehyphenate
8 , hyphenate, dehyphenate
9 , RawForJson(RawForJson), fromJson
9 , RawForJson(RawForJson), fromJson
10 , interfaceAliasedTypes, programTypes
10 , interfaceAliasedTypes, programTypes
@@ -78,39 +78,43 @@ nameToString name =
78 Text.unpack name
78 Text.unpack name
79
79
80
80
81−nameFromString :: String -> Maybe ModuleName.Raw
81+nameFromText :: Text -> Maybe ModuleName.Raw
82−nameFromString =
82+nameFromText =
83− fromString '.'
83+ fromText '.'
84
84
85
85
86−hyphenate :: ModuleName.Raw -> String
86+hyphenate :: ModuleName.Raw -> Text
87−hyphenate names =
87+hyphenate name =
88− Text.unpack (Text.replace "." "-" names)
88+ Text.replace "." "-" name
89
89
90
90
91−dehyphenate :: String -> Maybe ModuleName.Raw
91+dehyphenate :: Text -> Maybe ModuleName.Raw
92dehyphenate =
92dehyphenate =
93− fromString '-'
93+ fromText '-'
94
94
95
95
96−fromString :: Char -> String -> Maybe ModuleName.Raw
96+fromText :: Char -> Text -> Maybe ModuleName.Raw
97−fromString sep raw =
97+fromText sep name =
98+ let
98− do chunks <- mapM isLegit names
99+ chunks =
99− return (Text.pack (List.intercalate "." chunks))
100+ Text.splitOn (Text.singleton sep) name
100− where
101+ in
101− names =
102+ if all isGoodChunk chunks then Just name else Nothing
102− filter (/= [sep]) (List.groupBy (\a b -> a /= sep && b /= sep) raw)
103+
103
104
104− isLegit name =
105+isGoodChunk :: Text -> Bool
105− case name of
106+isGoodChunk chunk =
106− [] ->
107+ case Text.uncons chunk of
107− Nothing
108+ Nothing ->
109+ False
108
110
109− char:rest ->
111+ Just (first, rest) ->
110− if Char.isUpper char && all legitChar rest then Just name else Nothing
112+ Char.isUpper first && Text.all isGoodChar rest
111
113
112− legitChar char =
114+
115+isGoodChar :: Char -> Bool
116+isGoodChar char =
113− Char.isAlphaNum char || char == '_'
117+ Char.isAlphaNum char || char == '_'
114
118
115
119
116
120
@@ -124,16 +128,12 @@ instance Json.ToJSON RawForJson where
124
128
125instance Json.FromJSON RawForJson where
129instance Json.FromJSON RawForJson where
126 parseJSON (Json.String text) =
130 parseJSON (Json.String text) =
127− let
131+ case nameFromText text of
128− rawString =
129− Text.unpack text
130− in
131− case nameFromString rawString of
132− Nothing ->
132+ Nothing ->
133− fail (rawString ++ " is not a valid module name")
133+ fail (Text.unpack text ++ " is not a valid module name")
134−
134+
135− Just name ->
135+ Just name ->
136− return (RawForJson name)
136+ return (RawForJson name)
137
137
138 parseJSON _ =
138 parseJSON _ =
139 fail "expecting the module name to be a string"
139 fail "expecting the module name to be a string"