git.iko.soy/elk
on master help sign in
Get rid of some ModuleName.Raw references
3592fd8Evan Czaplicki
src/AST/Kernel.hs+4−4
compare with master
unifiedsplit
@@ -10,9 +10,9 @@ module AST.Kernel
10import Control.Monad (liftM, liftM2)
10import Control.Monad (liftM, liftM2)
11import Data.Binary
11import Data.Binary
12import qualified Data.ByteString as BS
12import qualified Data.ByteString as BS
13−import qualified Data.Text as Text
14
13
15import qualified AST.Module.Name as ModuleName
14import qualified AST.Module.Name as ModuleName
15+import qualified Elm.Name as N
16
16
17
17
18
18
@@ -32,7 +32,7 @@ data Data =
32
32
33data Content =
33data Content =
34 Content
34 Content
35− { _imports :: [(ModuleName.Raw, Text.Text)]
35+ { _imports :: [(N.Name, N.Name)]
36 , _chunks :: [Chunk]
36 , _chunks :: [Chunk]
37 }
37 }
38
38
@@ -43,8 +43,8 @@ data Content =
43
43
44data Chunk
44data Chunk
45 = JS BS.ByteString
45 = JS BS.ByteString
46− | Var ModuleName.Raw Text.Text
46+ | Var N.Name N.Name
47− | Field Text.Text
47+ | Field N.Name
48 | Debug
48 | Debug
49 | Prod
49 | Prod
50
50
src/Parse/Kernel.hs+4−4
@@ -16,7 +16,7 @@ import Data.Word (Word8)
16
16
17import qualified AST.Expression.Source as Src
17import qualified AST.Expression.Source as Src
18import qualified AST.Kernel as Kernel
18import qualified AST.Kernel as Kernel
19−import qualified AST.Module.Name as Module
19+import qualified AST.Module.Name as ModuleName
20import qualified Elm.Name as N
20import qualified Elm.Name as N
21import Generate.JavaScript.Helpers as Help (toFieldName)
21import Generate.JavaScript.Helpers as Help (toFieldName)
22import Generate.JavaScript.Variable as Var (intToAscii)
22import Generate.JavaScript.Variable as Var (intToAscii)
@@ -136,7 +136,7 @@ lookupEnum word var allEnums =
136
136
137
137
138type Imports =
138type Imports =
139− Map.Map Text (Module.Raw, Text)
139+ Map.Map Text (N.Name, N.Name)
140
140
141
141
142destructImport :: Src.Import -> Imports
142destructImport :: Src.Import -> Imports
@@ -148,8 +148,8 @@ destructImport (Src.Import (A.A _ moduleName) maybeAlias exposing) =
148 alias
148 alias
149
149
150 Nothing ->
150 Nothing ->
151− if Module.isKernel moduleName then
151+ if ModuleName.isKernel moduleName then
152− Module.getKernel moduleName
152+ ModuleName.getKernel moduleName
153 else if Text.isInfixOf "." moduleName then
153 else if Text.isInfixOf "." moduleName then
154 error ("modules with dots in kernel code need an alias: " ++ show moduleName)
154 error ("modules with dots in kernel code need an alias: " ++ show moduleName)
155 else
155 else