git.iko.soy/elk
on master help sign in
Get rid of some ModuleName.Raw references
commit3592fd889febdec712dc0cd77b4c5f9847720c74 authorEvan Czaplicki <evancz@users.noreply.github.com> dateWed 1 Nov 2017, 12:13 (9 years ago) parent6a866cc
2 files changed+8−8
compare with master
unifiedsplit
src/AST/Kernel.hs+4−4 src/Parse/Kernel.hs+4−4
src/AST/Kernel.hs+4−4
@@ -10,9 +10,9 @@ module AST.Kernel
1010import Control.Monad (liftM, liftM2)
1111import Data.Binary
1212import qualified Data.ByteString as BS
13−import qualified Data.Text as Text
1413
1514import qualified AST.Module.Name as ModuleName
15+import qualified Elm.Name as N
1616
1717
1818
@@ -32,7 +32,7 @@ data Data =
3232
3333data Content =
3434 Content
35− { _imports :: [(ModuleName.Raw, Text.Text)]
35+ { _imports :: [(N.Name, N.Name)]
3636 , _chunks :: [Chunk]
3737 }
3838
@@ -43,8 +43,8 @@ data Content =
4343
4444data Chunk
4545 = JS BS.ByteString
46− | Var ModuleName.Raw Text.Text
47− | Field Text.Text
46+ | Var N.Name N.Name
47+ | Field N.Name
4848 | Debug
4949 | Prod
5050
src/Parse/Kernel.hs+4−4
@@ -16,7 +16,7 @@ import Data.Word (Word8)
1616
1717import qualified AST.Expression.Source as Src
1818import qualified AST.Kernel as Kernel
19−import qualified AST.Module.Name as Module
19+import qualified AST.Module.Name as ModuleName
2020import qualified Elm.Name as N
2121import Generate.JavaScript.Helpers as Help (toFieldName)
2222import Generate.JavaScript.Variable as Var (intToAscii)
@@ -136,7 +136,7 @@ lookupEnum word var allEnums =
136136
137137
138138type Imports =
139− Map.Map Text (Module.Raw, Text)
139+ Map.Map Text (N.Name, N.Name)
140140
141141
142142destructImport :: Src.Import -> Imports
@@ -148,8 +148,8 @@ destructImport (Src.Import (A.A _ moduleName) maybeAlias exposing) =
148148 alias
149149
150150 Nothing ->
151− if Module.isKernel moduleName then
152− Module.getKernel moduleName
151+ if ModuleName.isKernel moduleName then
152+ ModuleName.getKernel moduleName
153153 else if Text.isInfixOf "." moduleName then
154154 error ("modules with dots in kernel code need an alias: " ++ show moduleName)
155155 else