cebcc19 · lynxjs-elm/compiler

builder/src/Build.hs+1−1

compare with master

unifiedsplit

@@ -17,7 +17,7 @@ module Build

17

18import Control.Concurrent (forkIO)

19import Control.Concurrent.MVar

20−import Control.Monad (filterM, mapM_, sequence_)

20+import Control.Monad (filterM)

21import qualified Data.ByteString as B

22import qualified Data.Char as Char

23import qualified Data.Graph as Graph

builder/src/Deps/Solver.hs−3

@@ -408,9 +408,6 @@ instance Applicative Solver where

408

409

410instance Monad Solver where

411− return a =

412− Solver $ \state ok back _ -> ok state a back

413−

414 (>>=) (Solver solverA) callback =

411 (>>=) (Solver solverA) callback =

415 Solver $ \state ok back err ->

412 Solver $ \state ok back err ->

416 let

413 let

builder/src/Reporting.hs+1−1

@@ -39,7 +39,7 @@ import qualified Elm.ModuleName as ModuleName

39import qualified Elm.Package as Pkg

40import qualified Elm.Version as V

41import qualified Json.Encode as Encode

42−import Reporting.Doc ((<+>), (<>))

42+import Reporting.Doc ((<+>))

43import qualified Reporting.Doc as D

44import qualified Reporting.Exit as Exit

45import qualified Reporting.Exit.Help as Help

builder/src/Reporting/Exit.hs−1

@@ -53,7 +53,6 @@ import qualified Json.Encode as Encode

53import qualified Json.String as Json

54import Parse.Primitives (Row, Col)

55import qualified Reporting.Annotation as A

56−import Reporting.Doc ((<>))

57import qualified Reporting.Doc as D

56import qualified Reporting.Doc as D

58import qualified Reporting.Error.Import as Import

57import qualified Reporting.Error.Import as Import

59import qualified Reporting.Error.Json as Json

58import qualified Reporting.Error.Json as Json

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

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Canonicalize.Expression

4 ( canonicalize

compiler/src/Data/Name.hs+1−8

@@ -44,14 +44,7 @@ import qualified Data.Coerce as Coerce

44import qualified Data.List as List

45import qualified Data.String as Chars

46import qualified Data.Utf8 as Utf8

47−import GHC.Exts

47+import GHC.Exts (Int(I#), Ptr, isTrue#)

48− ( Int(I#), Ptr

49− , MutableByteArray#

50− , isTrue#

51− , newByteArray#

52− , sizeofByteArray#

53− , unsafeFreezeByteArray#

54− )

55import GHC.ST (ST(ST), runST)

48import GHC.ST (ST(ST), runST)

56import GHC.Prim

49import GHC.Prim

57import GHC.Word (Word8(W8#))

50import GHC.Word (Word8(W8#))

compiler/src/Data/Utf8.hs+1−13

@@ -47,19 +47,7 @@ import qualified Data.List as List

47import Foreign.ForeignPtr (touchForeignPtr)

48import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

49import Foreign.Ptr (minusPtr, plusPtr)

50−import GHC.Exts

51− ( Int(I#), Ptr(Ptr), Char(C#)

50+import GHC.Exts (Int(I#), Ptr(Ptr), Char(C#), isTrue#)

52− , RealWorld

53− , ByteArray#, MutableByteArray#

54− , isTrue#

55− , newByteArray#

56− , unsafeFreezeByteArray#

57− , sizeofByteArray#

58− , copyByteArray#

59− , copyAddrToByteArray#

60− , copyByteArrayToAddr#

61− , writeWord8Array#

62− )

63import GHC.IO

51import GHC.IO

64import GHC.ST (ST(ST), runST)

52import GHC.ST (ST(ST), runST)

65import GHC.Prim

53import GHC.Prim

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

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Elm.Compiler.Type

4 ( Type(..)

compiler/src/Elm/Package.hs−2

@@ -1,4 +1,3 @@

1−{-# OPTIONS_GHC -Wall #-}

2{-# LANGUAGE BangPatterns, EmptyDataDecls, FlexibleInstances, UnboxedTuples #-}

1{-# LANGUAGE BangPatterns, EmptyDataDecls, FlexibleInstances, UnboxedTuples #-}

3module Elm.Package

2module Elm.Package

4 ( Name(..)

3 ( Name(..)

@@ -34,7 +33,6 @@ import qualified Data.Coerce as Coerce

34import qualified Data.List as List

33import qualified Data.List as List

35import qualified Data.Map as Map

34import qualified Data.Map as Map

36import qualified Data.Name as Name

35import qualified Data.Name as Name

37−import Data.Monoid ((<>))

38import qualified Data.Utf8 as Utf8

36import qualified Data.Utf8 as Utf8

39import Data.Word (Word8)

37import Data.Word (Word8)

40import Foreign.Ptr (Ptr, plusPtr, minusPtr)

38import Foreign.Ptr (Ptr, plusPtr, minusPtr)

compiler/src/Generate/Html.hs−1

@@ -7,7 +7,6 @@ module Generate.Html

7

8

9import qualified Data.ByteString.Builder as B

10−import Data.Monoid ((<>))

11import qualified Data.Name as Name

10import qualified Data.Name as Name

12import Text.RawString.QQ (r)

11import Text.RawString.QQ (r)

13

12

compiler/src/Generate/JavaScript.hs−1

@@ -9,7 +9,6 @@ module Generate.JavaScript

9

10import Prelude hiding (cycle, print)

11import qualified Data.ByteString.Builder as B

12−import Data.Monoid ((<>))

13import qualified Data.List as List

12import qualified Data.List as List

14import Data.Map ((!))

13import Data.Map ((!))

15import qualified Data.Map as Map

14import qualified Data.Map as Map

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

@@ -18,7 +18,6 @@ import Prelude hiding (lines)

18import qualified Data.List as List

19import qualified Data.ByteString as BS

20import Data.ByteString.Builder as B

21−import Data.Monoid ((<>))

22import qualified Generate.JavaScript.Name as Name

21import qualified Generate.JavaScript.Name as Name

23import Generate.JavaScript.Name (Name)

22import Generate.JavaScript.Name (Name)

24import qualified Json.Encode as Json

23import qualified Json.Encode as Json

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

@@ -1,3 +1,4 @@

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

1{-# LANGUAGE OverloadedStrings #-}

2{-# LANGUAGE OverloadedStrings #-}

2module Generate.JavaScript.Expression

3module Generate.JavaScript.Expression

3 ( generate

4 ( generate

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

@@ -19,7 +19,6 @@ module Generate.JavaScript.Name

19

20

21import qualified Data.ByteString.Builder as B

22−import Data.Monoid ((<>))

23import qualified Data.Map as Map

22import qualified Data.Map as Map

24import qualified Data.Name as Name

23import qualified Data.Name as Name

25import qualified Data.Set as Set

24import qualified Data.Set as Set

compiler/src/Json/Decode.hs+3−6

@@ -119,7 +119,9 @@ instance Functor (Decoder x) where

119

120instance Applicative (Decoder x) where

121 {-# INLINE pure #-}

122− pure = return

122+ pure a =

123+ Decoder $ \_ ok _ ->

124+ ok a

123

125

124 {-# INLINE (<*>) #-}

126 {-# INLINE (<*>) #-}

125 (<*>) (Decoder decodeFunc) (Decoder decodeArg) =

127 (<*>) (Decoder decodeFunc) (Decoder decodeArg) =

@@ -135,11 +137,6 @@ instance Applicative (Decoder x) where

135

137

136

138

137instance Monad (Decoder x) where

139instance Monad (Decoder x) where

138− {-# INLINE return #-}

139− return a =

140− Decoder $ \_ ok _ ->

141− ok a

142−

143 {-# INLINE (>>=) #-}

140 {-# INLINE (>>=) #-}

144 (>>=) (Decoder decodeA) callback =

141 (>>=) (Decoder decodeA) callback =

145 Decoder $ \ast ok err ->

142 Decoder $ \ast ok err ->

compiler/src/Json/Encode.hs−1

@@ -28,7 +28,6 @@ import qualified Data.ByteString.Char8 as BSC

28import qualified Data.ByteString.Builder as B

29import qualified Data.Map as Map

30import qualified Data.Scientific as Sci

31−import Data.Monoid ((<>))

32import qualified Data.Name as Name

31import qualified Data.Name as Name

33import qualified Data.Utf8 as Utf8

32import qualified Data.Utf8 as Utf8

34

33

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

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Nitpick.PatternMatches

4 ( check

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

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Optimize.DecisionTree

4 ( DecisionTree(..)

compiler/src/Parse/Primitives.hs+3−6

@@ -82,7 +82,9 @@ instance Functor (Parser x) where

82

83instance Applicative.Applicative (Parser x) where

84 {-# INLINE pure #-}

85− pure = return

85+ pure value =

86+ Parser $ \state _ eok _ _ ->

87+ eok value state

86

88

87 {-# INLINE (<*>) #-}

89 {-# INLINE (<*>) #-}

88 (<*>) (Parser parserFunc) (Parser parserArg) =

90 (<*>) (Parser parserFunc) (Parser parserArg) =

@@ -177,11 +179,6 @@ oowfHelp state cok eok cerr parsers fallback =

177

179

178

180

179instance Monad (Parser x) where

181instance Monad (Parser x) where

180− {-# INLINE return #-}

181− return value =

182− Parser $ \state _ eok _ _ ->

183− eok value state

184−

185 {-# INLINE (>>=) #-}

182 {-# INLINE (>>=) #-}

186 (Parser parserA) >>= callback =

183 (Parser parserA) >>= callback =

187 Parser $ \state cok eok cerr eerr ->

184 Parser $ \state cok eok cerr eerr ->

compiler/src/Reporting/Doc.hs+2−1

@@ -46,7 +46,6 @@ module Reporting.Doc

46

47import Prelude hiding (cycle)

48import qualified Data.List as List

49−import Data.Monoid ((<>))

50import qualified Data.Name as Name

49import qualified Data.Name as Name

51import qualified System.Console.ANSI.Types as Ansi

50import qualified System.Console.ANSI.Types as Ansi

52import qualified System.Info as Info

51import qualified System.Info as Info

@@ -348,6 +347,8 @@ sgrToStyle sgrs style@(Style bold underline color) =

348 Ansi.SetSwapForegroundBackground _ -> style

347 Ansi.SetSwapForegroundBackground _ -> style

349 Ansi.SetColor l i c -> Style bold underline (toColor l i c)

348 Ansi.SetColor l i c -> Style bold underline (toColor l i c)

350 Ansi.SetRGBColor _ _ -> style

349 Ansi.SetRGBColor _ _ -> style

350+ Ansi.SetPaletteColor _ _ -> style

351+ Ansi.SetDefaultColor _ -> style

351

352

353

353isBold :: Ansi.ConsoleIntensity -> Bool

354isBold :: Ansi.ConsoleIntensity -> Bool

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

@@ -26,7 +26,7 @@ import qualified Data.Index as Index

26import qualified Elm.ModuleName as ModuleName

27import qualified Reporting.Annotation as A

28import qualified Reporting.Doc as D

29−import Reporting.Doc (Doc, (<+>), (<>))

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

30import qualified Reporting.Render.Code as Code

31import qualified Reporting.Render.Type as RT

32import qualified Reporting.Report as Report

compiler/src/Reporting/Error/Docs.hs−1

@@ -16,7 +16,6 @@ import qualified Data.NonEmptyList as NE

16import Parse.Primitives (Row, Col)

17import Parse.Symbol (BadOperator(..))

18import qualified Reporting.Annotation as A

19−import Reporting.Doc ((<>))

20import qualified Reporting.Doc as D

19import qualified Reporting.Doc as D

21import qualified Reporting.Render.Code as Code

20import qualified Reporting.Render.Code as Code

22import qualified Reporting.Error.Syntax as E

21import qualified Reporting.Error.Syntax as E

compiler/src/Reporting/Error/Pattern.hs−1

@@ -10,7 +10,6 @@ import qualified Data.List as List

10

11import qualified Elm.String as ES

12import qualified Nitpick.PatternMatches as P

13−import Reporting.Doc ((<>))

14import qualified Reporting.Doc as D

13import qualified Reporting.Doc as D

15import qualified Reporting.Report as Report

14import qualified Reporting.Report as Report

16import qualified Reporting.Render.Code as Code

15import qualified Reporting.Render.Code as Code

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

@@ -21,7 +21,6 @@ module Reporting.Error.Type

21

22import Prelude hiding (round)

23import qualified Data.Map as Map

24−import Data.Monoid ((<>))

25import qualified Data.Name as Name

24import qualified Data.Name as Name

26

25

27import qualified AST.Canonical as Can

26import qualified AST.Canonical as Can

compiler/src/Reporting/Render/Code.hs+1−1

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Reporting.Render.Code

4 ( Source

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

@@ -21,7 +21,7 @@ import qualified AST.Source as Src

21import qualified AST.Canonical as Can

22import qualified Reporting.Annotation as A

23import qualified Reporting.Doc as D

24−import Reporting.Doc ( Doc, (<+>), (<>) )

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

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

26

27

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

@@ -17,7 +17,6 @@ import qualified Data.Set as Set

17

18import qualified AST.Source as Src

19import qualified Elm.ModuleName as ModuleName

20−import Reporting.Doc ((<>))

21import qualified Reporting.Doc as D

20import qualified Reporting.Doc as D

22import qualified Reporting.Annotation as A

21import qualified Reporting.Annotation as A

23

22

compiler/src/Reporting/Result.hs+8−10

@@ -105,10 +105,16 @@ instance Applicative (Result i w e) where

105 in

106 kf i w bad1 good1

107

108+ (*>) (Result ka) (Result kb) =

109+ Result $ \i w bad good ->

110+ let

111+ good1 i1 w1 _ =

112+ kb i1 w1 bad good

113+ in

114+ ka i w bad good1

108

115

109−instance Monad (Result i w e) where

110− return = ok

111

116

117+instance Monad (Result i w e) where

112 (>>=) (Result ka) callback =

118 (>>=) (Result ka) callback =

113 Result $ \i w bad good ->

119 Result $ \i w bad good ->

114 let

120 let

@@ -118,12 +124,4 @@ instance Monad (Result i w e) where

118 in

124 in

119 ka i w bad good1

125 ka i w bad good1

120

126

121− (>>) (Result ka) (Result kb) =

122− Result $ \i w bad good ->

123− let

124− good1 i1 w1 _ =

125− kb i1 w1 bad good

126− in

127− ka i w bad good1

128−

129 -- PERF add INLINE to these?

127 -- PERF add INLINE to these?

compiler/src/Reporting/Warning.hs−1

@@ -8,7 +8,6 @@ module Reporting.Warning

8 where

9

10

11−import Data.Monoid ((<>))

12import qualified Data.Name as Name

11import qualified Data.Name as Name

13

12

14import qualified AST.Canonical as Can

13import qualified AST.Canonical as Can

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

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall #-}

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Type.Error

4 ( Type(..)

@@ -20,7 +20,6 @@ module Type.Error

20

21import qualified Data.Map as Map

22import qualified Data.Maybe as Maybe

23−import Data.Monoid ((<>))

24import qualified Data.Name as Name

23import qualified Data.Name as Name

25

24

26import qualified Data.Bag as Bag

25import qualified Data.Bag as Bag

compiler/src/Type/Unify.hs+7−11

@@ -88,12 +88,15 @@ instance Applicative Unify where

88 in

89 kf vars ok1 err

90

91+ (*>) (Unify ka) (Unify kb) =

92+ Unify $ \vars ok err ->

93+ let

94+ ok1 vars1 _ = kb vars1 ok err

95+ in

96+ ka vars ok1 err

91

97

92−instance Monad Unify where

93− return a =

94− Unify $ \vars ok _ ->

95− ok vars a

96

98

99+instance Monad Unify where

97 (>>=) (Unify ka) callback =

100 (>>=) (Unify ka) callback =

98 Unify $ \vars ok err ->

101 Unify $ \vars ok err ->

99 let

102 let

@@ -103,13 +106,6 @@ instance Monad Unify where

103 in

106 in

104 ka vars ok1 err

107 ka vars ok1 err

105

108

106− (>>) (Unify ka) (Unify kb) =

107− Unify $ \vars ok err ->

108− let

109− ok1 vars1 _ = kb vars1 ok err

110− in

111− ka vars ok1 err

112−

113

109

114register :: IO Variable -> Unify Variable

110register :: IO Variable -> Unify Variable

115register mkVar =

111register mkVar =

elm.cabal+1−1

@@ -35,7 +35,7 @@ Flag dev {

35

36

37Executable elm

38− ghc-options: -O2 -rtsopts -threaded "-with-rtsopts=-N -qg -A128m"

38+ ghc-options: -O2 -rtsopts -threaded "-with-rtsopts=-N -qg -A128m" -Wall -Werror

39 -- add -eventlog for (elm make src/Main.elm +RTS -l; threadscope elm.eventlog)

40 -- https://www.oreilly.com/library/view/parallel-and-concurrent/9781449335939/

41

terminal/impl/Terminal.hs+1

@@ -1,3 +1,4 @@

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

1module Terminal

2module Terminal

2 ( app

3 ( app

3 , Command(..)

4 , Command(..)

terminal/impl/Terminal/Error.hs+1−1

@@ -1,3 +1,4 @@

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

1{-# LANGUAGE GADTs, OverloadedStrings #-}

2{-# LANGUAGE GADTs, OverloadedStrings #-}

2module Terminal.Error

3module Terminal.Error

3 ( Error(..)

4 ( Error(..)

@@ -12,7 +13,6 @@ module Terminal.Error

12 where

13 where

13

14

15

15−import Data.Monoid ((<>))

16import qualified Data.List as List

17import qualified Data.Maybe as Maybe

18import GHC.IO.Handle (hIsTerminalDevice)

terminal/src/Bump.hs+2−1

@@ -1,3 +1,4 @@

1+{-# OPTIONS_GHC -fno-warn-x-partial #-}

1{-# LANGUAGE OverloadedStrings #-}

2{-# LANGUAGE OverloadedStrings #-}

2module Bump

3module Bump

3 ( run

4 ( run

@@ -19,7 +20,7 @@ import qualified Elm.Magnitude as M

19import qualified Elm.Outline as Outline

20import qualified Elm.Outline as Outline

20import qualified Elm.Version as V

21import qualified Elm.Version as V

21import qualified Http

22import qualified Http

22−import Reporting.Doc ((<>), (<+>))

23+import Reporting.Doc ((<+>))

23import qualified Reporting

24import qualified Reporting

24import qualified Reporting.Doc as D

25import qualified Reporting.Doc as D

25import qualified Reporting.Exit as Exit

26import qualified Reporting.Exit as Exit

terminal/src/Develop.hs−1

@@ -12,7 +12,6 @@ import Control.Monad.Trans (MonadIO(liftIO))

12import qualified Data.ByteString.Builder as B

13import qualified Data.ByteString as BS

14import qualified Data.HashMap.Strict as HashMap

15−import Data.Monoid ((<>))

16import qualified Data.NonEmptyList as NE

15import qualified Data.NonEmptyList as NE

17import qualified System.Directory as Dir

16import qualified System.Directory as Dir

18import System.FilePath as FP

17import System.FilePath as FP

terminal/src/Develop/Generate/Help.hs−1

@@ -9,7 +9,6 @@ module Develop.Generate.Help

9

10

11import qualified Data.ByteString.Builder as B

12−import Data.Monoid ((<>))

13import qualified Data.Name as Name

12import qualified Data.Name as Name

14import Text.RawString.QQ (r)

13import Text.RawString.QQ (r)

15

14

terminal/src/Diff.hs+1−1

@@ -27,7 +27,7 @@ import qualified Elm.Package as Pkg

27import qualified Elm.Version as V

28import qualified Http

29import qualified Reporting

30−import Reporting.Doc ((<>), (<+>))

30+import Reporting.Doc ((<+>))

31import qualified Reporting.Doc as D

32import qualified Reporting.Exit as Exit

33import qualified Reporting.Exit.Help as Help

terminal/src/Install.hs+1−1

@@ -19,7 +19,7 @@ import qualified Elm.Package as Pkg

19import qualified Elm.Outline as Outline

20import qualified Elm.Version as V

21import qualified Reporting

22−import Reporting.Doc ((<>), (<+>))

22+import Reporting.Doc ((<+>))

23import qualified Reporting.Doc as D

24import qualified Reporting.Exit as Exit

25import qualified Reporting.Task as Task

terminal/src/Main.hs−1

@@ -8,7 +8,6 @@ module Main

8import Prelude hiding (init)

9import qualified Data.List as List

10import qualified Text.PrettyPrint.ANSI.Leijen as P

11−import Text.PrettyPrint.ANSI.Leijen ((<>))

12import Text.Read (readMaybe)

11import Text.Read (readMaybe)

13

12

14import qualified Elm.Version as V

13import qualified Elm.Version as V

terminal/src/Repl.hs+1−2

@@ -1,4 +1,4 @@

1−{-# OPTIONS_GHC -Wall -fno-warn-name-shadowing #-}

1+{-# OPTIONS_GHC -fno-warn-name-shadowing -fno-warn-incomplete-uni-patterns #-}

2{-# LANGUAGE OverloadedStrings #-}

3module Repl

4 ( Flags(..)

@@ -29,7 +29,6 @@ import qualified Data.ByteString.UTF8 as BS_UTF8

29import qualified Data.Char as Char

30import qualified Data.List as List

31import qualified Data.Map as Map

32−import Data.Monoid ((<>))

33import qualified Data.Name as N

32import qualified Data.Name as N

34import qualified System.Console.Haskeline as Repl

33import qualified System.Console.Haskeline as Repl

35import qualified System.Directory as Dir

34import qualified System.Directory as Dir