2ecbee3 · elk · git.iko.soy

git.iko.soy/elk

Update compiler/* for new Elm.ModuleName module

commit2ecbee3637d2c4423bfb6b7b7909025b11c1b3be authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 26 Nov 2018, 11:04 (8 years ago) parent517ebd4

35 files changed+57−57

compare with master

unifiedsplit

compiler/src/AST/Canonical.hs+1−1

@@ -62,9 +62,9 @@ import Data.Text (Text)

6262import Data.Utf8 (Utf8)

6363

6464import qualified AST.Utils.Binop as Binop

65−import qualified AST.Module.Name as ModuleName

6665import qualified AST.Utils.Shader as Shader

6766import qualified Data.Index as Index

67+import qualified Elm.ModuleName as ModuleName

6868import qualified Reporting.Annotation as A

6969import qualified Reporting.Region as R

7070

compiler/src/AST/Optimized.hs+1−1

@@ -29,8 +29,8 @@ import Data.Text (Text)

2929import Data.Utf8 (Utf8)

3030

3131import qualified AST.Canonical as Can

32−import qualified AST.Module.Name as ModuleName

3332import qualified Data.Index as Index

33+import qualified Elm.ModuleName as ModuleName

3434import qualified Elm.Package as Pkg

3535import qualified Optimize.DecisionTree as DT

3636import qualified Reporting.Region as R

compiler/src/Canonicalize/Effects.hs+1−1

@@ -12,10 +12,10 @@ import qualified Data.Name as Name

1212

1313import qualified AST.Canonical as Can

1414import qualified AST.Valid as Valid

15−import qualified AST.Module.Name as ModuleName

1615import qualified AST.Utils.Type as Type

1716import qualified Canonicalize.Environment as Env

1817import qualified Canonicalize.Type as Type

18+import qualified Elm.ModuleName as ModuleName

1919import qualified Reporting.Annotation as A

2020import qualified Reporting.Error.Canonicalize as Error

2121import qualified Reporting.Region as R

compiler/src/Canonicalize/Environment.hs+1−1

@@ -25,8 +25,8 @@ import qualified Data.Name as Name

2525

2626import qualified AST.Utils.Binop as Binop

2727import qualified AST.Canonical as Can

28−import qualified AST.Module.Name as ModuleName

2928import qualified Data.Index as Index

29+import qualified Elm.ModuleName as ModuleName

3030import qualified Reporting.Error.Canonicalize as Error

3131import qualified Reporting.Region as R

3232import qualified Reporting.Result as Result

compiler/src/Canonicalize/Environment/Foreign.hs+1−1

@@ -14,9 +14,9 @@ import qualified Data.Name as Name

1414

1515import qualified AST.Canonical as Can

1616import qualified AST.Source as Src

17−import qualified AST.Module.Name as ModuleName

1817import qualified Canonicalize.Environment as Env

1918import qualified Elm.Interface as I

19+import qualified Elm.ModuleName as ModuleName

2020import qualified Reporting.Annotation as A

2121import qualified Reporting.Error.Canonicalize as Error

2222import qualified Reporting.Result as Result

compiler/src/Canonicalize/Environment/Local.hs+1−1

@@ -15,11 +15,11 @@ import qualified Data.Name as Name

1515import qualified AST.Canonical as Can

1616import qualified AST.Source as Src

1717import qualified AST.Valid as Valid

18−import qualified AST.Module.Name as ModuleName

1918import qualified Canonicalize.Environment as Env

2019import qualified Canonicalize.Environment.Dups as Dups

2120import qualified Canonicalize.Type as Type

2221import qualified Data.Index as Index

22+import qualified Elm.ModuleName as ModuleName

2323import qualified Reporting.Annotation as A

2424import qualified Reporting.Error.Canonicalize as Error

2525import qualified Reporting.Region as R

compiler/src/Canonicalize/Expression.hs+1−1

@@ -19,7 +19,6 @@ import qualified Data.Name as Name

1919

2020import qualified AST.Canonical as Can

2121import qualified AST.Source as Src

22−import qualified AST.Module.Name as ModuleName

2322import qualified AST.Utils.Binop as Binop

2423import qualified AST.Utils.Type as Type

2524import qualified AST.Valid as Valid

@@ -28,6 +27,7 @@ import qualified Canonicalize.Environment.Dups as Dups

2827import qualified Canonicalize.Pattern as Pattern

2928import qualified Canonicalize.Type as Type

3029import qualified Data.Index as Index

30+import qualified Elm.ModuleName as ModuleName

3131import qualified Elm.Package as Pkg

3232import qualified Reporting.Annotation as A

3333import qualified Reporting.Error.Canonicalize as Error

compiler/src/Canonicalize/Module.hs+1−1

@@ -12,7 +12,6 @@ import qualified Data.Name as Name

1212import qualified AST.Canonical as Can

1313import qualified AST.Source as Src

1414import qualified AST.Valid as Valid

15−import qualified AST.Module.Name as ModuleName

1615import qualified Canonicalize.Effects as Effects

1716import qualified Canonicalize.Environment as Env

1817import qualified Canonicalize.Environment.Dups as Dups

@@ -23,6 +22,7 @@ import qualified Canonicalize.Pattern as Pattern

2322import qualified Canonicalize.Type as Type

2423import qualified Data.Index as Index

2524import qualified Elm.Interface as I

25+import qualified Elm.ModuleName as ModuleName

2626import qualified Elm.Package as Pkg

2727import qualified Reporting.Annotation as A

2828import qualified Reporting.Error.Canonicalize as Error

compiler/src/Canonicalize/Pattern.hs+1−1

@@ -12,11 +12,11 @@ import qualified Data.Map.Strict as Map

1212import qualified Data.Name as Name

1313

1414import qualified AST.Canonical as Can

15−import qualified AST.Module.Name as ModuleName

1615import qualified AST.Source as Src

1716import qualified Canonicalize.Environment as Env

1817import qualified Canonicalize.Environment.Dups as Dups

1918import qualified Data.Index as Index

19+import qualified Elm.ModuleName as ModuleName

2020import qualified Reporting.Annotation as A

2121import qualified Reporting.Error.Canonicalize as Error

2222import qualified Reporting.Region as R

compiler/src/Compile.hs+1−1

@@ -13,10 +13,10 @@ import qualified Data.Name as Name

1313

1414import qualified AST.Canonical as Can

1515import qualified AST.Optimized as Opt

16−import qualified AST.Module.Name as ModuleName

1716import qualified Canonicalize.Module as Canonicalize

1817import qualified Elm.Docs as Docs

1918import qualified Elm.Interface as I

19+import qualified Elm.ModuleName as ModuleName

2020import qualified Elm.Package as Pkg

2121import qualified Nitpick.PatternMatches as PatternMatches

2222import qualified Optimize.Module as Optimize

compiler/src/Elm/Compiler.hs+5−4

@@ -17,8 +17,9 @@ import qualified Data.Map as Map

1717import qualified Data.Text as Text

1818

1919import qualified Compile

20−import qualified Elm.Compiler.Module as M

2120import qualified Elm.Compiler.Version

21+import qualified Elm.Interface as I

22+import qualified Elm.ModuleName as ModuleName

2223import qualified Elm.Package as Pkg

2324import qualified Json.Encode as Encode

2425import qualified Reporting.Doc as D

@@ -46,8 +47,8 @@ version =

4647compile

4748 :: Compile.DocsFlag

4849 -> Pkg.Name

49− -> Map.Map M.Raw M.Canonical

50− -> M.Interfaces

50+ -> Map.Map ModuleName.Raw ModuleName.Canonical

51+ -> I.Interfaces

5152 -> BS.ByteString

5253 -> ( [Warning.Warning], Either [Error.Error] Compile.Artifacts )

5354compile docsFlag pkg importDict interfaces source =

@@ -71,7 +72,7 @@ errorsToDoc filePath source errors =

7172-- ERRORS TO JSON

7273

7374

74−errorsToJson :: M.Raw -> FilePath -> Text.Text -> [Error.Error] -> Encode.Value

75+errorsToJson :: ModuleName.Raw -> FilePath -> Text.Text -> [Error.Error] -> Encode.Value

7576errorsToJson moduleName filePath source errors =

7677 let

7778 reports =

compiler/src/Elm/Compiler/Imports.hs+14−14

@@ -9,7 +9,7 @@ module Elm.Compiler.Imports

99import qualified Data.Name as Name

1010

1111import qualified AST.Source as Src

12−import qualified AST.Module.Name as Module

12+import qualified Elm.ModuleName as ModuleName

1313import qualified Elm.Package as Pkg

1414import qualified Reporting.Annotation as A

1515import qualified Reporting.Region as R

@@ -32,22 +32,22 @@ addDefaults pkgName imports =

3232

3333defaults :: [Src.Import]

3434defaults =

35− [ import_ Module.basics Nothing Src.Open

36− , import_ Module.debug Nothing closed

37− , import_ Module.list Nothing (operator "::")

38− , import_ Module.maybe Nothing (typeOpen Name.maybe)

39− , import_ Module.result Nothing (typeOpen Name.result)

40− , import_ Module.string Nothing (typeClosed Name.string)

41− , import_ Module.char Nothing (typeClosed Name.char)

42− , import_ Module.tuple Nothing closed

43− , import_ Module.platform Nothing (typeClosed Name.program)

44− , import_ Module.cmd (Just Name.cmd) (typeClosed Name.cmd)

45− , import_ Module.sub (Just Name.sub) (typeClosed Name.sub)

35+ [ import_ ModuleName.basics Nothing Src.Open

36+ , import_ ModuleName.debug Nothing closed

37+ , import_ ModuleName.list Nothing (operator "::")

38+ , import_ ModuleName.maybe Nothing (typeOpen Name.maybe)

39+ , import_ ModuleName.result Nothing (typeOpen Name.result)

40+ , import_ ModuleName.string Nothing (typeClosed Name.string)

41+ , import_ ModuleName.char Nothing (typeClosed Name.char)

42+ , import_ ModuleName.tuple Nothing closed

43+ , import_ ModuleName.platform Nothing (typeClosed Name.program)

44+ , import_ ModuleName.cmd (Just Name.cmd) (typeClosed Name.cmd)

45+ , import_ ModuleName.sub (Just Name.sub) (typeClosed Name.sub)

4646 ]

4747

4848

49−import_ :: Module.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import

50−import_ (Module.Canonical _ name) maybeAlias exposing =

49+import_ :: ModuleName.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import

50+import_ (ModuleName.Canonical _ name) maybeAlias exposing =

5151 Src.Import (A.At R.zero name) maybeAlias exposing

5252

5353

compiler/src/Elm/Compiler/Objects.hs+1−1

@@ -18,7 +18,7 @@ import qualified Data.Map as Map

1818import qualified Data.Name as Name

1919

2020import qualified AST.Optimized as Opt

21−import qualified AST.Module.Name as ModuleName

21+import qualified Elm.ModuleName as ModuleName

2222import qualified Elm.Package as Pkg

2323import qualified Generate.JavaScript as JS

2424

compiler/src/Elm/Compiler/Type/Extract.hs+1−1

@@ -16,10 +16,10 @@ import qualified Data.Set as Set

1616

1717import qualified AST.Canonical as Can

1818import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

2019import qualified AST.Utils.Type as Type

2120import qualified Elm.Compiler.Type as T

2221import qualified Elm.Interface as I

22+import qualified Elm.ModuleName as ModuleName

2323

2424

2525

compiler/src/Elm/Docs.hs+3−4

@@ -27,12 +27,11 @@ import qualified Data.Text as Text

2727import qualified Data.Text.Encoding as Text

2828

2929import qualified AST.Canonical as Can

30−import qualified AST.Module.Name as ModuleName

3130import qualified AST.Utils.Binop as Binop

3231import qualified Data.OneOrMore as OneOrMore

33−import qualified Elm.Compiler.Module as Module

3432import qualified Elm.Compiler.Type as Type

3533import qualified Elm.Compiler.Type.Extract as Extract

34+import qualified Elm.ModuleName as ModuleName

3635import qualified Json.Decode as D

3736import qualified Json.Encode as E

3837import Json.Encode ((==>))

@@ -98,7 +97,7 @@ data Binop = Binop Comment Type.Type Binop.Associativity Binop.Precedence

9897encode :: Module -> E.Value

9998encode (Module name comment unions aliases values binops) =

10099 E.object $

101− [ "name" ==> Module.encode name

100+ [ "name" ==> ModuleName.encode name

102101 , "comment" ==> E.text comment

103102 , "unions" ==> E.list encodeUnion (Map.toList unions)

104103 , "aliases" ==> E.list encodeAlias (Map.toList aliases)

@@ -138,7 +137,7 @@ named entryDecoder =

138137

139138nameDecoder :: D.Decoder Error Name.Name

140139nameDecoder =

141− D.mapError (const BadName) Module.decoder

140+ D.mapError (const BadName) ModuleName.decoder

142141

143142

144143typeDecoder :: D.Decoder Error Type.Type

compiler/src/Elm/Header.hs+2−2

@@ -10,7 +10,7 @@ import qualified Data.ByteString as B

1010import qualified Data.Name as Name

1111

1212import qualified AST.Source as Src

13−import qualified Elm.Compiler.Module as M

13+import qualified Elm.ModuleName as ModuleName

1414import qualified Elm.Package as Pkg

1515import qualified Parse.Primitives as Parser

1616import qualified Parse.Module as Module

@@ -29,7 +29,7 @@ data Tag = Normal | Effect | Port

2929-- PARSE

3030

3131

32−parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, M.Raw), [M.Raw])

32+parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, ModuleName.Raw), [ModuleName.Raw])

3333parse pkgName sourceCode =

3434 let

3535 headerParser =

compiler/src/Elm/Interface.hs+1−1

@@ -22,8 +22,8 @@ import qualified Data.Map.Merge.Strict as Map

2222import qualified Data.Name as Name

2323

2424import qualified AST.Canonical as Can

25−import qualified AST.Module.Name as ModuleName

2625import qualified AST.Utils.Binop as Binop

26+import qualified Elm.ModuleName as ModuleName

2727import qualified Reporting.Annotation as A

2828

2929

compiler/src/Elm/Kernel.hs+1−1

@@ -17,7 +17,7 @@ import Data.Word (Word8)

1717

1818import qualified AST.Optimized as Opt

1919import qualified AST.Source as Src

20−import qualified AST.Module.Name as ModuleName

20+import qualified Elm.ModuleName as ModuleName

2121import qualified Elm.Package as Pkg

2222import Parse.Primitives (Parser, run)

2323import qualified Parse.Primitives.Kernel as K

compiler/src/Generate/JavaScript.hs+1−1

@@ -20,9 +20,9 @@ import qualified Data.Text.Encoding as Text

2020

2121import qualified AST.Canonical as Can

2222import qualified AST.Optimized as Opt

23−import qualified AST.Module.Name as ModuleName

2423import qualified Data.Index as Index

2524import qualified Elm.Interface as I

25+import qualified Elm.ModuleName as ModuleName

2626import qualified Generate.JavaScript.Builder as JS

2727import qualified Generate.JavaScript.Expression as Expr

2828import qualified Generate.JavaScript.Name as JsName

compiler/src/Generate/JavaScript/Expression.hs+2−2

@@ -23,12 +23,12 @@ import qualified Data.Utf8 as Utf8

2323

2424import qualified AST.Canonical as Can

2525import qualified AST.Optimized as Opt

26−import qualified AST.Module.Name as ModuleName

2726import qualified Data.Index as Index

2827import qualified Elm.Compiler.Type as Type

2928import qualified Elm.Compiler.Type.Extract as Extract

30−import qualified Elm.Package as Pkg

3129import qualified Elm.Compiler.Version as Version

30+import qualified Elm.ModuleName as ModuleName

31+import qualified Elm.Package as Pkg

3232import qualified Generate.JavaScript.Builder as JS

3333import qualified Generate.JavaScript.Mode as Mode

3434import qualified Generate.JavaScript.Name as JsName

compiler/src/Generate/JavaScript/Name.hs+1−1

@@ -25,8 +25,8 @@ import qualified Data.Name as Name

2525import qualified Data.Set as Set

2626import Data.Word (Word8)

2727

28−import qualified AST.Module.Name as ModuleName

2928import qualified Data.Index as Index

29+import qualified Elm.ModuleName as ModuleName

3030import qualified Elm.Package as Pkg

3131

3232

compiler/src/Nitpick/PatternMatches.hs+2−2

@@ -20,12 +20,12 @@ http://moscova.inria.fr/~maranget/papers/warn/warn.pdf

2020import qualified Data.List as List

2121import qualified Data.Map as Map

2222import qualified Data.Maybe as Maybe

23+import qualified Data.Name as Name

2324import Data.Utf8 (Utf8)

2425

2526import qualified AST.Canonical as Can

26−import qualified AST.Module.Name as ModuleName

2727import qualified Data.Index as Index

28−import qualified Data.Name as Name

28+import qualified Elm.ModuleName as ModuleName

2929import qualified Reporting.Annotation as A

3030import qualified Reporting.Region as R

3131

compiler/src/Optimize/DecisionTree.hs+1−1

@@ -30,8 +30,8 @@ import qualified Data.Set as Set

3030import Data.Utf8 (Utf8)

3131

3232import qualified AST.Canonical as Can

33−import qualified AST.Module.Name as ModuleName

3433import qualified Data.Index as Index

34+import qualified Elm.ModuleName as ModuleName

3535import qualified Reporting.Annotation as A

3636

3737

compiler/src/Optimize/Expression.hs+1−1

@@ -16,9 +16,9 @@ import qualified Data.Set as Set

1616

1717import qualified AST.Canonical as Can

1818import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

2019import qualified AST.Utils.Shader as Shader

2120import qualified Data.Index as Index

21+import qualified Elm.ModuleName as ModuleName

2222import qualified Optimize.Case as Case

2323import qualified Optimize.Names as Names

2424import qualified Reporting.Annotation as A

compiler/src/Optimize/Module.hs+1−1

@@ -16,9 +16,9 @@ import Data.Map ((!))

1616

1717import qualified AST.Canonical as Can

1818import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

2019import qualified AST.Utils.Type as Type

2120import qualified Canonicalize.Effects as Effects

21+import qualified Elm.ModuleName as ModuleName

2222import qualified Optimize.Expression as Expr

2323import qualified Optimize.Names as Names

2424import qualified Optimize.Port as Port

compiler/src/Optimize/Names.hs+1−1

@@ -22,8 +22,8 @@ import qualified Data.Set as Set

2222

2323import qualified AST.Canonical as Can

2424import qualified AST.Optimized as Opt

25−import qualified AST.Module.Name as ModuleName

2625import qualified Data.Index as Index

26+import qualified Elm.ModuleName as ModuleName

2727import qualified Elm.Package as Pkg

2828import qualified Reporting.Region as R

2929

compiler/src/Optimize/Port.hs+1−1

@@ -15,9 +15,9 @@ import qualified Data.Name as Name

1515

1616import qualified AST.Canonical as Can

1717import qualified AST.Optimized as Opt

18−import qualified AST.Module.Name as ModuleName

1918import qualified AST.Utils.Type as Type

2019import qualified Data.Index as Index

20+import qualified Elm.ModuleName as ModuleName

2121import qualified Optimize.Names as Names

2222

2323

compiler/src/Reporting/Error/Canonicalize.hs+1−1

@@ -20,8 +20,8 @@ import qualified Data.Set as Set

2020

2121import qualified AST.Canonical as Can

2222import qualified AST.Source as Src

23−import qualified AST.Module.Name as ModuleName

2423import qualified Data.Index as Index

24+import qualified Elm.ModuleName as ModuleName

2525import qualified Reporting.Annotation as A

2626import qualified Reporting.Doc as D

2727import Reporting.Doc (Doc, (<+>), (<>))

compiler/src/Reporting/Render/Type/Localizer.hs+1−1

@@ -18,9 +18,9 @@ import qualified Data.Name as Name

1818import qualified Data.Set as Set

1919

2020import qualified AST.Source as Src

21−import qualified AST.Module.Name as ModuleName

2221import qualified AST.Valid as Valid

2322import qualified Elm.Compiler.Imports as Imports

23+import qualified Elm.ModuleName as ModuleName

2424import qualified Elm.Package as Pkg

2525import Reporting.Doc ((<>))

2626import qualified Reporting.Doc as D

compiler/src/Type/Constrain/Expression.hs+1−1

@@ -11,9 +11,9 @@ import qualified Data.Map.Strict as Map

1111import qualified Data.Name as Name

1212

1313import qualified AST.Canonical as Can

14−import qualified AST.Module.Name as ModuleName

1514import qualified AST.Utils.Shader as Shader

1615import qualified Data.Index as Index

16+import qualified Elm.ModuleName as ModuleName

1717import qualified Reporting.Annotation as A

1818import qualified Reporting.Error.Type as E

1919import Reporting.Error.Type (Expected(..), Context(..), SubContext(..), MaybeName(..), Category(..), PExpected(..), PContext(..))

compiler/src/Type/Constrain/Module.hs+1−1

@@ -10,7 +10,7 @@ import qualified Data.Map.Strict as Map

1010import qualified Data.Name as Name

1111

1212import qualified AST.Canonical as Can

13−import qualified AST.Module.Name as ModuleName

13+import qualified Elm.ModuleName as ModuleName

1414import qualified Reporting.Annotation as A

1515import qualified Reporting.Error.Type as E

1616import qualified Reporting.Region as R

compiler/src/Type/Constrain/Pattern.hs+1−1

@@ -13,8 +13,8 @@ import qualified Data.Map.Strict as Map

1313import qualified Data.Name as Name

1414

1515import qualified AST.Canonical as Can

16−import qualified AST.Module.Name as ModuleName

1716import qualified Data.Index as Index

17+import qualified Elm.ModuleName as ModuleName

1818import qualified Reporting.Annotation as A

1919import qualified Reporting.Error.Type as E

2020import qualified Reporting.Region as R

compiler/src/Type/Error.hs+1−1

@@ -23,8 +23,8 @@ import qualified Data.Maybe as Maybe

2323import Data.Monoid ((<>))

2424import qualified Data.Name as Name

2525

26−import qualified AST.Module.Name as ModuleName

2726import qualified Data.Bag as Bag

27+import qualified Elm.ModuleName as ModuleName

2828import qualified Reporting.Doc as D

2929import qualified Reporting.Render.Type as RT

3030import qualified Reporting.Render.Type.Localizer as L

compiler/src/Type/Type.hs+1−1

@@ -37,8 +37,8 @@ import qualified Data.Name as Name

3737import Data.Word (Word32)

3838

3939import qualified AST.Canonical as Can

40−import qualified AST.Module.Name as ModuleName

4140import qualified AST.Utils.Type as Type

41+import qualified Elm.ModuleName as ModuleName

4242import qualified Reporting.Annotation as A

4343import qualified Reporting.Error.Type as E

4444import qualified Reporting.Region as R

compiler/src/Type/Unify.hs+1−1

@@ -10,7 +10,7 @@ module Type.Unify

1010import qualified Data.Map.Strict as Map

1111import qualified Data.Name as Name

1212

13−import qualified AST.Module.Name as ModuleName

13+import qualified Elm.ModuleName as ModuleName

1414import qualified Type.Error as Error

1515import qualified Type.Occurs as Occurs

1616import Type.Type as Type