master..23c9c2a · elk · git.iko.soy

.github/CONTRIBUTING.md+20−18

@@ -4,15 +4,10 @@ Thanks helping with the development of Elm! This document describes the basic

44standards for opening pull requests and making the review process as smooth as

55possible.

66

7+## Licensing

78

8−## Expectations

9−

10−- Pull requests are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.

11−- Smaller pull requests are easier to review. To fix nine typos, nine specific issues will always go faster than one big one. Learn why [here](https://github.com/elm/expectations/blob/master/small-pull-requests.md).

12−- Reviewers may not know as much as you about certain situations, so add links to supporting evidence for important claims, especially regarding standards for CSS, HTTP, URI, etc.

13−

14−Finally, please be patient with the core team. They are trying their best with limited resources!

15−

9+You need to sign the [contributor agreement](ContributorAgreement.pdf)

10+and send it to <info@elm-lang.org> before opening your pull request.

1611

1712## Style Guide

1813

@@ -22,20 +17,27 @@ Finally, please be patient with the core team. They are trying their best with l

2217[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be

2318[js]: https://google.github.io/styleguide/javascriptguide.xml

2419

25−

2620## Branches

2721

28−[The master branch][master] is the home of the next release of the compiler

29−so new features and improvements get merged there. Most pull requests

30−should target this branch!

31−

32−[master]: http://github.com/elm-lang/elm/tree/master

22+ * [The master branch][master] is the home of the next release of the compiler

23+ so new features and improvements get merged there. Most pull requests

24+ should target this branch!

3325

26+ * [The stable branch][stable] is for tagging releases and critical bug fixes.

27+ This branch is handy for folks who want to build the most recent public

28+ release from source.

3429

35−## Licensing

36−

37−Nothing extra to do for this. The default on GitHub described [here](https://docs.github.com/en/github/site-policy/github-terms-of-service#6-contributions-under-repository-license) is that:

30+[master]: http://github.com/elm-lang/elm/tree/master

31+[stable]: http://github.com/elm-lang/elm/tree/stable

3832

39−> Whenever you add Content to a repository containing notice of a license, you license that Content under the same terms, and you agree that you have the right to license that Content under those terms. If you have a separate agreement to license that Content under different terms, such as a contributor license agreement, that agreement will supersede.

33+If you are working on a fairly large feature, we will probably want to merge it

34+in as its own branch and do some testing before bringing it into the master

35+branch. This way we can keep releases of the master branch independent of new

36+features.

4037

38+Note that the master branch of the compiler should always be in sync with the

39+master branch of the [website][], and the stable branch of the compiler should

40+always be in sync with the stable branch of the [website][]. Make sure that

41+your changes maintain this compatibility.

4142

43+[website]: https://github.com/elm-lang/elm-lang.org

.github/PULL_REQUEST_TEMPLATE.mddeleted−18

@@ -1,18 +0,0 @@

1−

2−**Quick Summary:** ???

3−

4−

5−## SSCCE

6−

7−```elm

8−

9−```

10−

11−- **Elm:** ???

12−- **Browser:** ???

13−- **Operating System:** ???

14−

15−

16−## Additional Details

17−

18−???

.github/workflows/set-issue-expectations.ymldeleted−21

@@ -1,21 +0,0 @@

1−name: Set Issue Expectations

2−on:

3− issues:

4− types: [opened]

5−jobs:

6− comment-on-issue:

7− name: Comment On Issue

8− runs-on: ubuntu-latest

9− steps:

10− - uses: actions/github@v1.0.0

11− env:

12− GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

13− with:

14− args: |

15− comment "Thanks for reporting this! To set expectations:

16−

17− - Issues are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.

18− - Ask questions in a [community forum](https://elm-lang.org/community). You will get an answer quicker that way!

19− - If you experience something similar, open a new issue. [We like duplicates](https://github.com/elm/expectations/blob/master/duplicates.md).

20−

21− Finally, please be patient with the core team. They are trying their best with limited resources."

.github/workflows/set-pull-expectations.ymldeleted−19

@@ -1,19 +0,0 @@

1−on:

2− pull_request_target:

3− types: [opened]

4−

5−jobs:

6− comment-on-pull:

7− name: Comment On Pull

8− runs-on: ubuntu-latest

9− steps:

10− - uses: actions/github-script@v3

11− with:

12− github-token: ${{secrets.GITHUB_TOKEN}}

13− script: |

14− github.issues.createComment({

15− issue_number: context.issue.number,

16− owner: context.repo.owner,

17− repo: context.repo.repo,

18− body: "Thanks for suggesting these code changes. To set expectations:\n\n- Pull requests are reviewed in [batches](https://github.com/elm/expectations/blob/master/batching.md), so it can take some time to get a response.\n- Smaller pull requests are easier to review. To fix nine typos, nine specific issues will always go faster than one big one. Learn why [here](https://github.com/elm/expectations/blob/master/small-pull-requests.md).\n- Reviewers may not know as much as you about certain situations, so add links to supporting evidence for important claims, especially regarding standards for CSS, HTTP, URI, etc.\n\nFinally, please be patient with the core team. They are trying their best with limited resources."

19− })

.gitignore−1

@@ -5,4 +5,3 @@ cabal-dev

55cabal.sandbox.config

66.DS_Store

77*~

8−travis.log

.travis.ymldeleted−28

@@ -1,28 +0,0 @@

1−language: minimal

2−services: docker

3−

4−env:

5− global:

6− - LINUX_ARCHIVE=binary-for-linux-64-bit.gz

7−

8−before_install:

9− - docker build -t elm -f installers/linux/Dockerfile .

10− - docker cp $(docker create elm):/usr/local/bin/elm .

11− - gzip -9 -c elm > $LINUX_ARCHIVE

12−

13−deploy:

14− provider: releases

15− api_key:

16− secure: Yz2Lo4u9rZQ7Ee7ohAsrZpkqsYDUerCSMdSQIH8ryrf7phHhiloPEkTKsM+NupHqU/LEAVsunxbau4QrCEjA2vPavAPVk8cKomRUWK/YjbXHKa24hPkal2c+A2bnMQ6w3qYk/PjL9rW+Goq++/SNLcYZwHBV0Chl2blivMwWCSA=

17− file: $LINUX_ARCHIVE

18− skip_cleanup: true

19− on:

20− branch: master

21− tags: true

22−

23−notifications:

24− email:

25− recipients:

26− - rlefevre@dmy.fr

27− on_success: change

28− on_failure: change

ContributorAgreement.pdfnew file

Binary file not shown.

LICENSE+25−6

@@ -1,11 +1,30 @@

22

3−Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

44

5−1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

5+Redistribution and use in source and binary forms, with or without

6+modification, are permitted provided that the following conditions are met:

67

7−2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

8+ * Redistributions of source code must retain the above copyright

9+ notice, this list of conditions and the following disclaimer.

810

9−3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

11+ * Redistributions in binary form must reproduce the above

12+ copyright notice, this list of conditions and the following

13+ disclaimer in the documentation and/or other materials provided

14+ with the distribution.

1015

11−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

16+ * Neither the name of Evan Czaplicki nor the names of other

17+ contributors may be used to endorse or promote products derived

18+ from this software without specific prior written permission.

19+

20+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

21+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

22+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

23+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

24+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

25+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

26+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

27+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

28+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

29+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

30+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md+5−10

@@ -1,22 +1,17 @@

1−# Elm

1+# The Elm Compiler

22

3−A delightful language for reliable webapps.

3+Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/).

44

5−Check out the [Home Page](http://elm-lang.org/), [Try Online](http://elm-lang.org/try), or [The Official Guide](http://guide.elm-lang.org/)

6−

7−

8−<br>

95

106## Install

117

12−✨ [Install](https://guide.elm-lang.org/install/elm.html) ✨

8+Follow [these instructions][installer]!

139

14−For multiple versions, previous versions, and uninstallation, see the instructions [here](https://github.com/elm/compiler/blob/master/installers/README.md).

10+ [installer]: https://guide.elm-lang.org/install.html

1511

16−<br>

1712

1813## Help

1914

2015If you are stuck, ask around on [the Elm slack channel][slack]. Folks are friendly and happy to help with questions!

2116

22−[slack]: http://elmlang.herokuapp.com/

17+[slack]: http://elmlang.herokuapp.com/

builder/src/BackgroundWriter.hsdeleted−42

@@ -1,42 +0,0 @@

1−{-# LANGUAGE BangPatterns #-}

2−module BackgroundWriter

3− ( Scope

4− , withScope

5− , writeBinary

6− )

7− where

8−

9−

10−import Control.Concurrent (forkIO)

11−import Control.Concurrent.MVar (MVar, newEmptyMVar, newMVar, putMVar, takeMVar)

12−import qualified Data.Binary as Binary

13−import Data.Foldable (traverse_)

14−

15−import qualified File

16−

17−

18−

19−-- BACKGROUND WRITER

20−

21−

22−newtype Scope =

23− Scope (MVar [MVar ()])

24−

25−

26−withScope :: (Scope -> IO a) -> IO a

27−withScope callback =

28− do workList <- newMVar []

29− result <- callback (Scope workList)

30− mvars <- takeMVar workList

31− traverse_ takeMVar mvars

32− return result

33−

34−

35−writeBinary :: (Binary.Binary a) => Scope -> FilePath -> a -> IO ()

36−writeBinary (Scope workList) path value =

37− do mvar <- newEmptyMVar

38− _ <- forkIO (File.writeBinary path value >> putMVar mvar ())

39− oldWork <- takeMVar workList

40− let !newWork = mvar:oldWork

41− putMVar workList newWork

42−

builder/src/Build.hs+286−541

@@ -1,16 +1,12 @@

11{-# OPTIONS_GHC -Wno-unused-do-bind #-}

2−{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings #-}

2+{-# LANGUAGE BangPatterns, OverloadedStrings #-}

33module Build

44 ( fromExposed

5− , fromPaths

6− , fromRepl

5+ , fromMains

76 , Artifacts(..)

8− , Root(..)

7+ , Main(..)

98 , Module(..)

109 , CachedInterface(..)

11− , ReplArtifacts(..)

12− , DocsGoal(..)

13− , getRootNames

1410 )

1511 where

1612

@@ -20,6 +16,7 @@ import Control.Concurrent.MVar

2016import Control.Monad (filterM, mapM_, sequence_)

2117import qualified Data.ByteString as B

2218import qualified Data.Char as Char

19+import qualified Data.Either as Either

2320import qualified Data.Graph as Graph

2421import qualified Data.List as List

2522import qualified Data.Map.Utils as Map

@@ -34,27 +31,22 @@ import qualified System.Directory as Dir

3431import qualified System.FilePath as FP

3532import System.FilePath ((</>), (<.>))

3633

37−import qualified AST.Canonical as Can

3834import qualified AST.Source as Src

3935import qualified AST.Optimized as Opt

4036import qualified Compile

4137import qualified Elm.Details as Details

42−import qualified Elm.Docs as Docs

4338import qualified Elm.Interface as I

4439import qualified Elm.ModuleName as ModuleName

4540import qualified Elm.Outline as Outline

4641import qualified Elm.Package as Pkg

4742import qualified File

48−import qualified Json.Encode as E

4943import qualified Parse.Module as Parse

5044import qualified Reporting

5145import qualified Reporting.Annotation as A

5246import qualified Reporting.Error as Error

53−import qualified Reporting.Error.Docs as EDocs

5447import qualified Reporting.Error.Syntax as Syntax

5548import qualified Reporting.Error.Import as Import

5649import qualified Reporting.Exit as Exit

57−import qualified Reporting.Render.Type.Localizer as L

5850import qualified Stuff

5951

6052

@@ -66,57 +58,27 @@ data Env =

6658 Env

6759 { _key :: Reporting.BKey

6860 , _root :: FilePath

69− , _project :: Parse.ProjectType

70− , _srcDirs :: [AbsoluteSrcDir]

71− , _buildID :: Details.BuildID

61+ , _pkg :: Pkg.Name

62+ , _srcDirs :: [FilePath]

7263 , _locals :: Map.Map ModuleName.Raw Details.Local

7364 , _foreigns :: Map.Map ModuleName.Raw Details.Foreign

7465 }

7566

7667

77−makeEnv :: Reporting.BKey -> FilePath -> Details.Details -> IO Env

78−makeEnv key root (Details.Details _ validOutline buildID locals foreigns _) =

68+makeEnv :: Reporting.BKey -> FilePath -> Details.Details -> Env

69+makeEnv key root (Details.Details _ validOutline locals foreigns _) =

7970 case validOutline of

80− Details.ValidApp givenSrcDirs ->

81− do srcDirs <- traverse (toAbsoluteSrcDir root) (NE.toList givenSrcDirs)

82− return $ Env key root Parse.Application srcDirs buildID locals foreigns

71+ Details.ValidApp (Outline.AppOutline _ srcDirs _ _ _ _) ->

72+ Env key root Pkg.dummyName (NE.toList srcDirs) locals foreigns

8373

84− Details.ValidPkg pkg _ _ ->

85− do srcDir <- toAbsoluteSrcDir root (Outline.RelativeSrcDir "src")

86− return $ Env key root (Parse.Package pkg) [srcDir] buildID locals foreigns

87−

88−

89−

90−-- SOURCE DIRECTORY

91−

92−

93−newtype AbsoluteSrcDir =

94− AbsoluteSrcDir FilePath

95−

96−

97−toAbsoluteSrcDir :: FilePath -> Outline.SrcDir -> IO AbsoluteSrcDir

98−toAbsoluteSrcDir root srcDir =

99− AbsoluteSrcDir <$> Dir.canonicalizePath

100− (

101− case srcDir of

102− Outline.AbsoluteSrcDir dir -> dir

103− Outline.RelativeSrcDir dir -> root </> dir

104− )

105−

106−

107−addRelative :: AbsoluteSrcDir -> FilePath -> FilePath

108−addRelative (AbsoluteSrcDir srcDir) path =

109− srcDir </> path

74+ Details.ValidPkg (Outline.PkgOutline pkg _ _ _ _ _ _ _) _ ->

75+ Env key root pkg ["src"] locals foreigns

11076

11177

11278

11379-- FORK

11480

11581

116−-- PERF try using IORef semephore on file crawl phase?

117−-- described in Chapter 13 of Parallel and Concurrent Programming in Haskell by Simon Marlow

118−-- https://www.oreilly.com/library/view/parallel-and-concurrent/9781449335939/ch13.html#sec_conc-par-overhead

119−--

12082fork :: IO a -> IO (MVar a)

12183fork work =

12284 do mvar <- newEmptyMVar

@@ -134,22 +96,21 @@ forkWithKey func dict =

13496-- FROM EXPOSED

13597

13698

137−fromExposed :: Reporting.Style -> FilePath -> Details.Details -> DocsGoal docs -> NE.List ModuleName.Raw -> IO (Either Exit.BuildProblem docs)

138−fromExposed style root details docsGoal exposed@(NE.List e es) =

99+fromExposed :: Reporting.Style -> FilePath -> Details.Details -> NE.List ModuleName.Raw -> IO (Either Exit.BuildProblem ())

100+fromExposed style root details (NE.List e es) =

139101 Reporting.trackBuild style $ \key ->

140− do env <- makeEnv key root details

102+ do let env = makeEnv key root details

141103 dmvar <- Details.loadInterfaces root details

142104

143105 -- crawl

144106 mvar <- newEmptyMVar

145− let docsNeed = toDocsNeed docsGoal

146− roots <- Map.fromKeysA (fork . crawlModule env mvar docsNeed) (e:es)

107+ roots <- Map.fromKeysA (fork . crawlModule env mvar) (e:es)

147108 putMVar mvar roots

148109 mapM_ readMVar roots

149110 statuses <- traverse readMVar =<< readMVar mvar

150111

151112 -- compile

152− midpoint <- checkMidpoint dmvar statuses

113+ midpoint <- checkExposedMidpoint dmvar statuses

153114 case midpoint of

154115 Left problem ->

155116 return (Left (Exit.BuildProjectProblem problem))

@@ -160,18 +121,18 @@ fromExposed style root details docsGoal exposed@(NE.List e es) =

160121 putMVar rmvar resultMVars

161122 results <- traverse readMVar resultMVars

162123 writeDetails root details results

163− finalizeExposed root docsGoal exposed results

124+ return (detectProblems results) -- TODO error if "exposed-modules" are not found

164125

165126

166127

167−-- FROM PATHS

128+-- FROM MAINS

168129

169130

170131data Artifacts =

171132 Artifacts

172133 { _name :: Pkg.Name

173134 , _deps :: Dependencies

174− , _roots :: NE.List Root

135+ , _mains :: NE.List Main

175136 , _modules :: [Module]

176137 }

177138

@@ -185,25 +146,25 @@ type Dependencies =

185146 Map.Map ModuleName.Canonical I.DependencyInterface

186147

187148

188−fromPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)

189−fromPaths style root details paths =

149+fromMains :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)

150+fromMains style root details paths =

190151 Reporting.trackBuild style $ \key ->

191− do env <- makeEnv key root details

152+ do let env = makeEnv key root details

192153

193− elroots <- findRoots env paths

194− case elroots of

154+ elmains <- findMains env paths

155+ case elmains of

195156 Left problem ->

196157 return (Left (Exit.BuildProjectProblem problem))

197158

198− Right lroots ->

159+ Right lmains ->

199160 do -- crawl

200161 dmvar <- Details.loadInterfaces root details

201162 smvar <- newMVar Map.empty

202− srootMVars <- traverse (fork . crawlRoot env smvar) lroots

203− sroots <- traverse readMVar srootMVars

163+ smainMVars <- traverse (fork . crawlMain env smvar) lmains

164+ smains <- traverse readMVar smainMVars

204165 statuses <- traverse readMVar =<< readMVar smvar

205166

206− midpoint <- checkMidpointAndRoots dmvar statuses sroots

167+ midpoint <- checkMainsMidpoint dmvar statuses smains

207168 case midpoint of

208169 Left problem ->

209170 return (Left (Exit.BuildProjectProblem problem))

@@ -213,26 +174,10 @@ fromPaths style root details paths =

213174 rmvar <- newEmptyMVar

214175 resultsMVars <- forkWithKey (checkModule env foreigns rmvar) statuses

215176 putMVar rmvar resultsMVars

216− rrootMVars <- traverse (fork . checkRoot env resultsMVars) sroots

177+ rmainMVars <- traverse (fork . checkMain env resultsMVars) smains

217178 results <- traverse readMVar resultsMVars

218179 writeDetails root details results

219− toArtifacts env foreigns results <$> traverse readMVar rrootMVars

220−

221−

222−

223−-- GET ROOT NAMES

224−

225−

226−getRootNames :: Artifacts -> NE.List ModuleName.Raw

227−getRootNames (Artifacts _ _ roots _) =

228− fmap getRootName roots

229−

230−

231−getRootName :: Root -> ModuleName.Raw

232−getRootName root =

233− case root of

234− Inside name -> name

235− Outside name _ _ -> name

180+ toArtifacts env foreigns results <$> traverse readMVar rmainMVars

236181

237182

238183

@@ -245,7 +190,7 @@ type StatusDict =

245190

246191data Status

247192 = SCached Details.Local

248− | SChanged Details.Local B.ByteString Src.Module DocsNeed

193+ | SChanged Details.Local B.ByteString Src.Module

249194 | SBadImport Import.Problem

250195 | SBadSyntax FilePath File.Time B.ByteString Syntax.Error

251196 | SForeign Pkg.Name

@@ -262,14 +207,15 @@ crawlDeps env mvar deps blockedValue =

262207 mapM_ readMVar statuses

263208 return blockedValue

264209 where

265− crawlNew name () = fork (crawlModule env mvar (DocsNeed False) name)

210+ crawlNew name () = fork (crawlModule env mvar name)

266211

267212

268−crawlModule :: Env -> MVar StatusDict -> DocsNeed -> ModuleName.Raw -> IO Status

269−crawlModule env@(Env _ root projectType srcDirs buildID locals foreigns) mvar docsNeed name =

213+crawlModule :: Env -> MVar StatusDict -> ModuleName.Raw -> IO Status

214+crawlModule env@(Env _ root pkg srcDirs locals foreigns) mvar name =

270215 do let fileName = ModuleName.toFilePath name <.> "elm"

216+ let inRoot path = File.exists (root </> path)

271217

272− paths <- filterM File.exists (map (`addRelative` fileName) srcDirs)

218+ paths <- filterM inRoot (map (</> fileName) srcDirs)

273219

274220 case paths of

275221 [path] ->

@@ -278,18 +224,21 @@ crawlModule env@(Env _ root projectType srcDirs buildID locals foreigns) mvar do

278224 return $ SBadImport $ Import.Ambiguous path [] dep deps

279225

280226 Nothing ->

281− do newTime <- File.getTime path

282− case Map.lookup name locals of

283− Nothing ->

284− crawlFile env mvar docsNeed name path newTime buildID

227+ case Map.lookup name locals of

228+ Nothing ->

229+ crawlFile env mvar name path

285230

286− Just local@(Details.Local oldPath oldTime deps _ lastChange _) ->

287− if path /= oldPath || oldTime /= newTime || needsDocs docsNeed

288− then crawlFile env mvar docsNeed name path newTime lastChange

289− else crawlDeps env mvar deps (SCached local)

231+ Just local@(Details.Local oldPath oldTime deps _) ->

232+ if path /= oldPath

233+ then crawlFile env mvar name path

234+ else

235+ do newTime <- File.getTime path

236+ if oldTime < newTime

237+ then crawlFile env mvar name path

238+ else crawlDeps env mvar deps (SCached local)

290239

291240 p1:p2:ps ->

292− return $ SBadImport $ Import.AmbiguousLocal (FP.makeRelative root p1) (FP.makeRelative root p2) (map (FP.makeRelative root) ps)

241+ return $ SBadImport $ Import.AmbiguousLocal p1 p2 ps

293242

294243 [] ->

295244 case Map.lookup name foreigns of

@@ -302,18 +251,19 @@ crawlModule env@(Env _ root projectType srcDirs buildID locals foreigns) mvar do

302251 return $ SBadImport $ Import.AmbiguousForeign dep d ds

303252

304253 Nothing ->

305− if Name.isKernel name && Parse.isKernel projectType then

254+ if Name.isKernel name && Pkg.isKernel pkg then

306255 do exists <- File.exists ("src" </> ModuleName.toFilePath name <.> "js")

307256 return $ if exists then SKernel else SBadImport Import.NotFound

308257 else

309258 return $ SBadImport Import.NotFound

310259

311260

312−crawlFile :: Env -> MVar StatusDict -> DocsNeed -> ModuleName.Raw -> FilePath -> File.Time -> Details.BuildID -> IO Status

313−crawlFile env@(Env _ root projectType _ buildID _ _) mvar docsNeed expectedName path time lastChange =

314− do source <- File.readUtf8 (root </> path)

261+crawlFile :: Env -> MVar StatusDict -> ModuleName.Raw -> FilePath -> IO Status

262+crawlFile env@(Env _ root pkg _ _ _) mvar expectedName path =

263+ do time <- File.getTime path

264+ source <- File.readUtf8 (root </> path)

315265

316− case Parse.fromByteString projectType source of

266+ case Parse.fromByteString pkg source of

317267 Left err ->

318268 return $ SBadSyntax path time source err

319269

@@ -326,16 +276,16 @@ crawlFile env@(Env _ root projectType _ buildID _ _) mvar docsNeed expectedName

326276 if expectedName == actualName then

327277 let

328278 deps = map Src.getImportName imports

329− local = Details.Local path time deps (any isMain values) lastChange buildID

279+ local = Details.Local path time deps (any isMain values)

330280 in

331− crawlDeps env mvar deps (SChanged local source modul docsNeed)

281+ crawlDeps env mvar deps (SChanged local source modul)

332282 else

333283 return $ SBadSyntax path time source (Syntax.ModuleNameMismatch expectedName name)

334284

335285

336286isMain :: A.Located Src.Value -> Bool

337287isMain (A.At _ (Src.Value (A.At _ name) _ _ _)) =

338− name == Name._main

288+ name == Name.main

339289

340290

341291

@@ -347,9 +297,9 @@ type ResultDict =

347297

348298

349299data Result

350− = RNew !Details.Local !I.Interface !Opt.LocalGraph !(Maybe Docs.Module)

351− | RSame !Details.Local !I.Interface !Opt.LocalGraph !(Maybe Docs.Module)

352− | RCached Bool Details.BuildID (MVar CachedInterface)

300+ = RNew Details.Local I.Interface Opt.LocalGraph

301+ | RSame Details.Local I.Interface Opt.LocalGraph

302+ | RCached Bool (MVar CachedInterface)

353303 | RNotFound Import.Problem

354304 | RProblem Error.Module

355305 | RBlocked

@@ -364,23 +314,23 @@ data CachedInterface

364314

365315

366316checkModule :: Env -> Dependencies -> MVar ResultDict -> ModuleName.Raw -> Status -> IO Result

367−checkModule env@(Env _ root projectType _ _ _ _) foreigns resultsMVar name status =

317+checkModule env@(Env _ root pkg _ _ _) foreigns resultsMVar name status =

368318 case status of

369− SCached local@(Details.Local path time deps hasMain lastChange lastCompile) ->

319+ SCached local@(Details.Local path time deps hasMain) ->

370320 do results <- readMVar resultsMVar

371− depsStatus <- checkDeps root results deps lastCompile

321+ depsStatus <- checkDeps root results deps

372322 case depsStatus of

373323 DepsChange ifaces ->

374324 do source <- File.readUtf8 path

375− case Parse.fromByteString projectType source of

376− Right modul -> compile env (DocsNeed False) local source ifaces modul

325+ case Parse.fromByteString pkg source of

326+ Right modul -> compile env local source ifaces modul

377327 Left err ->

378328 return $ RProblem $

379329 Error.Module name path time source (Error.BadSyntax err)

380330

381331 DepsSame _ _ ->

382332 do mvar <- newMVar Unneeded

383− return (RCached hasMain lastChange mvar)

333+ return (RCached hasMain mvar)

384334

385335 DepsBlock ->

386336 return RBlocked

@@ -388,25 +338,29 @@ checkModule env@(Env _ root projectType _ _ _ _) foreigns resultsMVar name statu

388338 DepsNotFound problems ->

389339 do source <- File.readUtf8 path

390340 return $ RProblem $ Error.Module name path time source $

391− case Parse.fromByteString projectType source of

341+ case Parse.fromByteString pkg source of

392342 Right (Src.Module _ _ _ imports _ _ _ _ _) ->

393343 Error.BadImports (toImportErrors env results imports problems)

394344

395345 Left err ->

396346 Error.BadSyntax err

397347

398− SChanged local@(Details.Local path time deps _ _ lastCompile) source modul@(Src.Module _ _ _ imports _ _ _ _ _) docsNeed ->

348+ SChanged local@(Details.Local path time deps _) source modul@(Src.Module _ _ _ imports _ _ _ _ _) ->

399349 do results <- readMVar resultsMVar

400− depsStatus <- checkDeps root results deps lastCompile

350+ depsStatus <- checkDeps root results deps

401351 case depsStatus of

402352 DepsChange ifaces ->

403− compile env docsNeed local source ifaces modul

353+ compile env local source ifaces modul

404354

405355 DepsSame same cached ->

406− do maybeLoaded <- loadInterfaces root same cached

356+ do maybeLoaded <- checkCachedInterfaces root cached

407357 case maybeLoaded of

408− Nothing -> return RBlocked

409− Just ifaces -> compile env docsNeed local source ifaces modul

358+ Nothing ->

359+ return RBlocked

360+

361+ Just loaded ->

362+ do let ifaces = Map.union loaded (Map.fromList same)

363+ compile env local source ifaces modul

410364

411365 DepsBlock ->

412366 return RBlocked

@@ -425,7 +379,7 @@ checkModule env@(Env _ root projectType _ _ _ _) foreigns resultsMVar name statu

425379 SForeign home ->

426380 case foreigns ! ModuleName.Canonical home name of

427381 I.Public iface -> return (RForeign iface)

428− I.Private _ _ _ -> error $ "mistakenly seeing private interface for " ++ Pkg.toChars home ++ " " ++ ModuleName.toChars name

382+ I.Private _ _ _ -> error "loading private interface in Build"

429383

430384 SKernel ->

431385 return RKernel

@@ -442,48 +396,32 @@ data DepsStatus

442396 | DepsNotFound (NE.List (ModuleName.Raw, Import.Problem))

443397

444398

445−checkDeps :: FilePath -> ResultDict -> [ModuleName.Raw] -> Details.BuildID -> IO DepsStatus

446−checkDeps root results deps lastCompile =

447− checkDepsHelp root results deps [] [] [] [] False 0 lastCompile

399+checkDeps :: FilePath -> ResultDict -> [ModuleName.Raw] -> IO DepsStatus

400+checkDeps root results deps =

401+ checkDepsHelp root results deps [] [] [] [] False

448402

449403

450404type Dep = (ModuleName.Raw, I.Interface)

451405type CDep = (ModuleName.Raw, MVar CachedInterface)

452406

453407

454−checkDepsHelp :: FilePath -> ResultDict -> [ModuleName.Raw] -> [Dep] -> [Dep] -> [CDep] -> [(ModuleName.Raw,Import.Problem)] -> Bool -> Details.BuildID -> Details.BuildID -> IO DepsStatus

455−checkDepsHelp root results deps new same cached importProblems isBlocked lastDepChange lastCompile =

408+checkDepsHelp :: FilePath -> ResultDict -> [ModuleName.Raw] -> [Dep] -> [Dep] -> [CDep] -> [(ModuleName.Raw,Import.Problem)] -> Bool -> IO DepsStatus

409+checkDepsHelp root results deps new same cached importProblems isBlocked =

456410 case deps of

457411 dep:otherDeps ->

458412 do result <- readMVar (results ! dep)

459413 case result of

460− RNew (Details.Local _ _ _ _ lastChange _) iface _ _ ->

461− checkDepsHelp root results otherDeps ((dep,iface) : new) same cached importProblems isBlocked (max lastChange lastDepChange) lastCompile

462−

463− RSame (Details.Local _ _ _ _ lastChange _) iface _ _ ->

464− checkDepsHelp root results otherDeps new ((dep,iface) : same) cached importProblems isBlocked (max lastChange lastDepChange) lastCompile

465−

466− RCached _ lastChange mvar ->

467− checkDepsHelp root results otherDeps new same ((dep,mvar) : cached) importProblems isBlocked (max lastChange lastDepChange) lastCompile

468−

469− RNotFound prob ->

470− checkDepsHelp root results otherDeps new same cached ((dep,prob) : importProblems) True lastDepChange lastCompile

471−

472− RProblem _ ->

473− checkDepsHelp root results otherDeps new same cached importProblems True lastDepChange lastCompile

474−

475− RBlocked ->

476− checkDepsHelp root results otherDeps new same cached importProblems True lastDepChange lastCompile

477−

478− RForeign iface ->

479− checkDepsHelp root results otherDeps new ((dep,iface) : same) cached importProblems isBlocked lastDepChange lastCompile

480−

481− RKernel ->

482− checkDepsHelp root results otherDeps new same cached importProblems isBlocked lastDepChange lastCompile

483−

414+ RNew _ iface _ -> checkDepsHelp root results otherDeps ((dep,iface) : new) same cached importProblems isBlocked

415+ RSame _ iface _ -> checkDepsHelp root results otherDeps new ((dep,iface) : same) cached importProblems isBlocked

416+ RCached _ mvar -> checkDepsHelp root results otherDeps new same ((dep,mvar) : cached) importProblems isBlocked

417+ RNotFound prob -> checkDepsHelp root results otherDeps new same cached ((dep,prob) : importProblems) True

418+ RProblem _ -> checkDepsHelp root results otherDeps new same cached importProblems True

419+ RBlocked -> checkDepsHelp root results otherDeps new same cached importProblems True

420+ RForeign iface -> checkDepsHelp root results otherDeps new ((dep,iface) : same) cached importProblems isBlocked

421+ RKernel -> checkDepsHelp root results otherDeps new same cached importProblems isBlocked

484422

485423 [] ->

486− case reverse importProblems of

424+ case importProblems of

487425 p:ps ->

488426 return $ DepsNotFound (NE.List p ps)

489427

@@ -491,14 +429,18 @@ checkDepsHelp root results deps new same cached importProblems isBlocked lastDep

491429 if isBlocked then

492430 return $ DepsBlock

493431

494− else if null new && lastDepChange <= lastCompile then

432+ else if null new then

495433 return $ DepsSame same cached

496434

497435 else

498− do maybeLoaded <- loadInterfaces root same cached

436+ do maybeLoaded <- checkCachedInterfaces root cached

499437 case maybeLoaded of

500− Nothing -> return DepsBlock

501− Just ifaces -> return $ DepsChange $ Map.union (Map.fromList new) ifaces

438+ Nothing ->

439+ return DepsBlock

440+

441+ Just loaded ->

442+ return $ DepsChange $

443+ Map.union loaded (Map.union (Map.fromList new) (Map.fromList same))

502444

503445

504446

@@ -506,7 +448,7 @@ checkDepsHelp root results deps new same cached importProblems isBlocked lastDep

506448

507449

508450toImportErrors :: Env -> ResultDict -> [Src.Import] -> NE.List (ModuleName.Raw, Import.Problem) -> NE.List Import.Error

509−toImportErrors (Env _ _ _ _ _ locals foreigns) results imports problems =

451+toImportErrors (Env _ _ _ _ locals foreigns) results imports problems =

510452 let

511453 knownModules =

512454 Set.unions

@@ -528,23 +470,18 @@ toImportErrors (Env _ _ _ _ _ locals foreigns) results imports problems =

528470

529471

530472

531−-- LOAD CACHED INTERFACES

473+-- CACHED INTERFACE

532474

533475

534−loadInterfaces :: FilePath -> [Dep] -> [CDep] -> IO (Maybe (Map.Map ModuleName.Raw I.Interface))

535−loadInterfaces root same cached =

536− do loading <- traverse (fork . loadInterface root) cached

537− maybeLoaded <- traverse readMVar loading

538− case sequence maybeLoaded of

539− Nothing ->

540− return Nothing

476+checkCachedInterfaces :: FilePath -> [(ModuleName.Raw, MVar CachedInterface)] -> IO (Maybe (Map.Map ModuleName.Raw I.Interface))

477+checkCachedInterfaces root deps =

478+ do loading <- traverse (fork . checkCache root) deps

479+ loaded <- traverse readMVar loading

480+ return $ Map.fromList <$> sequence loaded

541481

542− Just loaded ->

543− return $ Just $ Map.union (Map.fromList loaded) (Map.fromList same)

544482

545−

546−loadInterface :: FilePath -> CDep -> IO (Maybe Dep)

547−loadInterface root (name, ciMvar) =

483+checkCache :: FilePath -> (ModuleName.Raw, MVar CachedInterface) -> IO (Maybe Dep)

484+checkCache root (name, ciMvar) =

548485 do cachedInterface <- takeMVar ciMvar

549486 case cachedInterface of

550487 Corrupted ->

@@ -571,8 +508,8 @@ loadInterface root (name, ciMvar) =

571508-- CHECK PROJECT

572509

573510

574−checkMidpoint :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> IO (Either Exit.BuildProjectProblem Dependencies)

575−checkMidpoint dmvar statuses =

511+checkExposedMidpoint :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> IO (Either Exit.BuildProjectProblem Dependencies)

512+checkExposedMidpoint dmvar statuses =

576513 case checkForCycles statuses of

577514 Nothing ->

578515 do maybeForeigns <- readMVar dmvar

@@ -585,11 +522,11 @@ checkMidpoint dmvar statuses =

585522 return (Left (Exit.BP_Cycle name names))

586523

587524

588−checkMidpointAndRoots :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List RootStatus -> IO (Either Exit.BuildProjectProblem Dependencies)

589−checkMidpointAndRoots dmvar statuses sroots =

525+checkMainsMidpoint :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List MainStatus -> IO (Either Exit.BuildProjectProblem Dependencies)

526+checkMainsMidpoint dmvar statuses smains =

590527 case checkForCycles statuses of

591528 Nothing ->

592− case checkUniqueRoots statuses sroots of

529+ case checkUniqueMains statuses smains of

593530 Nothing ->

594531 do maybeForeigns <- readMVar dmvar

595532 case maybeForeigns of

@@ -640,25 +577,25 @@ addToGraph name status graph =

640577 let

641578 dependencies =

642579 case status of

643− SCached (Details.Local _ _ deps _ _ _) -> deps

644− SChanged (Details.Local _ _ deps _ _ _) _ _ _ -> deps

645− SBadImport _ -> []

646− SBadSyntax _ _ _ _ -> []

647− SForeign _ -> []

648− SKernel -> []

580+ SCached (Details.Local _ _ deps _) -> deps

581+ SChanged (Details.Local _ _ deps _) _ _ -> deps

582+ SBadImport _ -> []

583+ SBadSyntax _ _ _ _ -> []

584+ SForeign _ -> []

585+ SKernel -> []

649586 in

650587 (name, name, dependencies) : graph

651588

652589

653590

654−-- CHECK UNIQUE ROOTS

591+-- CHECK UNIQUE MAINS

655592

656593

657−checkUniqueRoots :: Map.Map ModuleName.Raw Status -> NE.List RootStatus -> Maybe Exit.BuildProjectProblem

658−checkUniqueRoots insides sroots =

594+checkUniqueMains :: Map.Map ModuleName.Raw Status -> NE.List MainStatus -> Maybe Exit.BuildProjectProblem

595+checkUniqueMains insides smains =

659596 let

660597 outsidesDict =

661− Map.fromListWith OneOrMore.more (Maybe.mapMaybe rootStatusToNamePathPair (NE.toList sroots))

598+ Map.fromListWith OneOrMore.more (Maybe.mapMaybe mainStatusToNamePathPair (NE.toList smains))

662599 in

663600 case Map.traverseWithKey checkOutside outsidesDict of

664601 Left problem ->

@@ -670,78 +607,61 @@ checkUniqueRoots insides sroots =

670607 Left problem -> Just problem

671608

672609

673−rootStatusToNamePathPair :: RootStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)

674−rootStatusToNamePathPair sroot =

675− case sroot of

676− SInside _ -> Nothing

677− SOutsideOk (Details.Local path _ _ _ _ _) _ modul -> Just (Src.getName modul, OneOrMore.one path)

678− SOutsideErr _ -> Nothing

610+mainStatusToNamePathPair :: MainStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)

611+mainStatusToNamePathPair smain =

612+ case smain of

613+ SInside _ -> Nothing

614+ SOutsideOk (Details.Local path _ _ _) _ modul -> Just (Src.getName modul, OneOrMore.one path)

615+ SOutsideErr _ -> Nothing

679616

680617

681618checkOutside :: ModuleName.Raw -> OneOrMore.OneOrMore FilePath -> Either Exit.BuildProjectProblem FilePath

682619checkOutside name paths =

683620 case OneOrMore.destruct NE.List paths of

684621 NE.List p [] -> Right p

685− NE.List p1 (p2:_) -> Left (Exit.BP_RootNameDuplicate name p1 p2)

622+ NE.List p1 (p2:_) -> Left (Exit.BP_MainNameDuplicate name p1 p2)

686623

687624

688625checkInside :: ModuleName.Raw -> FilePath -> Status -> Either Exit.BuildProjectProblem ()

689626checkInside name p1 status =

690627 case status of

691− SCached (Details.Local p2 _ _ _ _ _) -> Left (Exit.BP_RootNameDuplicate name p1 p2)

692− SChanged (Details.Local p2 _ _ _ _ _) _ _ _ -> Left (Exit.BP_RootNameDuplicate name p1 p2)

693− SBadImport _ -> Right ()

694− SBadSyntax _ _ _ _ -> Right ()

695− SForeign _ -> Right ()

696− SKernel -> Right ()

628+ SCached (Details.Local p2 _ _ _) -> Left (Exit.BP_MainNameDuplicate name p1 p2)

629+ SChanged (Details.Local p2 _ _ _) _ _ -> Left (Exit.BP_MainNameDuplicate name p1 p2)

630+ SBadImport _ -> Right ()

631+ SBadSyntax _ _ _ _ -> Right ()

632+ SForeign _ -> Right ()

633+ SKernel -> Right ()

697634

698635

699636

700637-- COMPILE MODULE

701638

702639

703−compile :: Env -> DocsNeed -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO Result

704−compile (Env key root projectType _ buildID _ _) docsNeed (Details.Local path time deps main lastChange _) source ifaces modul =

705− let

706− pkg = projectTypeToPkg projectType

707− in

640+compile :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO Result

641+compile (Env key root pkg _ _ _) local@(Details.Local path time _ _) source ifaces modul =

708642 case Compile.compile pkg ifaces modul of

709643 Right (Compile.Artifacts canonical annotations objects) ->

710− case makeDocs docsNeed canonical of

711− Left err ->

712− return $ RProblem $

713− Error.Module (Src.getName modul) path time source (Error.BadDocs err)

714−

715− Right docs ->

716− do let name = Src.getName modul

717− let iface = I.fromModule pkg canonical annotations

718− let elmi = Stuff.elmi root name

719− File.writeBinary (Stuff.elmo root name) objects

720− maybeOldi <- File.readBinary elmi

721− case maybeOldi of

722− Just oldi | oldi == iface ->

723− do -- iface should be fully forced by equality check

724− Reporting.report key Reporting.BDone

725− let local = Details.Local path time deps main lastChange buildID

726− return (RSame local iface objects docs)

727−

728− _ ->

729− do -- iface may be lazy still

730− File.writeBinary elmi iface

731− Reporting.report key Reporting.BDone

732− let local = Details.Local path time deps main buildID buildID

733− return (RNew local iface objects docs)

644+ do let name = Src.getName modul

645+ let iface = I.fromModule pkg canonical annotations

646+ File.writeBinary (Stuff.elmo root name) objects

647+ maybeOldi <- File.readBinary (Stuff.elmi root name)

648+ case maybeOldi of

649+ Just oldi | oldi == iface ->

650+ do -- iface should be fully forced by equality check

651+ Reporting.report key Reporting.BDone

652+ return (RSame local iface objects)

653+

654+ _ ->

655+ do -- iface may be lazy still

656+ -- TODO try adding forkIO here

657+ File.writeBinary (Stuff.elmi root name) iface

658+ Reporting.report key Reporting.BDone

659+ return (RNew local iface objects)

734660

735661 Left err ->

736− return $ RProblem $

737− Error.Module (Src.getName modul) path time source err

738−

739−

740−projectTypeToPkg :: Parse.ProjectType -> Pkg.Name

741−projectTypeToPkg projectType =

742− case projectType of

743− Parse.Package pkg -> pkg

744− Parse.Application -> Pkg.dummyName

662+ do Reporting.report key Reporting.BDone

663+ return $ RProblem $

664+ Error.Module (Src.getName modul) path time source err

745665

746666

747667

@@ -749,210 +669,46 @@ projectTypeToPkg projectType =

749669

750670

751671writeDetails :: FilePath -> Details.Details -> Map.Map ModuleName.Raw Result -> IO ()

752−writeDetails root (Details.Details time outline buildID locals foreigns extras) results =

672+writeDetails root (Details.Details time outline locals foreigns extras) results =

753673 File.writeBinary (Stuff.details root) $

754− Details.Details time outline buildID (Map.foldrWithKey addNewLocal locals results) foreigns extras

674+ Details.Details time outline (Map.foldrWithKey addNewLocal locals results) foreigns extras

755675

756676

757677addNewLocal :: ModuleName.Raw -> Result -> Map.Map ModuleName.Raw Details.Local -> Map.Map ModuleName.Raw Details.Local

758678addNewLocal name result locals =

759679 case result of

760− RNew local _ _ _ -> Map.insert name local locals

761− RSame local _ _ _ -> Map.insert name local locals

762− RCached _ _ _ -> locals

763− RNotFound _ -> locals

764− RProblem _ -> locals

765− RBlocked -> locals

766− RForeign _ -> locals

767− RKernel -> locals

680+ RNew local _ _ -> Map.insert name local locals

681+ RSame local _ _ -> Map.insert name local locals

682+ RCached _ _ -> locals

683+ RNotFound _ -> locals

684+ RProblem _ -> locals

685+ RBlocked -> locals

686+ RForeign _ -> locals

687+ RKernel -> locals

768688

769689

770690

771−-- FINALIZE EXPOSED

691+-- DETECT PROBLEMS

772692

773693

774−finalizeExposed :: FilePath -> DocsGoal docs -> NE.List ModuleName.Raw -> Map.Map ModuleName.Raw Result -> IO (Either Exit.BuildProblem docs)

775−finalizeExposed root docsGoal exposed results =

776− case foldr (addImportProblems results) [] (NE.toList exposed) of

777− p:ps ->

778− return $ Left $ Exit.BuildProjectProblem (Exit.BP_MissingExposed (NE.List p ps))

779−

780− [] ->

781− case Map.foldr addErrors [] results of

782− [] -> Right <$> finalizeDocs docsGoal results

783− e:es -> return $ Left $ Exit.BuildBadModules root e es

694+detectProblems :: Map.Map ModuleName.Raw Result -> Either Exit.BuildProblem ()

695+detectProblems results =

696+ case Map.foldr addErrors [] results of

697+ [] -> Right ()

698+ e:es -> Left (Exit.BuildModuleProblems e es)

784699

785700

786701addErrors :: Result -> [Error.Module] -> [Error.Module]

787702addErrors result errors =

788703 case result of

789− RNew _ _ _ _ -> errors

790− RSame _ _ _ _ -> errors

791− RCached _ _ _ -> errors

792− RNotFound _ -> errors

793− RProblem e -> e:errors

794− RBlocked -> errors

795− RForeign _ -> errors

796− RKernel -> errors

797−

798−

799−addImportProblems :: Map.Map ModuleName.Raw Result -> ModuleName.Raw -> [(ModuleName.Raw, Import.Problem)] -> [(ModuleName.Raw, Import.Problem)]

800−addImportProblems results name problems =

801− case results ! name of

802− RNew _ _ _ _ -> problems

803− RSame _ _ _ _ -> problems

804− RCached _ _ _ -> problems

805− RNotFound p -> (name, p) : problems

806− RProblem _ -> problems

807− RBlocked -> problems

808− RForeign _ -> problems

809− RKernel -> problems

810−

811−

812−

813−-- DOCS

814−

815−

816−data DocsGoal a where

817− KeepDocs :: DocsGoal Docs.Documentation

818− WriteDocs :: FilePath -> DocsGoal ()

819− IgnoreDocs :: DocsGoal ()

820−

821−

822−newtype DocsNeed =

823− DocsNeed { needsDocs :: Bool }

824−

825−

826−toDocsNeed :: DocsGoal a -> DocsNeed

827−toDocsNeed goal =

828− case goal of

829− IgnoreDocs -> DocsNeed False

830− WriteDocs _ -> DocsNeed True

831− KeepDocs -> DocsNeed True

832−

833−

834−makeDocs :: DocsNeed -> Can.Module -> Either EDocs.Error (Maybe Docs.Module)

835−makeDocs (DocsNeed isNeeded) modul =

836− if isNeeded then

837− case Docs.fromModule modul of

838− Right docs -> Right (Just docs)

839− Left err -> Left err

840− else

841− Right Nothing

842−

843−

844−finalizeDocs :: DocsGoal docs -> Map.Map ModuleName.Raw Result -> IO docs

845−finalizeDocs goal results =

846− case goal of

847− KeepDocs ->

848− return $ Map.mapMaybe toDocs results

849−

850− WriteDocs path ->

851− E.writeUgly path $ Docs.encode $ Map.mapMaybe toDocs results

852−

853− IgnoreDocs ->

854− return ()

855−

856−

857−toDocs :: Result -> Maybe Docs.Module

858−toDocs result =

859− case result of

860− RNew _ _ _ d -> d

861− RSame _ _ _ d -> d

862− RCached _ _ _ -> Nothing

863− RNotFound _ -> Nothing

864− RProblem _ -> Nothing

865− RBlocked -> Nothing

866− RForeign _ -> Nothing

867− RKernel -> Nothing

868−

869−

870−

871−--------------------------------------------------------------------------------

872−------ NOW FOR SOME REPL STUFF -------------------------------------------------

873−--------------------------------------------------------------------------------

874−

875−

876−-- FROM REPL

877−

878−

879−data ReplArtifacts =

880− ReplArtifacts

881− { _repl_home :: ModuleName.Canonical

882− , _repl_modules :: [Module]

883− , _repl_localizer :: L.Localizer

884− , _repl_annotations :: Map.Map Name.Name Can.Annotation

885− }

886−

887−

888−fromRepl :: FilePath -> Details.Details -> B.ByteString -> IO (Either Exit.Repl ReplArtifacts)

889−fromRepl root details source =

890− do env@(Env _ _ projectType _ _ _ _) <- makeEnv Reporting.ignorer root details

891− case Parse.fromByteString projectType source of

892− Left syntaxError ->

893− return $ Left $ Exit.ReplBadInput source $ Error.BadSyntax syntaxError

894−

895− Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->

896− do dmvar <- Details.loadInterfaces root details

897−

898− let deps = map Src.getImportName imports

899− mvar <- newMVar Map.empty

900− crawlDeps env mvar deps ()

901−

902− statuses <- traverse readMVar =<< readMVar mvar

903− midpoint <- checkMidpoint dmvar statuses

904−

905− case midpoint of

906− Left problem ->

907− return $ Left $ Exit.ReplProjectProblem problem

908−

909− Right foreigns ->

910− do rmvar <- newEmptyMVar

911− resultMVars <- forkWithKey (checkModule env foreigns rmvar) statuses

912− putMVar rmvar resultMVars

913− results <- traverse readMVar resultMVars

914− writeDetails root details results

915− depsStatus <- checkDeps root resultMVars deps 0

916− finalizeReplArtifacts env source modul depsStatus resultMVars results

917−

918−

919−finalizeReplArtifacts :: Env -> B.ByteString -> Src.Module -> DepsStatus -> ResultDict -> Map.Map ModuleName.Raw Result -> IO (Either Exit.Repl ReplArtifacts)

920−finalizeReplArtifacts env@(Env _ root projectType _ _ _ _) source modul@(Src.Module _ _ _ imports _ _ _ _ _) depsStatus resultMVars results =

921− let

922− pkg =

923− projectTypeToPkg projectType

924−

925− compileInput ifaces =

926− case Compile.compile pkg ifaces modul of

927− Right (Compile.Artifacts canonical annotations objects) ->

928− let

929− h = Can._name canonical

930− m = Fresh (Src.getName modul) (I.fromModule pkg canonical annotations) objects

931− ms = Map.foldrWithKey addInside [] results

932− in

933− return $ Right $ ReplArtifacts h (m:ms) (L.fromModule modul) annotations

934−

935− Left errors ->

936− return $ Left $ Exit.ReplBadInput source errors

937− in

938− case depsStatus of

939− DepsChange ifaces ->

940− compileInput ifaces

941−

942− DepsSame same cached ->

943− do maybeLoaded <- loadInterfaces root same cached

944− case maybeLoaded of

945− Just ifaces -> compileInput ifaces

946− Nothing -> return $ Left $ Exit.ReplBadCache

947−

948− DepsBlock ->

949− case Map.foldr addErrors [] results of

950− [] -> return $ Left $ Exit.ReplBlocked

951− e:es -> return $ Left $ Exit.ReplBadLocalDeps root e es

952−

953− DepsNotFound problems ->

954− return $ Left $ Exit.ReplBadInput source $ Error.BadImports $

955− toImportErrors env resultMVars imports problems

704+ RNew _ _ _ -> errors

705+ RSame _ _ _ -> errors

706+ RCached _ _ -> errors

707+ RNotFound _ -> errors

708+ RProblem e -> e:errors

709+ RBlocked -> errors

710+ RForeign _ -> errors

711+ RKernel -> errors

956712

957713

958714

@@ -964,25 +720,25 @@ finalizeReplArtifacts env@(Env _ root projectType _ _ _ _) source modul@(Src.Mod

964720

965721

966722

967−-- FIND ROOT

723+-- FIND MAIN

968724

969725

970−data RootLocation

726+data MainLocation

971727 = LInside ModuleName.Raw

972728 | LOutside FilePath

973729

974730

975−findRoots :: Env -> NE.List FilePath -> IO (Either Exit.BuildProjectProblem (NE.List RootLocation))

976−findRoots env paths =

977− do mvars <- traverse (fork . getRootInfo env) paths

978− einfos <- traverse readMVar mvars

979− return $ checkRoots =<< sequence einfos

731+findMains :: Env -> NE.List FilePath -> IO (Either Exit.BuildProjectProblem (NE.List MainLocation))

732+findMains env paths =

733+ do mvars <- traverse (fork . findLocation env) paths

734+ elocs <- traverse readMVar mvars

735+ return $ checkLocations =<< sequence elocs

980736

981737

982−checkRoots :: NE.List RootInfo -> Either Exit.BuildProjectProblem (NE.List RootLocation)

983−checkRoots infos =

738+checkLocations :: NE.List Location -> Either Exit.BuildProjectProblem (NE.List MainLocation)

739+checkLocations locations =

984740 let

985− toOneOrMore loc@(RootInfo absolute _ _) =

741+ toOneOrMore loc@(Location absolute _ _) =

986742 (absolute, OneOrMore.one loc)

987743

988744 fromOneOrMore loc locs =

@@ -990,83 +746,71 @@ checkRoots infos =

990746 [] -> Right ()

991747 loc2:_ -> Left (Exit.BP_MainPathDuplicate (_relative loc) (_relative loc2))

992748 in

993− fmap (\_ -> fmap _location infos) $

749+ fmap (\_ -> fmap _location locations) $

994750 traverse (OneOrMore.destruct fromOneOrMore) $

995− Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList infos)

751+ Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList locations)

996752

997753

998754

999−-- ROOT INFO

755+-- LOCATIONS

1000756

1001757

1002−data RootInfo =

1003− RootInfo

758+data Location =

759+ Location

1004760 { _absolute :: FilePath

1005761 , _relative :: FilePath

1006− , _location :: RootLocation

762+ , _location :: MainLocation

1007763 }

1008764

1009765

1010−getRootInfo :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)

1011−getRootInfo env path =

766+findLocation :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem Location)

767+findLocation env path =

1012768 do exists <- File.exists path

1013769 if exists

1014− then getRootInfoHelp env path =<< Dir.canonicalizePath path

770+ then isInsideSrcDirs env path <$> Dir.canonicalizePath path

1015771 else return (Left (Exit.BP_PathUnknown path))

1016772

1017773

1018−getRootInfoHelp :: Env -> FilePath -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)

1019−getRootInfoHelp (Env _ _ _ srcDirs _ _ _) path absolutePath =

774+isInsideSrcDirs :: Env -> FilePath -> FilePath -> Either Exit.BuildProjectProblem Location

775+isInsideSrcDirs (Env _ root _ srcDirs _ _) path absolutePath =

1020776 let

1021777 (dirs, file) = FP.splitFileName absolutePath

1022− (final, ext) = FP.splitExtension file

778+ (final, ext) = break (=='.') file

1023779 in

1024780 if ext /= ".elm"

1025− then

1026− return $ Left $ Exit.BP_WithBadExtension path

781+ then Left (Exit.BP_WithBadExtension path)

1027782 else

1028783 let

1029− absoluteSegments = FP.splitDirectories dirs ++ [final]

784+ roots = FP.splitDirectories root

785+ segments = FP.splitDirectories dirs ++ [final]

1030786 in

1031− case Maybe.mapMaybe (isInsideSrcDirByPath absoluteSegments) srcDirs of

1032− [] ->

1033− return $ Right $ RootInfo absolutePath path (LOutside path)

1034−

1035− [(_, Right names)] ->

1036− do let name = Name.fromChars (List.intercalate "." names)

1037− matchingDirs <- filterM (isInsideSrcDirByName names) srcDirs

1038− case matchingDirs of

1039− d1:d2:_ ->

1040− do let p1 = addRelative d1 (FP.joinPath names <.> "elm")

1041− let p2 = addRelative d2 (FP.joinPath names <.> "elm")

1042− return $ Left $ Exit.BP_RootNameDuplicate name p1 p2

1043−

1044− _ ->

1045− return $ Right $ RootInfo absolutePath path (LInside name)

1046−

1047− [(s, Left names)] ->

1048− return $ Left $ Exit.BP_RootNameInvalid path s names

1049−

1050− (s1,_):(s2,_):_ ->

1051− return $ Left $ Exit.BP_WithAmbiguousSrcDir path s1 s2

1052−

1053−

1054−

1055−isInsideSrcDirByName :: [String] -> AbsoluteSrcDir -> IO Bool

1056−isInsideSrcDirByName names srcDir =

1057− File.exists (addRelative srcDir (FP.joinPath names <.> "elm"))

1058−

1059−

1060−isInsideSrcDirByPath :: [String] -> AbsoluteSrcDir -> Maybe (FilePath, Either [String] [String])

1061−isInsideSrcDirByPath segments (AbsoluteSrcDir srcDir) =

787+ case dropPrefix roots segments of

788+ Nothing ->

789+ Right (Location absolutePath path (LOutside path))

790+

791+ Just relativeSegments ->

792+ let

793+ (exits, maybes) =

794+ Either.partitionEithers (map (isInsideSrcDirsHelp relativeSegments) srcDirs)

795+ in

796+ -- TODO make sure this is all correct

797+ case (exits, Maybe.catMaybes maybes) of

798+ (_, [(_,name)]) -> Right (Location absolutePath path (LInside name))

799+ ([], []) -> Right (Location absolutePath path (LOutside path))

800+ (_, (s1,_):(s2,_):_) -> Left (Exit.BP_WithAmbiguousSrcDir s1 s2)

801+ (exit:_, _) -> Left exit

802+

803+

804+isInsideSrcDirsHelp :: [String] -> FilePath -> Either Exit.BuildProjectProblem (Maybe (FilePath, ModuleName.Raw))

805+isInsideSrcDirsHelp segments srcDir =

1062806 case dropPrefix (FP.splitDirectories srcDir) segments of

1063807 Nothing ->

1064− Nothing

808+ Right Nothing

1065809

1066810 Just names ->

1067811 if all isGoodName names

1068− then Just (srcDir, Right names)

1069− else Just (srcDir, Left names)

812+ then Right (Just (srcDir, Name.fromChars (List.intercalate "." names)))

813+ else Left (error "Exit.MakeWithInvalidModuleName" srcDir segments)

1070814

1071815

1072816isGoodName :: [Char] -> Bool

@@ -1079,8 +823,6 @@ isGoodName name =

1079823 Char.isUpper char && all (\c -> Char.isAlphaNum c || c == '_') chars

1080824

1081825

1082−-- INVARIANT: Dir.canonicalizePath has been run on both inputs

1083−--

1084826dropPrefix :: [FilePath] -> [FilePath] -> Maybe [FilePath]

1085827dropPrefix roots paths =

1086828 case roots of

@@ -1089,37 +831,37 @@ dropPrefix roots paths =

1089831

1090832 r:rs ->

1091833 case paths of

1092− [] -> Nothing

834+ [] -> Nothing

1093835 p:ps -> if r == p then dropPrefix rs ps else Nothing

1094836

1095837

1096838

1097−-- CRAWL ROOTS

839+-- CRAWL MAINS

1098840

1099841

1100−data RootStatus

842+data MainStatus

1101843 = SInside ModuleName.Raw

1102844 | SOutsideOk Details.Local B.ByteString Src.Module

1103845 | SOutsideErr Error.Module

1104846

1105847

1106−crawlRoot :: Env -> MVar StatusDict -> RootLocation -> IO RootStatus

1107−crawlRoot env@(Env _ _ projectType _ buildID _ _) mvar root =

1108− case root of

848+crawlMain :: Env -> MVar StatusDict -> MainLocation -> IO MainStatus

849+crawlMain env@(Env _ _ pkg _ _ _) mvar given =

850+ case given of

1109851 LInside name ->

1110852 do statusMVar <- newEmptyMVar

1111853 statusDict <- takeMVar mvar

1112854 putMVar mvar (Map.insert name statusMVar statusDict)

1113− putMVar statusMVar =<< crawlModule env mvar (DocsNeed False) name

855+ putMVar statusMVar =<< crawlModule env mvar name

1114856 return (SInside name)

1115857

1116858 LOutside path ->

1117859 do time <- File.getTime path

1118860 source <- File.readUtf8 path

1119− case Parse.fromByteString projectType source of

861+ case Parse.fromByteString pkg source of

1120862 Right modul@(Src.Module _ _ _ imports values _ _ _ _) ->

1121863 do let deps = map Src.getImportName imports

1122− let local = Details.Local path time deps (any isMain values) buildID buildID

864+ let local = Details.Local path time deps (any isMain values)

1123865 crawlDeps env mvar deps (SOutsideOk local source modul)

1124866

1125867 Left syntaxError ->

@@ -1128,36 +870,40 @@ crawlRoot env@(Env _ _ projectType _ buildID _ _) mvar root =

1128870

1129871

1130872

1131−-- CHECK ROOTS

873+-- CHECK MAINS

1132874

1133875

1134−data RootResult

876+data MainResult

1135877 = RInside ModuleName.Raw

1136878 | ROutsideOk ModuleName.Raw I.Interface Opt.LocalGraph

1137879 | ROutsideErr Error.Module

1138880 | ROutsideBlocked

1139881

1140882

1141−checkRoot :: Env -> ResultDict -> RootStatus -> IO RootResult

1142−checkRoot env@(Env _ root _ _ _ _ _) results rootStatus =

1143− case rootStatus of

883+checkMain :: Env -> ResultDict -> MainStatus -> IO MainResult

884+checkMain env@(Env _ root _ _ _ _) results pendingMain =

885+ case pendingMain of

1144886 SInside name ->

1145887 return (RInside name)

1146888

1147889 SOutsideErr err ->

1148890 return (ROutsideErr err)

1149891

1150− SOutsideOk local@(Details.Local path time deps _ _ lastCompile) source modul@(Src.Module _ _ _ imports _ _ _ _ _) ->

1151− do depsStatus <- checkDeps root results deps lastCompile

892+ SOutsideOk local@(Details.Local path time deps _) source modul@(Src.Module _ _ _ imports _ _ _ _ _) ->

893+ do depsStatus <- checkDeps root results deps

1152894 case depsStatus of

1153895 DepsChange ifaces ->

1154− compileOutside env local source ifaces modul

896+ return $ compileOutside env local source ifaces modul

1155897

1156898 DepsSame same cached ->

1157− do maybeLoaded <- loadInterfaces root same cached

899+ do maybeLoaded <- checkCachedInterfaces root cached

1158900 case maybeLoaded of

1159− Nothing -> return ROutsideBlocked

1160− Just ifaces -> compileOutside env local source ifaces modul

901+ Nothing ->

902+ return ROutsideBlocked

903+

904+ Just loaded ->

905+ do let ifaces = Map.union loaded (Map.fromList same)

906+ return $ compileOutside env local source ifaces modul

1161907

1162908 DepsBlock ->

1163909 return ROutsideBlocked

@@ -1167,54 +913,53 @@ checkRoot env@(Env _ root _ _ _ _ _) results rootStatus =

1167913 Error.BadImports (toImportErrors env results imports problems)

1168914

1169915

1170−compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO RootResult

1171−compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _) source ifaces modul =

916+compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> MainResult

917+compileOutside (Env _ _ pkg _ _ _) (Details.Local path time _ _) source ifaces modul =

1172918 let

1173− pkg = projectTypeToPkg projectType

1174919 name = Src.getName modul

1175920 in

1176921 case Compile.compile pkg ifaces modul of

1177922 Right (Compile.Artifacts canonical annotations objects) ->

1178− do Reporting.report key Reporting.BDone

1179− return $ ROutsideOk name (I.fromModule pkg canonical annotations) objects

923+ ROutsideOk name (I.fromModule pkg canonical annotations) objects

1180924

1181925 Left errors ->

1182− return $ ROutsideErr $ Error.Module name path time source errors

926+ ROutsideErr $

927+ Error.Module name path time source errors

1183928

1184929

1185930

1186931-- TO ARTIFACTS

1187932

1188933

1189−data Root

934+data Main

1190935 = Inside ModuleName.Raw

1191936 | Outside ModuleName.Raw I.Interface Opt.LocalGraph

1192937

1193938

1194−toArtifacts :: Env -> Dependencies -> Map.Map ModuleName.Raw Result -> NE.List RootResult -> Either Exit.BuildProblem Artifacts

1195−toArtifacts (Env _ root projectType _ _ _ _) foreigns results rootResults =

1196− case gatherProblemsOrMains results rootResults of

939+toArtifacts :: Env -> Dependencies -> Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either Exit.BuildProblem Artifacts

940+toArtifacts (Env _ _ pkg _ _ _) foreigns results mainResults =

941+ case gatherProblemsOrMains results mainResults of

1197942 Left (NE.List e es) ->

1198− Left (Exit.BuildBadModules root e es)

943+ Left (Exit.BuildModuleProblems e es)

1199944

1200− Right roots ->

1201− Right $ Artifacts (projectTypeToPkg projectType) foreigns roots $

1202− Map.foldrWithKey addInside (foldr addOutside [] rootResults) results

945+ Right mains ->

946+ Right $ Artifacts pkg foreigns mains $

947+ Map.foldrWithKey addInside (foldr addOutside [] mainResults) results

1203948

1204949

1205−gatherProblemsOrMains :: Map.Map ModuleName.Raw Result -> NE.List RootResult -> Either (NE.List Error.Module) (NE.List Root)

1206−gatherProblemsOrMains results (NE.List rootResult rootResults) =

950+gatherProblemsOrMains :: Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either (NE.List Error.Module) (NE.List Main)

951+gatherProblemsOrMains results (NE.List mainResult mainResults) =

1207952 let

1208− addResult result (es, roots) =

953+ sortMain result (es, mains) =

1209954 case result of

1210− RInside n -> ( es, Inside n : roots)

1211− ROutsideOk n i o -> ( es, Outside n i o : roots)

1212− ROutsideErr e -> (e:es, roots)

1213− ROutsideBlocked -> ( es, roots)

955+ RInside n -> ( es, Inside n : mains)

956+ ROutsideOk n i o -> ( es, Outside n i o : mains)

957+ ROutsideErr e -> (e:es, mains)

958+ ROutsideBlocked -> ( es, mains)

1214959

1215960 errors = Map.foldr addErrors [] results

1216961 in

1217− case (rootResult, foldr addResult (errors, []) rootResults) of

962+ case (mainResult, foldr sortMain (errors, []) mainResults) of

1218963 (RInside n , ( [], ms)) -> Right (NE.List (Inside n) ms)

1219964 (RInside _ , (e:es, _ )) -> Left (NE.List e es)

1220965 (ROutsideOk n i o, ( [], ms)) -> Right (NE.List (Outside n i o) ms)

@@ -1227,14 +972,14 @@ gatherProblemsOrMains results (NE.List rootResult rootResults) =

1227972addInside :: ModuleName.Raw -> Result -> [Module] -> [Module]

1228973addInside name result modules =

1229974 case result of

1230− RNew _ iface objs _ -> Fresh name iface objs : modules

1231− RSame _ iface objs _ -> Fresh name iface objs : modules

1232− RCached main _ mvar -> Cached name main mvar : modules

1233− RNotFound _ -> error (badInside name)

1234− RProblem _ -> error (badInside name)

1235− RBlocked -> error (badInside name)

1236− RForeign _ -> modules

1237− RKernel -> modules

975+ RNew _ iface objs -> Fresh name iface objs : modules

976+ RSame _ iface objs -> Fresh name iface objs : modules

977+ RCached main mvar -> Cached name main mvar : modules

978+ RNotFound _ -> error (badInside name)

979+ RProblem _ -> error (badInside name)

980+ RBlocked -> error (badInside name)

981+ RForeign _ -> modules

982+ RKernel -> modules

1238983

1239984

1240985badInside :: ModuleName.Raw -> [Char]

@@ -1242,9 +987,9 @@ badInside name =

1242987 "Error from `" ++ Name.toChars name ++ "` should have been reported already."

1243988

1244989

1245−addOutside :: RootResult -> [Module] -> [Module]

1246−addOutside root modules =

1247− case root of

990+addOutside :: MainResult -> [Module] -> [Module]

991+addOutside main modules =

992+ case main of

1248993 RInside _ -> modules

1249994 ROutsideOk name iface objs -> Fresh name iface objs : modules

1250995 ROutsideErr _ -> modules

builder/src/Deps/Bump.hsdeleted−37

@@ -1,37 +0,0 @@

1−module Deps.Bump

2− ( getPossibilities

3− )

4− where

5−

6−

7−import qualified Data.List as List

8−

9−import qualified Deps.Registry as Registry

10−import qualified Elm.Magnitude as M

11−import qualified Elm.Version as V

12−

13−

14−

15−-- GET POSSIBILITIES

16−

17−

18−getPossibilities :: Registry.KnownVersions -> [(V.Version, V.Version, M.Magnitude)]

19−getPossibilities (Registry.KnownVersions latest previous) =

20− let

21− allVersions = reverse (latest:previous)

22− minorPoints = map last (List.groupBy sameMajor allVersions)

23− patchPoints = map last (List.groupBy sameMinor allVersions)

24− in

25− (latest, V.bumpMajor latest, M.MAJOR)

26− : map (\v -> (v, V.bumpMinor v, M.MINOR)) minorPoints

27− ++ map (\v -> (v, V.bumpPatch v, M.PATCH)) patchPoints

28−

29−

30−sameMajor :: V.Version -> V.Version -> Bool

31−sameMajor (V.Version major1 _ _) (V.Version major2 _ _) =

32− major1 == major2

33−

34−

35−sameMinor :: V.Version -> V.Version -> Bool

36−sameMinor (V.Version major1 minor1 _) (V.Version major2 minor2 _) =

37− major1 == major2 && minor1 == minor2

builder/src/Deps/Diff.hs+5−7

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

1818import qualified Data.Map as Map

1919import qualified Data.Name as Name

2020import qualified Data.Set as Set

21−import qualified System.Directory as Dir

21+import qualified Data.Utf8 as Utf8

2222import System.FilePath ((</>))

2323

2424import qualified Deps.Website as Website

@@ -204,7 +204,7 @@ isSameName :: Name.Name -> Name.Name -> Bool

204204isSameName oldFullName newFullName =

205205 let

206206 dedot name =

207− reverse (Name.splitDots name)

207+ reverse (Utf8.split 0x2E {-.-} (Name.toUtf8 name))

208208 in

209209 case ( dedot oldFullName, dedot newFullName ) of

210210 (oldName:[], newName:_) ->

@@ -357,8 +357,7 @@ changeMagnitude (Changes added changed removed) =

357357

358358getDocs :: Stuff.PackageCache -> Http.Manager -> Pkg.Name -> V.Version -> IO (Either Exit.DocsProblem Docs.Documentation)

359359getDocs cache manager name version =

360− do let home = Stuff.package cache name version

361− let path = home </> "docs.json"

360+ do let path = Stuff.package cache name version </> "docs.json"

362361 exists <- File.exists path

363362 if exists

364363 then

@@ -375,9 +374,8 @@ getDocs cache manager name version =

375374 Http.get manager url [] Exit.DP_Http $ \body ->

376375 case D.fromByteString Docs.decoder body of

377376 Right docs ->

378− do Dir.createDirectoryIfMissing True home

379− File.writeUtf8 path body

377+ do File.writeUtf8 path body

380378 return $ Right docs

381379

382380 Left _ ->

383− return $ Left $ Exit.DP_Data url body

381+ return $ Left Exit.DP_Data

builder/src/Deps/Registry.hs+68−35

@@ -16,8 +16,11 @@ module Deps.Registry

1616import Prelude hiding (read)

1717import Control.Monad (liftM2)

1818import Data.Binary (Binary, get, put)

19+import Data.Function (on)

1920import qualified Data.List as List

2021import qualified Data.Map.Strict as Map

22+import qualified Data.Name as Name

23+import qualified Data.Utf8 as Utf8

2124

2225import qualified Deps.Website as Website

2326import qualified Elm.Package as Pkg

@@ -25,8 +28,8 @@ import qualified Elm.Version as V

2528import qualified File

2629import qualified Http

2730import qualified Json.Decode as D

28−import qualified Parse.Primitives as P

2931import qualified Reporting.Exit as Exit

32+import qualified Reporting.Suggest as Suggest

3033import qualified Stuff

3134

3235

@@ -54,7 +57,11 @@ data KnownVersions =

5457

5558read :: Stuff.PackageCache -> IO (Maybe Registry)

5659read cache =

57− File.readBinary (Stuff.registry cache)

60+ do let path = Stuff.registry cache

61+ exists <- File.exists path

62+ if exists

63+ then File.readBinary path

64+ else return Nothing

5865

5966

6067

@@ -79,19 +86,26 @@ addEntry (KnownVersions _ vs) count =

7986

8087allPkgsDecoder :: D.Decoder () (Map.Map Pkg.Name KnownVersions)

8188allPkgsDecoder =

82− let

83− keyDecoder =

84− Pkg.keyDecoder bail

89+ do pairs <- D.pairs (D.list (D.mapError (\_ -> ()) V.decoder))

90+ checkKeys pairs Map.empty

91+ where

92+ checkKeys pairs pkgs =

93+ case pairs of

94+ [] ->

95+ return pkgs

8596

86− versionsDecoder =

87− D.list (D.mapError (\_ -> ()) V.decoder)

97+ (key, versions) : rest ->

98+ case Pkg.fromString key of

99+ Right pkg ->

100+ case List.sortBy (flip compare) versions of

101+ [] ->

102+ D.failure ()

88103

89− toKnownVersions versions =

90− case List.sortBy (flip compare) versions of

91− v:vs -> return (KnownVersions v vs)

92− [] -> D.failure ()

93− in

94− D.dict keyDecoder (toKnownVersions =<< versionsDecoder)

104+ v:vs ->

105+ checkKeys rest (Map.insert pkg (KnownVersions v vs) pkgs)

106+

107+ Left _ ->

108+ D.failure ()

95109

96110

97111

@@ -130,26 +144,22 @@ addNew (name, version) versions =

130144 Map.alter (Just . add) name versions

131145

132146

133−

134−-- NEW PACKAGE DECODER

135−

136−

137147newPkgDecoder :: D.Decoder () (Pkg.Name, V.Version)

138148newPkgDecoder =

139− D.customString newPkgParser bail

140−

149+ do str <- D.string

150+ case Utf8.split 0x40 {-@-} str of

151+ [key, value] ->

152+ case Pkg.fromString key of

153+ Right pkg ->

154+ case V.fromString value of

155+ Just vsn -> return (pkg, vsn)

156+ Nothing -> D.failure ()

141157

142−newPkgParser :: P.Parser () (Pkg.Name, V.Version)

143−newPkgParser =

144− do pkg <- P.specialize (\_ _ _ -> ()) Pkg.parser

145− P.word1 0x40 {-@-} bail

146− vsn <- P.specialize (\_ _ _ -> ()) V.parser

147− return (pkg, vsn)

158+ Left _ ->

159+ D.failure ()

148160

149−

150−bail :: row -> col -> ()

151−bail _ _ =

152− ()

161+ _ ->

162+ D.failure ()

153163

154164

155165

@@ -180,7 +190,33 @@ getVersions' :: Pkg.Name -> Registry -> Either [Pkg.Name] KnownVersions

180190getVersions' name (Registry _ versions) =

181191 case Map.lookup name versions of

182192 Just kvs -> Right kvs

183− Nothing -> Left $ Pkg.nearbyNames name (Map.keys versions)

193+ Nothing -> Left $ nearbyNames name (Map.keys versions)

194+

195+

196+nearbyNames :: Pkg.Name -> [Pkg.Name] -> [Pkg.Name]

197+nearbyNames (Pkg.Name author1 project1) possibleNames =

198+ let

199+ authorDist = authorDistance (Name.toChars author1)

200+ projectDist = projectDistance (Name.toChars project1)

201+

202+ addDistance name@(Pkg.Name author2 project2) =

203+ ( authorDist author2 + projectDist project2, name )

204+ in

205+ map snd $ take 4 $

206+ List.sortBy (compare `on` fst) $

207+ map addDistance possibleNames

208+

209+

210+authorDistance :: String -> Name.Name -> Int

211+authorDistance bad possibility =

212+ abs (Suggest.distance bad (Name.toChars possibility))

213+

214+

215+projectDistance :: String -> Name.Name -> Int

216+projectDistance bad possibility =

217+ if possibility == "elm" || possibility == "elm-explorations"

218+ then 0

219+ else abs (Suggest.distance bad (Name.toChars possibility))

184220

185221

186222

@@ -189,14 +225,11 @@ getVersions' name (Registry _ versions) =

189225

190226post :: Http.Manager -> String -> D.Decoder x a -> (a -> IO b) -> IO (Either Exit.RegistryProblem b)

191227post manager path decoder callback =

192− let

193− url = Website.route path []

194− in

195− Http.post manager url [] Exit.RP_Http $

228+ Http.post manager (Website.route path []) [] Exit.RP_Http $

196229 \body ->

197230 case D.fromByteString decoder body of

198231 Right a -> Right <$> callback a

199− Left _ -> return $ Left $ Exit.RP_Data url body

232+ Left _ -> return $ Left Exit.RP_Data

200233

201234

202235

builder/src/Deps/Solver.hs+29−31

@@ -94,7 +94,6 @@ data Details =

9494

9595verify :: Stuff.PackageCache -> Connection -> Registry.Registry -> Map.Map Pkg.Name C.Constraint -> IO (Result (Map.Map Pkg.Name Details))

9696verify cache connection registry constraints =

97− Stuff.withRegistryLock cache $

9897 case try constraints of

9998 Solver solver ->

10099 solver (State cache connection registry Map.empty)

@@ -131,7 +130,6 @@ data AppSolution =

131130

132131addToApp :: Stuff.PackageCache -> Connection -> Registry.Registry -> Pkg.Name -> Outline.AppOutline -> IO (Result AppSolution)

133132addToApp cache connection registry pkg outline@(Outline.AppOutline _ _ direct indirect testDirect testIndirect) =

134− Stuff.withRegistryLock cache $

135133 let

136134 allIndirects = Map.union indirect testIndirect

137135 allDirects = Map.union direct testDirect

@@ -313,11 +311,10 @@ getConstraints pkg vsn =

313311 back state

314312

315313 Online manager ->

316− do let url = Website.metadata pkg vsn "elm.json"

317− result <- Http.get manager url [] id (return . Right)

314+ do result <- Http.get manager (Website.metadata pkg vsn "elm.json") [] id (return . Right)

318315 case result of

319316 Left httpProblem ->

320− err (Exit.SolverBadHttp pkg vsn httpProblem)

317+ err (Exit.SolverBadHttp httpProblem)

321318

322319 Right body ->

323320 case D.fromByteString constraintsDecoder body of

@@ -327,9 +324,11 @@ getConstraints pkg vsn =

327324 ok (toNewState cs) cs back

328325

329326 Left _ ->

330− err (Exit.SolverBadHttpData pkg vsn url)

327+ err (Exit.SolverBadHttpData pkg vsn)

331328

332329

330+-- TODO write constraintsDecoder to be a bit faster

331+--

333332constraintsDecoder :: D.Decoder () Constraints

334333constraintsDecoder =

335334 do outline <- D.mapError (const ()) Outline.decoder

@@ -351,31 +350,30 @@ data Env =

351350

352351initEnv :: IO (Either Exit.RegistryProblem Env)

353352initEnv =

354− do mvar <- newEmptyMVar

355− _ <- forkIO $ putMVar mvar =<< Http.getManager

356− cache <- Stuff.getPackageCache

357− Stuff.withRegistryLock cache $

358− do maybeRegistry <- Registry.read cache

359− manager <- readMVar mvar

360−

361− case maybeRegistry of

362− Nothing ->

363− do eitherRegistry <- Registry.fetch manager cache

364− case eitherRegistry of

365− Right latestRegistry ->

366− return $ Right $ Env cache manager (Online manager) latestRegistry

367−

368− Left problem ->

369− return $ Left $ problem

370−

371− Just cachedRegistry ->

372− do eitherRegistry <- Registry.update manager cache cachedRegistry

373− case eitherRegistry of

374− Right latestRegistry ->

375− return $ Right $ Env cache manager (Online manager) latestRegistry

376−

377− Left _ ->

378− return $ Right $ Env cache manager Offline cachedRegistry

353+ do mvar <- newEmptyMVar

354+ _ <- forkIO $ putMVar mvar =<< Http.getManager

355+ cache <- Stuff.getPackageCache

356+ maybeRegistry <- Registry.read cache

357+ manager <- readMVar mvar

358+

359+ case maybeRegistry of

360+ Nothing ->

361+ do eitherRegistry <- Registry.fetch manager cache

362+ case eitherRegistry of

363+ Right latestRegistry ->

364+ return $ Right $ Env cache manager (Online manager) latestRegistry

365+

366+ Left problem ->

367+ return $ Left $ problem

368+

369+ Just cachedRegistry ->

370+ do eitherRegistry <- Registry.update manager cache cachedRegistry

371+ case eitherRegistry of

372+ Right latestRegistry ->

373+ return $ Right $ Env cache manager (Online manager) latestRegistry

374+

375+ Left _ ->

376+ return $ Right $ Env cache manager Offline cachedRegistry

379377

380378

381379

builder/src/Elm/Bump.hsnew file+137

@@ -0,0 +1,137 @@

1+{-# LANGUAGE OverloadedStrings #-}

2+module Elm.Bump

3+ ( bump

4+ , toPossibleBumps

5+ )

6+ where

7+

8+

9+import Control.Monad.Trans (liftIO)

10+import qualified Data.List as List

11+

12+import qualified Deps.Cache as Cache

13+import qualified Deps.Diff as Diff

14+import qualified Elm.Project.Json as Project

15+import qualified Elm.Project.Summary as Summary

16+import qualified Elm.Version as V

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

18+import qualified Reporting.Doc as D

19+import qualified Reporting.Exit as Exit

20+import qualified Reporting.Exit.Bump as E

21+import qualified Reporting.Exit.Help as Help

22+import qualified Reporting.Progress.Terminal as Terminal

23+import qualified Reporting.Task as Task

24+

25+

26+

27+-- BUMP

28+

29+

30+bump :: Summary.Summary -> Task.Task ()

31+bump summary@(Summary.Summary root project _ _ _) =

32+ case project of

33+ Project.App _ ->

34+ Task.throw (Exit.Bump E.Application)

35+

36+ Project.Pkg info@(Project.PkgInfo name _ _ version _ _ _ _) ->

37+ do registry <- Cache.mandatoryUpdate

38+ case Cache.getVersions name registry of

39+ Left _suggestions ->

40+ checkNewPackage root info

41+

42+ Right publishedVersions ->

43+ let

44+ bumpableVersions =

45+ map (\(old, _, _) -> old) (toPossibleBumps publishedVersions)

46+ in

47+ if elem version bumpableVersions then

48+ suggestVersion summary info

49+ else

50+ Task.throw $ Exit.Bump $ E.Unbumpable version $

51+ map head (List.group (List.sort bumpableVersions))

52+

53+

54+

55+-- VALID BUMPS

56+

57+

58+toPossibleBumps :: [V.Version] -> [(V.Version, V.Version, Diff.Magnitude)]

59+toPossibleBumps publishedVersions =

60+ case publishedVersions of

61+ [] ->

62+ []

63+

64+ _ ->

65+ let

66+ patchPoints =

67+ V.filterLatest V.majorAndMinor publishedVersions

68+

69+ minorPoints =

70+ V.filterLatest V._major publishedVersions

71+

72+ majorPoint =

73+ maximum publishedVersions

74+ in

75+ (majorPoint, V.bumpMajor majorPoint, Diff.MAJOR)

76+ : map (\v -> (v, V.bumpMinor v, Diff.MINOR)) minorPoints

77+ ++ map (\v -> (v, V.bumpPatch v, Diff.PATCH)) patchPoints

78+

79+

80+

81+-- CHECK NEW PACKAGE

82+

83+

84+checkNewPackage :: FilePath -> Project.PkgInfo -> Task.Task ()

85+checkNewPackage root info@(Project.PkgInfo _ _ _ version _ _ _ _) =

86+ do liftIO $ putStrLn Terminal.newPackageOverview

87+ if version == V.one

88+ then

89+ liftIO $ putStrLn "The version number in elm.json is correct so you are all set!"

90+ else

91+ changeVersion root info V.one $

92+ "It looks like the version in elm.json has been changed though!\n\

93+ \Would you like me to change it back to "

94+ <> D.fromUtf8 (V.toString V.one) <> "? [Y/n] "

95+

96+

97+

98+-- SUGGEST VERSION

99+

100+

101+suggestVersion :: Summary.Summary -> Project.PkgInfo -> Task.Task ()

102+suggestVersion (Summary.Summary root _ _ _ _) info@(Project.PkgInfo name _ _ version _ _ _ _) =

103+ do oldDocs <- Cache.getDocs name version

104+ newDocs <- Task.silently (error "TODO Project.generateDocs summary")

105+ let changes = Diff.diff oldDocs newDocs

106+ let newVersion = Diff.bump changes version

107+ changeVersion root info newVersion $

108+ let

109+ old = D.fromUtf8 $ V.toString version

110+ new = D.fromUtf8 $ V.toString newVersion

111+ mag = D.fromChars $ Diff.magnitudeToString (Diff.toMagnitude changes)

112+ in

113+ "Based on your new API, this should be a" <+> D.green mag <+> "change (" <> old <> " => " <> new <> ")\n"

114+ <> "Bail out of this command and run 'elm diff' for a full explanation.\n"

115+ <> "\n"

116+ <> "Should I perform the update (" <> old <> " => " <> new <> ") in elm.json? [Y/n] "

117+

118+

119+

120+-- CHANGE VERSION

121+

122+

123+changeVersion :: FilePath -> Project.PkgInfo -> V.Version -> D.Doc -> Task.Task ()

124+changeVersion root info targetVersion explanation =

125+ do approved <- Task.getApproval explanation

126+ if not approved

127+ then

128+ liftIO $ putStrLn "Okay, I did not change anything!"

129+

130+ else

131+ do liftIO $ Project.write root $ Project.Pkg $

132+ info { Project._pkg_version = targetVersion }

133+

134+ liftIO $ Help.toStdout $

135+ "Version changed to "

136+ <> D.green (D.fromUtf8 (V.toString targetVersion))

137+ <> "!\n"

builder/src/Elm/Details.hs+96−193

@@ -2,7 +2,6 @@

22{-# LANGUAGE BangPatterns, OverloadedStrings #-}

33module Elm.Details

44 ( Details(..)

5− , BuildID

65 , ValidOutline(..)

76 , Local(..)

87 , Foreign(..)

@@ -16,32 +15,25 @@ module Elm.Details

1615

1716import Control.Concurrent (forkIO)

1817import Control.Concurrent.MVar (MVar, newEmptyMVar, newMVar, putMVar, readMVar, takeMVar)

19−import Control.Monad (liftM, liftM2, liftM3)

18+import Control.Monad (liftM, liftM2, liftM4)

2019import Data.Binary (Binary, get, put, getWord8, putWord8)

21−import qualified Data.Either as Either

2220import qualified Data.Map as Map

2321import qualified Data.Map.Utils as Map

2422import qualified Data.Map.Merge.Strict as Map

25−import qualified Data.Maybe as Maybe

2623import qualified Data.Name as Name

27−import qualified Data.NonEmptyList as NE

2824import qualified Data.OneOrMore as OneOrMore

2925import qualified Data.Set as Set

3026import qualified Data.Utf8 as Utf8

31−import Data.Word (Word64)

3227import qualified System.Directory as Dir

3328import System.FilePath ((</>), (<.>))

3429

35−import qualified AST.Canonical as Can

3630import qualified AST.Source as Src

3731import qualified AST.Optimized as Opt

38−import qualified BackgroundWriter as BW

3932import qualified Compile

4033import qualified Deps.Registry as Registry

4134import qualified Deps.Solver as Solver

4235import qualified Deps.Website as Website

4336import qualified Elm.Constraint as Con

44−import qualified Elm.Docs as Docs

4537import qualified Elm.Interface as I

4638import qualified Elm.Kernel as Kernel

4739import qualified Elm.ModuleName as ModuleName

@@ -51,7 +43,6 @@ import qualified Elm.Version as V

5143import qualified File

5244import qualified Http

5345import qualified Json.Decode as D

54−import qualified Json.Encode as E

5546import qualified Parse.Module as Parse

5647import qualified Reporting

5748import qualified Reporting.Annotation as A

@@ -68,42 +59,23 @@ data Details =

6859 Details

6960 { _outlineTime :: File.Time

7061 , _outline :: ValidOutline

71− , _buildID :: BuildID

7262 , _locals :: Map.Map ModuleName.Raw Local

7363 , _foreigns :: Map.Map ModuleName.Raw Foreign

7464 , _extras :: Extras

7565 }

7666

7767

78−type BuildID = Word64

68+data ValidOutline

69+ = ValidApp Outline.AppOutline

70+ | ValidPkg Outline.PkgOutline (Map.Map Pkg.Name V.Version)

7971

8072

81−data ValidOutline

82− = ValidApp (NE.List Outline.SrcDir)

83− | ValidPkg Pkg.Name [ModuleName.Raw] (Map.Map Pkg.Name V.Version {- for docs in reactor -})

84−

85−

86−-- NOTE: we need two ways to detect if a file must be recompiled:

87−--

88−-- (1) _time is the modification time from the last time we compiled the file.

89−-- By checking EQUALITY with the current modification time, we can detect file

90−-- saves and `git checkout` of previous versions. Both need a recompile.

91−--

92−-- (2) _lastChange is the BuildID from the last time a new interface file was

93−-- generated, and _lastCompile is the BuildID from the last time the file was

94−-- compiled. These may be different if a file is recompiled but the interface

95−-- stayed the same. When the _lastCompile is LESS THAN the _lastChange of any

96−-- imports, we need to recompile. This can happen when a project has multiple

97−-- entrypoints and some modules are compiled less often than their imports.

98−--

9973data Local =

10074 Local

10175 { _path :: FilePath

10276 , _time :: File.Time

10377 , _deps :: [ModuleName.Raw]

10478 , _main :: Bool

105− , _lastChange :: BuildID

106− , _lastCompile :: BuildID

10779 }

10880

10981

@@ -125,14 +97,14 @@ type Interfaces =

12597

12698

12799loadObjects :: FilePath -> Details -> IO (MVar (Maybe Opt.GlobalGraph))

128−loadObjects root (Details _ _ _ _ _ extras) =

100+loadObjects root (Details _ _ _ _ extras) =

129101 case extras of

130102 ArtifactsFresh _ o -> newMVar (Just o)

131103 ArtifactsCached -> fork (File.readBinary (Stuff.objects root))

132104

133105

134106loadInterfaces :: FilePath -> Details -> IO (MVar (Maybe Interfaces))

135−loadInterfaces root (Details _ _ _ _ _ extras) =

107+loadInterfaces root (Details _ _ _ _ extras) =

136108 case extras of

137109 ArtifactsFresh i _ -> newMVar (Just i)

138110 ArtifactsCached -> fork (File.readBinary (Stuff.interfaces root))

@@ -142,11 +114,11 @@ loadInterfaces root (Details _ _ _ _ _ extras) =

142114-- VERIFY INSTALL -- used by Install

143115

144116

145−verifyInstall :: BW.Scope -> FilePath -> Solver.Env -> Outline.Outline -> IO (Either Exit.Details ())

146−verifyInstall scope root (Solver.Env cache manager connection registry) outline =

117+verifyInstall :: FilePath -> Solver.Env -> Outline.Outline -> IO (Either Exit.Details ())

118+verifyInstall root (Solver.Env cache manager connection registry) outline =

147119 do time <- File.getTime (root </> "elm.json")

148120 let key = Reporting.ignorer

149− let env = Env key scope root cache manager connection registry

121+ let env = Env key root cache manager connection registry

150122 case outline of

151123 Outline.Pkg pkg -> Task.run (verifyPkg env time pkg >> return ())

152124 Outline.App app -> Task.run (verifyApp env time app >> return ())

@@ -156,28 +128,28 @@ verifyInstall scope root (Solver.Env cache manager connection registry) outline

156128-- LOAD -- used by Make, Repl, Reactor

157129

158130

159−load :: Reporting.Style -> BW.Scope -> FilePath -> IO (Either Exit.Details Details)

160−load style scope root =

131+load :: Reporting.Style -> FilePath -> IO (Either Exit.Details Details)

132+load style root =

161133 do newTime <- File.getTime (root </> "elm.json")

162134 maybeDetails <- File.readBinary (Stuff.details root)

163135 case maybeDetails of

164136 Nothing ->

165− generate style scope root newTime

137+ generate style root newTime

166138

167− Just details@(Details oldTime _ buildID _ _ _) ->

139+ Just details@(Details oldTime _ _ _ _) ->

168140 if oldTime == newTime

169− then return (Right details { _buildID = buildID + 1 })

170− else generate style scope root newTime

141+ then return (Right details)

142+ else generate style root newTime

171143

172144

173145

174146-- GENERATE

175147

176148

177−generate :: Reporting.Style -> BW.Scope -> FilePath -> File.Time -> IO (Either Exit.Details Details)

178−generate style scope root time =

149+generate :: Reporting.Style -> FilePath -> File.Time -> IO (Either Exit.Details Details)

150+generate style root time =

179151 Reporting.trackDetails style $ \key ->

180− do result <- initEnv key scope root

152+ do result <- initEnv key root

181153 case result of

182154 Left exit ->

183155 return (Left exit)

@@ -195,7 +167,6 @@ generate style scope root time =

195167data Env =

196168 Env

197169 { _key :: Reporting.DKey

198− , _scope :: BW.Scope

199170 , _root :: FilePath

200171 , _cache :: Stuff.PackageCache

201172 , _manager :: Http.Manager

@@ -204,8 +175,8 @@ data Env =

204175 }

205176

206177

207−initEnv :: Reporting.DKey -> BW.Scope -> FilePath -> IO (Either Exit.Details (Env, Outline.Outline))

208−initEnv key scope root =

178+initEnv :: Reporting.DKey -> FilePath -> IO (Either Exit.Details (Env, Outline.Outline))

179+initEnv key root =

209180 do mvar <- fork Solver.initEnv

210181 eitherOutline <- Outline.read root

211182 case eitherOutline of

@@ -219,7 +190,7 @@ initEnv key scope root =

219190 return $ Left $ Exit.DetailsCannotGetRegistry problem

220191

221192 Right (Solver.Env cache manager connection registry) ->

222− return $ Right (Env key scope root cache manager connection registry, outline)

193+ return $ Right (Env key root cache manager connection registry, outline)

223194

224195

225196

@@ -230,25 +201,24 @@ type Task a = Task.Task Exit.Details a

230201

231202

232203verifyPkg :: Env -> File.Time -> Outline.PkgOutline -> Task Details

233−verifyPkg env time (Outline.PkgOutline pkg _ _ _ exposed direct testDirect elm) =

204+verifyPkg env time outline@(Outline.PkgOutline _ _ _ _ _ direct testDirect elm) =

234205 if Con.goodElm elm

235206 then

236207 do solution <- verifyConstraints env =<< union noDups direct testDirect

237− let exposedList = Outline.flattenExposed exposed

238− let exactDeps = Map.map (\(Solver.Details v _) -> v) solution -- for pkg docs in reactor

239− verifyDependencies env time (ValidPkg pkg exposedList exactDeps) solution direct

208+ let vsns = Map.map (\(Solver.Details v _) -> v) solution

209+ verifyDependencies env time (ValidPkg outline vsns) solution direct

240210 else

241211 Task.throw $ Exit.DetailsBadElmInPkg elm

242212

243213

244214verifyApp :: Env -> File.Time -> Outline.AppOutline -> Task Details

245−verifyApp env time outline@(Outline.AppOutline elmVersion srcDirs direct _ _ _) =

215+verifyApp env time outline@(Outline.AppOutline elmVersion _ direct _ _ _) =

246216 if elmVersion == V.compiler

247217 then

248218 do stated <- checkAppDeps outline

249219 actual <- verifyConstraints env (Map.map Con.exactly stated)

250220 if Map.size stated == Map.size actual

251− then verifyDependencies env time (ValidApp srcDirs) actual direct

221+ then verifyDependencies env time (ValidApp outline) actual direct

252222 else Task.throw $ Exit.DetailsHandEditedDependencies

253223 else

254224 Task.throw $ Exit.DetailsBadElmInAppOutline elmVersion

@@ -266,7 +236,7 @@ checkAppDeps (Outline.AppOutline _ _ direct indirect testDirect testIndirect) =

266236

267237

268238verifyConstraints :: Env -> Map.Map Pkg.Name Con.Constraint -> Task (Map.Map Pkg.Name Solver.Details)

269−verifyConstraints (Env _ _ _ cache _ connection registry) constraints =

239+verifyConstraints (Env _ _ cache _ connection registry) constraints =

270240 do result <- Task.io $ Solver.verify cache connection registry constraints

271241 case result of

272242 Solver.Ok details -> return details

@@ -312,30 +282,27 @@ fork work =

312282

313283

314284verifyDependencies :: Env -> File.Time -> ValidOutline -> Map.Map Pkg.Name Solver.Details -> Map.Map Pkg.Name a -> Task Details

315−verifyDependencies env@(Env key scope root cache _ _ _) time outline solution directDeps =

285+verifyDependencies env@(Env key root _ _ _ _) time outline solution directDeps =

316286 Task.eio id $

317287 do Reporting.report key (Reporting.DStart (Map.size solution))

318288 mvar <- newEmptyMVar

319− mvars <- Stuff.withRegistryLock cache $

320− Map.traverseWithKey (\k v -> fork (verifyDep env mvar solution k v)) solution

289+ mvars <- Map.traverseWithKey (\k v -> fork (verifyDep env mvar solution k v)) solution

321290 putMVar mvar mvars

322291 deps <- traverse readMVar mvars

323292 case sequence deps of

324− Left _ ->

325− do home <- Stuff.getElmHome

326− return $ Left $ Exit.DetailsBadDeps home $

327− Maybe.catMaybes $ Either.lefts $ Map.elems deps

293+ Left problem ->

294+ error "TODO verifyDependencies" problem

328295

329296 Right artifacts ->

330297 let

331298 objs = Map.foldr addObjects Opt.empty artifacts

332299 ifaces = Map.foldrWithKey (addInterfaces directDeps) Map.empty artifacts

333− foreigns = Map.map (OneOrMore.destruct Foreign) $ Map.foldrWithKey gatherForeigns Map.empty $ Map.intersection artifacts directDeps

334− details = Details time outline 0 Map.empty foreigns (ArtifactsFresh ifaces objs)

300+ foreigns = Map.map (OneOrMore.destruct Foreign) $ Map.foldrWithKey gatherForeigns Map.empty artifacts

301+ details = Details time outline Map.empty foreigns (ArtifactsFresh ifaces objs)

335302 in

336− do BW.writeBinary scope (Stuff.objects root) objs

337− BW.writeBinary scope (Stuff.interfaces root) ifaces

338− BW.writeBinary scope (Stuff.details root) details

303+ do File.writeBinary (Stuff.objects root) objs

304+ File.writeBinary (Stuff.interfaces root) ifaces

305+ File.writeBinary (Stuff.details root) details

339306 return (Right details)

340307

341308

@@ -375,36 +342,44 @@ data Artifacts =

375342

376343

377344type Dep =

378− Either (Maybe Exit.DetailsBadDep) Artifacts

345+ Either Problem Artifacts

346+

347+

348+data Problem

349+ = BadDownload Exit.PackageProblem

350+ | BadBuild

351+ | BadDependency

379352

380353

381354verifyDep :: Env -> MVar (Map.Map Pkg.Name (MVar Dep)) -> Map.Map Pkg.Name Solver.Details -> Pkg.Name -> Solver.Details -> IO Dep

382−verifyDep (Env key _ _ cache manager _ _) depsMVar solution pkg details@(Solver.Details vsn directDeps) =

383− do let fingerprint = Map.intersectionWith (\(Solver.Details v _) _ -> v) solution directDeps

384− exists <- Dir.doesDirectoryExist (Stuff.package cache pkg vsn </> "src")

355+verifyDep (Env key _ cache manager _ _) depsMVar solution pkg details@(Solver.Details vsn directDeps) =

356+ let

357+ fingerprint = Map.intersectionWith (\(Solver.Details v _) _ -> v) solution directDeps

358+ in

359+ do exists <- Dir.doesDirectoryExist (Stuff.package cache pkg vsn </> "src")

385360 if exists

386361 then

387362 do Reporting.report key Reporting.DCached

388363 maybeCache <- File.readBinary (Stuff.package cache pkg vsn </> "artifacts.dat")

389364 case maybeCache of

390365 Nothing ->

391− build key cache depsMVar pkg details fingerprint Set.empty

366+ build key cache depsMVar pkg details (Set.singleton fingerprint)

392367

393368 Just (ArtifactCache fingerprints artifacts) ->

394369 if Set.member fingerprint fingerprints

395370 then Reporting.report key Reporting.DBuilt >> return (Right artifacts)

396− else build key cache depsMVar pkg details fingerprint fingerprints

371+ else build key cache depsMVar pkg details (Set.insert fingerprint fingerprints)

397372 else

398373 do Reporting.report key Reporting.DRequested

399374 result <- downloadPackage cache manager pkg vsn

400375 case result of

401− Left problem ->

376+ Left p ->

402377 do Reporting.report key (Reporting.DFailed pkg vsn)

403− return $ Left $ Just $ Exit.BD_BadDownload pkg vsn problem

378+ return (Left (BadDownload p))

404379

405380 Right () ->

406381 do Reporting.report key (Reporting.DReceived pkg vsn)

407− build key cache depsMVar pkg details fingerprint Set.empty

382+ build key cache depsMVar pkg details (Set.singleton fingerprint)

408383

409384

410385

@@ -426,17 +401,17 @@ type Fingerprint =

426401-- BUILD

427402

428403

429−build :: Reporting.DKey -> Stuff.PackageCache -> MVar (Map.Map Pkg.Name (MVar Dep)) -> Pkg.Name -> Solver.Details -> Fingerprint -> Set.Set Fingerprint -> IO Dep

430−build key cache depsMVar pkg (Solver.Details vsn _) f fs =

404+build :: Reporting.DKey -> Stuff.PackageCache -> MVar (Map.Map Pkg.Name (MVar Dep)) -> Pkg.Name -> Solver.Details -> Set.Set Fingerprint -> IO Dep

405+build key cache depsMVar pkg (Solver.Details vsn _) fingerprints =

431406 do eitherOutline <- Outline.read (Stuff.package cache pkg vsn)

432407 case eitherOutline of

433408 Left _ ->

434409 do Reporting.report key Reporting.DBroken

435− return $ Left $ Just $ Exit.BD_BadBuild pkg vsn f

410+ return (Left BadBuild)

436411

437412 Right (Outline.App _) ->

438413 do Reporting.report key Reporting.DBroken

439− return $ Left $ Just $ Exit.BD_BadBuild pkg vsn f

414+ return (Left BadBuild)

440415

441416 Right (Outline.Pkg (Outline.PkgOutline _ _ _ _ exposed deps _ _)) ->

442417 do allDeps <- readMVar depsMVar

@@ -444,22 +419,21 @@ build key cache depsMVar pkg (Solver.Details vsn _) f fs =

444419 case sequence directDeps of

445420 Left _ ->

446421 do Reporting.report key Reporting.DBroken

447− return $ Left $ Nothing

422+ return (Left BadDependency)

448423

449424 Right directArtifacts ->

450425 do let src = Stuff.package cache pkg vsn </> "src"

451426 let foreignDeps = gatherForeignInterfaces directArtifacts

452427 let exposedDict = Map.fromKeys (\_ -> ()) (Outline.flattenExposed exposed)

453− docsStatus <- getDocsStatus cache pkg vsn

454428 mvar <- newEmptyMVar

455− mvars <- Map.traverseWithKey (const . fork . crawlModule foreignDeps mvar pkg src docsStatus) exposedDict

429+ mvars <- Map.traverseWithKey (const . fork . crawlModule foreignDeps mvar pkg src) exposedDict

456430 putMVar mvar mvars

457431 mapM_ readMVar mvars

458432 maybeStatuses <- traverse readMVar =<< readMVar mvar

459433 case sequence maybeStatuses of

460434 Nothing ->

461435 do Reporting.report key Reporting.DBroken

462− return $ Left $ Just $ Exit.BD_BadBuild pkg vsn f

436+ return (Left BadBuild)

463437

464438 Just statuses ->

465439 do rmvar <- newEmptyMVar

@@ -469,7 +443,7 @@ build key cache depsMVar pkg (Solver.Details vsn _) f fs =

469443 case sequence maybeResults of

470444 Nothing ->

471445 do Reporting.report key Reporting.DBroken

472− return $ Left $ Just $ Exit.BD_BadBuild pkg vsn f

446+ return (Left BadBuild)

473447

474448 Just results ->

475449 let

@@ -477,10 +451,8 @@ build key cache depsMVar pkg (Solver.Details vsn _) f fs =

477451 ifaces = gatherInterfaces exposedDict results

478452 objects = gatherObjects results

479453 artifacts = Artifacts ifaces objects

480− fingerprints = Set.insert f fs

481454 in

482− do writeDocs cache pkg vsn docsStatus results

483− File.writeBinary path (ArtifactCache fingerprints artifacts)

455+ do File.writeBinary path (ArtifactCache fingerprints artifacts)

484456 Reporting.report key Reporting.DBuilt

485457 return (Right artifacts)

486458

@@ -497,7 +469,7 @@ gatherObjects results =

497469addLocalGraph :: ModuleName.Raw -> Result -> Opt.GlobalGraph -> Opt.GlobalGraph

498470addLocalGraph name status graph =

499471 case status of

500− RLocal _ objs _ -> Opt.addLocalGraph objs graph

472+ RLocal _ objs -> Opt.addLocalGraph objs graph

501473 RForeign _ -> graph

502474 RKernelLocal cs -> Opt.addKernel (Name.getKernel name) cs graph

503475 RKernelForeign -> graph

@@ -516,10 +488,10 @@ gatherInterfaces exposed artifacts =

516488toLocalInterface :: (I.Interface -> a) -> Result -> Maybe a

517489toLocalInterface func result =

518490 case result of

519− RLocal iface _ _ -> Just (func iface)

520− RForeign _ -> Nothing

521− RKernelLocal _ -> Nothing

522− RKernelForeign -> Nothing

491+ RLocal iface _ -> Just (func iface)

492+ RForeign _ -> Nothing

493+ RKernelLocal _ -> Nothing

494+ RKernelForeign -> Nothing

523495

524496

525497

@@ -562,14 +534,14 @@ type StatusDict =

562534

563535

564536data Status

565− = SLocal DocsStatus (Map.Map ModuleName.Raw ()) Src.Module

537+ = SLocal (Map.Map ModuleName.Raw ()) Src.Module

566538 | SForeign I.Interface

567539 | SKernelLocal [Kernel.Chunk]

568540 | SKernelForeign

569541

570542

571−crawlModule :: Map.Map ModuleName.Raw ForeignInterface -> MVar StatusDict -> Pkg.Name -> FilePath -> DocsStatus -> ModuleName.Raw -> IO (Maybe Status)

572−crawlModule foreignDeps mvar pkg src docsStatus name =

543+crawlModule :: Map.Map ModuleName.Raw ForeignInterface -> MVar StatusDict -> Pkg.Name -> FilePath -> ModuleName.Raw -> IO (Maybe Status)

544+crawlModule foreignDeps mvar pkg src name =

573545 do let path = src </> ModuleName.toFilePath name <.> "elm"

574546 exists <- File.exists path

575547 case Map.lookup name foreignDeps of

@@ -583,7 +555,7 @@ crawlModule foreignDeps mvar pkg src docsStatus name =

583555

584556 Nothing ->

585557 if exists then

586− crawlFile foreignDeps mvar pkg src docsStatus name path

558+ crawlFile foreignDeps mvar pkg src name path

587559

588560 else if Pkg.isKernel pkg && Name.isKernel name then

589561 crawlKernel foreignDeps mvar pkg src name

@@ -592,13 +564,13 @@ crawlModule foreignDeps mvar pkg src docsStatus name =

592564 return Nothing

593565

594566

595−crawlFile :: Map.Map ModuleName.Raw ForeignInterface -> MVar StatusDict -> Pkg.Name -> FilePath -> DocsStatus -> ModuleName.Raw -> FilePath -> IO (Maybe Status)

596−crawlFile foreignDeps mvar pkg src docsStatus expectedName path =

567+crawlFile :: Map.Map ModuleName.Raw ForeignInterface -> MVar StatusDict -> Pkg.Name -> FilePath -> ModuleName.Raw -> FilePath -> IO (Maybe Status)

568+crawlFile foreignDeps mvar pkg src expectedName path =

597569 do bytes <- File.readUtf8 path

598− case Parse.fromByteString (Parse.Package pkg) bytes of

570+ case Parse.fromByteString pkg bytes of

599571 Right modul@(Src.Module (Just (A.At _ actualName)) _ _ imports _ _ _ _ _) | expectedName == actualName ->

600572 do deps <- crawlImports foreignDeps mvar pkg src imports

601− return (Just (SLocal docsStatus deps modul))

573+ return (Just (SLocal deps modul))

602574

603575 _ ->

604576 return Nothing

@@ -609,7 +581,7 @@ crawlImports foreignDeps mvar pkg src imports =

609581 do statusDict <- takeMVar mvar

610582 let deps = Map.fromList (map (\i -> (Src.getImportName i, ())) imports)

611583 let news = Map.difference deps statusDict

612− mvars <- Map.traverseWithKey (const . fork . crawlModule foreignDeps mvar pkg src DocsNotNeeded) news

584+ mvars <- Map.traverseWithKey (const . fork . crawlModule foreignDeps mvar pkg src) news

613585 putMVar mvar (Map.union mvars statusDict)

614586 mapM_ readMVar mvars

615587 return deps

@@ -645,7 +617,7 @@ getDepHome fi =

645617

646618

647619data Result

648− = RLocal !I.Interface !Opt.LocalGraph (Maybe Docs.Module)

620+ = RLocal !I.Interface !Opt.LocalGraph

649621 | RForeign I.Interface

650622 | RKernelLocal [Kernel.Chunk]

651623 | RKernelForeign

@@ -654,7 +626,7 @@ data Result

654626compile :: Pkg.Name -> MVar (Map.Map ModuleName.Raw (MVar (Maybe Result))) -> Status -> IO (Maybe Result)

655627compile pkg mvar status =

656628 case status of

657− SLocal docsStatus deps modul ->

629+ SLocal deps modul ->

658630 do resultsDict <- readMVar mvar

659631 maybeResults <- traverse readMVar (Map.intersection resultsDict deps)

660632 case sequence maybeResults of

@@ -667,11 +639,7 @@ compile pkg mvar status =

667639 return Nothing

668640

669641 Right (Compile.Artifacts canonical annotations objects) ->

670− let

671− ifaces = I.fromModule pkg canonical annotations

672− docs = makeDocs docsStatus canonical

673− in

674− return (Just (RLocal ifaces objects docs))

642+ return (Just (RLocal (I.fromModule pkg canonical annotations) objects))

675643

676644 SForeign iface ->

677645 return (Just (RForeign iface))

@@ -686,59 +654,10 @@ compile pkg mvar status =

686654getInterface :: Result -> Maybe I.Interface

687655getInterface result =

688656 case result of

689− RLocal iface _ _ -> Just iface

690− RForeign iface -> Just iface

691− RKernelLocal _ -> Nothing

692− RKernelForeign -> Nothing

693−

694−

695−

696−-- MAKE DOCS

697−

698−

699−data DocsStatus

700− = DocsNeeded

701− | DocsNotNeeded

702−

703−

704−getDocsStatus :: Stuff.PackageCache -> Pkg.Name -> V.Version -> IO DocsStatus

705−getDocsStatus cache pkg vsn =

706− do exists <- File.exists (Stuff.package cache pkg vsn </> "docs.json")

707− if exists

708− then return DocsNotNeeded

709− else return DocsNeeded

710−

711−

712−makeDocs :: DocsStatus -> Can.Module -> Maybe Docs.Module

713−makeDocs status modul =

714− case status of

715− DocsNeeded ->

716− case Docs.fromModule modul of

717− Right docs -> Just docs

718− Left _ -> Nothing

719−

720− DocsNotNeeded ->

721− Nothing

722−

723−

724−writeDocs :: Stuff.PackageCache -> Pkg.Name -> V.Version -> DocsStatus -> Map.Map ModuleName.Raw Result -> IO ()

725−writeDocs cache pkg vsn status results =

726− case status of

727− DocsNeeded ->

728− E.writeUgly (Stuff.package cache pkg vsn </> "docs.json") $

729− Docs.encode $ Map.mapMaybe toDocs results

730−

731− DocsNotNeeded ->

732− return ()

733−

734−

735−toDocs :: Result -> Maybe Docs.Module

736−toDocs result =

737− case result of

738− RLocal _ _ docs -> docs

739− RForeign _ -> Nothing

740− RKernelLocal _ -> Nothing

741− RKernelForeign -> Nothing

657+ RLocal iface _ -> Just iface

658+ RForeign iface -> Just iface

659+ RKernelLocal _ -> Nothing

660+ RKernelForeign -> Nothing

742661

743662

744663

@@ -747,27 +666,24 @@ toDocs result =

747666

748667downloadPackage :: Stuff.PackageCache -> Http.Manager -> Pkg.Name -> V.Version -> IO (Either Exit.PackageProblem ())

749668downloadPackage cache manager pkg vsn =

750− let

751− url = Website.metadata pkg vsn "endpoint.json"

752− in

753669 do eitherByteString <-

754− Http.get manager url [] id (return . Right)

670+ Http.get manager (Website.metadata pkg vsn "endpoint.json") [] id (return . Right)

755671

756672 case eitherByteString of

757673 Left err ->

758− return $ Left $ Exit.PP_BadEndpointRequest err

674+ return (Left (Exit.PP_BadEndpointRequest err))

759675

760676 Right byteString ->

761677 case D.fromByteString endpointDecoder byteString of

762678 Left _ ->

763− return $ Left $ Exit.PP_BadEndpointContent url

679+ return (Left Exit.PP_BadEndpointContent)

764680

765681 Right (endpoint, expectedHash) ->

766− Http.getArchive manager endpoint Exit.PP_BadArchiveRequest (Exit.PP_BadArchiveContent endpoint) $

682+ Http.getArchive manager endpoint Exit.PP_BadArchiveRequest Exit.PP_BadArchiveContent $

767683 \(sha, archive) ->

768684 if expectedHash == Http.shaToChars sha

769685 then Right <$> File.writePackage (Stuff.package cache pkg vsn) archive

770− else return $ Left $ Exit.PP_BadArchiveHash endpoint expectedHash (Http.shaToChars sha)

686+ else return $ Left $ Exit.PP_BadArchiveHash expectedHash (Http.shaToChars sha)

771687

772688

773689endpointDecoder :: D.Decoder e (String, String)

@@ -782,40 +698,27 @@ endpointDecoder =

782698

783699

784700instance Binary Details where

785− put (Details a b c d e _) = put a >> put b >> put c >> put d >> put e

786− get =

787− do a <- get

788− b <- get

789− c <- get

790− d <- get

791− e <- get

792− return (Details a b c d e ArtifactsCached)

701+ get = do { a <- get; b <- get; c <- get; d <- get; return (Details a b c d ArtifactsCached) }

702+ put (Details a b c d _) = put a >> put b >> put c >> put d

793703

794704

795705instance Binary ValidOutline where

796706 put outline =

797707 case outline of

798− ValidApp a -> putWord8 0 >> put a

799− ValidPkg a b c -> putWord8 1 >> put a >> put b >> put c

708+ ValidApp a -> putWord8 0 >> put a

709+ ValidPkg a b -> putWord8 1 >> put a >> put b

800710

801711 get =

802712 do n <- getWord8

803713 case n of

804714 0 -> liftM ValidApp get

805− 1 -> liftM3 ValidPkg get get get

806− _ -> fail "binary encoding of ValidOutline was corrupted"

715+ 1 -> liftM2 ValidPkg get get

716+ _ -> error "binary encoding of ValidOutline was corrupted"

807717

808718

809719instance Binary Local where

810− put (Local a b c d e f) = put a >> put b >> put c >> put d >> put e >> put f

811− get =

812− do a <- get

813− b <- get

814− c <- get

815− d <- get

816− e <- get

817− f <- get

818− return (Local a b c d e f)

720+ get = liftM4 Local get get get get

721+ put (Local a b c d) = put a >> put b >> put c >> put d

819722

820723

821724instance Binary Foreign where

builder/src/Elm/Diff.hsnew file+284

@@ -0,0 +1,284 @@

1+{-# OPTIONS_GHC -Wall #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+module Elm.Diff

4+ ( Args(..)

5+ , diff

6+ )

7+ where

8+

9+

10+import Control.Monad.Except (liftIO)

11+import qualified Data.List as List

12+import qualified Data.Map as Map

13+import qualified Data.Maybe as Maybe

14+import qualified Data.Name as Name

15+

16+import qualified Deps.Cache as Cache

17+import Deps.Diff (PackageChanges(..), ModuleChanges(..), Changes(..), Magnitude(..))

18+import qualified Deps.Diff as Diff

19+import qualified Elm.Compiler.Type as Type

20+import qualified Elm.Docs as Docs

21+import qualified Elm.ModuleName as ModuleName

22+import qualified Elm.Package as Pkg

23+import qualified Elm.Project as Project

24+import qualified Elm.Project.Json as Project

25+import qualified Elm.Project.Summary as Summary

26+import qualified Elm.Version as V

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

28+import qualified Reporting.Doc as D

29+import qualified Reporting.Exit as Exit

30+import qualified Reporting.Exit.Diff as E

31+import qualified Reporting.Exit.Help as Help

32+import qualified Reporting.Render.Type.Localizer as L

33+import qualified Reporting.Task as Task

34+

35+

36+

37+-- DIFF

38+

39+

40+data Args

41+ = CodeVsLatest

42+ | CodeVsExactly V.Version

43+ | LocalInquiry V.Version V.Version

44+ | GlobalInquiry Pkg.Name V.Version V.Version

45+

46+

47+diff :: Args -> Task.Task ()

48+diff args =

49+ case args of

50+ GlobalInquiry name v1 v2 ->

51+ do registry <- Cache.mandatoryUpdate

52+ case Cache.getVersions name registry of

53+ Left suggestions ->

54+ throw $ E.UnknownPackage name suggestions

55+

56+ Right vsns ->

57+ do oldDocs <- getDocs name vsns (min v1 v2)

58+ newDocs <- getDocs name vsns (max v1 v2)

59+ writeDiff oldDocs newDocs

60+

61+ LocalInquiry v1 v2 ->

62+ do (_, name, vsns) <- getPackageInfo

63+ oldDocs <- getDocs name vsns (min v1 v2)

64+ newDocs <- getDocs name vsns (max v1 v2)

65+ writeDiff oldDocs newDocs

66+

67+ CodeVsLatest ->

68+ do (summary, name, vsns) <- getPackageInfo

69+ oldDocs <- getDocs name vsns (maximum vsns)

70+ newDocs <- Task.silently (error "TODO Project.generateDocs summary" summary)

71+ writeDiff oldDocs newDocs

72+

73+ CodeVsExactly version ->

74+ do (summary, name, vsns) <- getPackageInfo

75+ oldDocs <- getDocs name vsns version

76+ newDocs <- Task.silently (error "TODO Project.generateDocs summary" summary)

77+ writeDiff oldDocs newDocs

78+

79+

80+throw :: E.Exit -> Task.Task a

81+throw exit =

82+ Task.throw $ Exit.Diff exit

83+

84+

85+

86+-- DIFF HELPERS

87+

88+

89+getDocs :: Pkg.Name -> [V.Version] -> V.Version -> Task.Task Docs.Documentation

90+getDocs name allVersions version =

91+ if elem version allVersions then

92+ Cache.getDocs name version

93+ else

94+ throw $ E.UnknownVersion name version allVersions

95+

96+

97+getPackageInfo :: Task.Task (Summary.Summary, Pkg.Name, [V.Version])

98+getPackageInfo =

99+ do summary <- Project.getRoot

100+ case Summary._project summary of

101+ Project.App _ ->

102+ throw $ E.Application

103+

104+ Project.Pkg (Project.PkgInfo name _ _ _ _ _ _ _) ->

105+ do registry <- Cache.mandatoryUpdate

106+ case Cache.getVersions name registry of

107+ Right vsns ->

108+ return ( summary, name, vsns )

109+

110+ Left _ ->

111+ throw E.Unpublished

112+

113+

114+

115+-- WRITE DOC

116+

117+

118+writeDiff :: Docs.Documentation -> Docs.Documentation -> Task.Task ()

119+writeDiff oldDocs newDocs =

120+ let

121+ changes = Diff.diff oldDocs newDocs

122+ localizer = L.fromNames (Map.union oldDocs newDocs)

123+ in

124+ liftIO $ Help.toStdout (toDoc localizer changes <> "\n")

125+

126+

127+

128+-- TO DOC

129+

130+

131+toDoc :: L.Localizer -> PackageChanges -> D.Doc

132+toDoc localizer changes@(PackageChanges added changed removed) =

133+ if null added && Map.null changed && null removed then

134+ "No API changes detected, so this is a" <+> D.green "PATCH" <+> "change."

135+ else

136+ let

137+ magDoc =

138+ D.fromChars (Diff.magnitudeToString (Diff.toMagnitude changes))

139+

140+ header =

141+ "This is a" <+> D.green magDoc <+> "change."

142+

143+ addedChunk =

144+ if null added then [] else

145+ [ Chunk "ADDED MODULES" MINOR $

146+ D.vcat $ map (D.fromUtf8 . ModuleName.nameToString) added

147+ ]

148+

149+ removedChunk =

150+ if null removed then [] else

151+ [ Chunk "REMOVED MODULES" MAJOR $

152+ D.vcat $ map (D.fromUtf8 . ModuleName.nameToString) removed

153+ ]

154+

155+ chunks =

156+ addedChunk ++ removedChunk ++ map (changesToChunk localizer) (Map.toList changed)

157+ in

158+ D.vcat (header : "" : map chunkToDoc chunks)

159+

160+

161+data Chunk =

162+ Chunk

163+ { _title :: String

164+ , _magnitude :: Magnitude

165+ , _details :: D.Doc

166+ }

167+

168+

169+chunkToDoc :: Chunk -> D.Doc

170+chunkToDoc (Chunk title magnitude details) =

171+ let

172+ magDoc =

173+ Diff.magnitudeToString magnitude

174+

175+ header =

176+ "----" <+> D.fromChars title <+> "-" <+> D.fromChars magDoc <+> "----"

177+ in

178+ D.vcat

179+ [ D.dullcyan header

180+ , ""

181+ , D.indent 4 details

182+ , ""

183+ , ""

184+ ]

185+

186+

187+changesToChunk :: L.Localizer -> (Name.Name, ModuleChanges) -> Chunk

188+changesToChunk localizer (name, changes@(ModuleChanges unions aliases values binops)) =

189+ let

190+ magnitude =

191+ Diff.moduleChangeMagnitude changes

192+

193+ (unionAdd, unionChange, unionRemove) =

194+ changesToDocTriple (unionToDoc localizer) unions

195+

196+ (aliasAdd, aliasChange, aliasRemove) =

197+ changesToDocTriple (aliasToDoc localizer) aliases

198+

199+ (valueAdd, valueChange, valueRemove) =

200+ changesToDocTriple (valueToDoc localizer) values

201+

202+ (binopAdd, binopChange, binopRemove) =

203+ changesToDocTriple (binopToDoc localizer) binops

204+ in

205+ Chunk (Name.toChars name) magnitude $

206+ D.vcat $ List.intersperse "" $ Maybe.catMaybes $

207+ [ changesToDoc "Added" unionAdd aliasAdd valueAdd binopAdd

208+ , changesToDoc "Removed" unionRemove aliasRemove valueRemove binopRemove

209+ , changesToDoc "Changed" unionChange aliasChange valueChange binopChange

210+ ]

211+

212+

213+changesToDocTriple :: (k -> v -> D.Doc) -> Changes k v -> ([D.Doc], [D.Doc], [D.Doc])

214+changesToDocTriple entryToDoc (Changes added changed removed) =

215+ let

216+ indented (name, value) =

217+ D.indent 4 (entryToDoc name value)

218+

219+ diffed (name, (oldValue, newValue)) =

220+ D.vcat

221+ [ " - " <> entryToDoc name oldValue

222+ , " + " <> entryToDoc name newValue

223+ , ""

224+ ]

225+ in

226+ ( map indented (Map.toList added)

227+ , map diffed (Map.toList changed)

228+ , map indented (Map.toList removed)

229+ )

230+

231+

232+changesToDoc :: String -> [D.Doc] -> [D.Doc] -> [D.Doc] -> [D.Doc] -> Maybe D.Doc

233+changesToDoc categoryName unions aliases values binops =

234+ if null unions && null aliases && null values && null binops then

235+ Nothing

236+

237+ else

238+ Just $ D.vcat $

239+ D.fromChars categoryName <> ":" : unions ++ aliases ++ binops ++ values

240+

241+

242+unionToDoc :: L.Localizer -> Name.Name -> Docs.Union -> D.Doc

243+unionToDoc localizer name (Docs.Union _ tvars ctors) =

244+ let

245+ setup =

246+ "type" <+> D.fromName name <+> D.hsep (map D.fromName tvars)

247+

248+ ctorDoc (ctor, tipes) =

249+ typeDoc localizer (Type.Type ctor tipes)

250+ in

251+ D.hang 4 (D.sep (setup : zipWith (<+>) ("=" : repeat "|") (map ctorDoc ctors)))

252+

253+

254+aliasToDoc :: L.Localizer -> Name.Name -> Docs.Alias -> D.Doc

255+aliasToDoc localizer name (Docs.Alias _ tvars tipe) =

256+ let

257+ declaration =

258+ "type" <+> "alias" <+> D.hsep (map D.fromName (name:tvars)) <+> "="

259+ in

260+ D.hang 4 (D.sep [ declaration, typeDoc localizer tipe ])

261+

262+

263+valueToDoc :: L.Localizer -> Name.Name -> Docs.Value -> D.Doc

264+valueToDoc localizer name (Docs.Value _ tipe) =

265+ D.hang 4 $ D.sep [ D.fromName name <+> ":", typeDoc localizer tipe ]

266+

267+

268+binopToDoc :: L.Localizer -> Name.Name -> Docs.Binop -> D.Doc

269+binopToDoc localizer name (Docs.Binop _ tipe associativity (Docs.Precedence n)) =

270+ "(" <> D.fromName name <> ")" <+> ":" <+> typeDoc localizer tipe <> D.black details

271+ where

272+ details =

273+ " (" <> D.fromName assoc <> "/" <> D.fromInt n <> ")"

274+

275+ assoc =

276+ case associativity of

277+ Docs.Left -> "left"

278+ Docs.Non -> "non"

279+ Docs.Right -> "right"

280+

281+

282+typeDoc :: L.Localizer -> Type.Type -> D.Doc

283+typeDoc localizer tipe =

284+ Type.toDoc localizer Type.None tipe

builder/src/Elm/Outline.hs+117−146

@@ -1,11 +1,10 @@

11{-# OPTIONS_GHC -Wall #-}

2−{-# LANGUAGE MultiWayIf, OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

33module Elm.Outline

44 ( Outline(..)

55 , AppOutline(..)

66 , PkgOutline(..)

77 , Exposed(..)

8− , SrcDir(..)

98 , read

109 , write

1110 , encode

@@ -19,12 +18,11 @@ module Elm.Outline

1918import Prelude hiding (read)

2019import Control.Monad (filterM, liftM)

2120import Data.Binary (Binary, get, put, getWord8, putWord8)

21+import Data.Foldable (traverse_)

2222import qualified Data.Map as Map

2323import qualified Data.NonEmptyList as NE

24−import qualified Data.OneOrMore as OneOrMore

25−import Foreign.Ptr (minusPtr)

24+import qualified Data.Utf8 as Utf8

2625import qualified System.Directory as Dir

27−import qualified System.FilePath as FP

2826import System.FilePath ((</>))

2927

3028import qualified Elm.Constraint as Con

@@ -35,9 +33,6 @@ import qualified Elm.Version as V

3533import qualified File

3634import qualified Json.Decode as D

3735import qualified Json.Encode as E

38−import Json.Encode ((==>))

39−import qualified Json.String as Json

40−import qualified Parse.Primitives as P

4136import qualified Reporting.Exit as Exit

4237

4338

@@ -53,7 +48,7 @@ data Outline

5348data AppOutline =

5449 AppOutline

5550 { _app_elm_version :: V.Version

56− , _app_source_dirs :: NE.List SrcDir

51+ , _app_source_dirs :: NE.List FilePath

5752 , _app_deps_direct :: Map.Map Pkg.Name V.Version

5853 , _app_deps_indirect :: Map.Map Pkg.Name V.Version

5954 , _app_test_direct :: Map.Map Pkg.Name V.Version

@@ -64,7 +59,7 @@ data AppOutline =

6459data PkgOutline =

6560 PkgOutline

6661 { _pkg_name :: Pkg.Name

67− , _pkg_summary :: Json.String

62+ , _pkg_summary :: Utf8.String

6863 , _pkg_license :: Licenses.License

6964 , _pkg_version :: V.Version

7065 , _pkg_exposed :: Exposed

@@ -76,21 +71,16 @@ data PkgOutline =

7671

7772data Exposed

7873 = ExposedList [ModuleName.Raw]

79− | ExposedDict [(Json.String, [ModuleName.Raw])]

80−

81−

82−data SrcDir

83− = AbsoluteSrcDir FilePath

84− | RelativeSrcDir FilePath

74+ | ExposedDict [(Utf8.String, [ModuleName.Raw])]

8575

8676

8777

8878-- DEFAULTS

8979

9080

91−defaultSummary :: Json.String

81+defaultSummary :: Utf8.String

9282defaultSummary =

93− Json.fromChars "helpful summary of your project, less than 80 characters"

83+ "helpful summary of your project, less than 80 characters"

9484

9585

9686

@@ -125,8 +115,8 @@ encode outline =

125115 case outline of

126116 App (AppOutline elm srcDirs depsDirect depsTrans testDirect testTrans) ->

127117 E.object

128− [ "type" ==> E.chars "application"

129− , "source-directories" ==> E.list encodeSrcDir (NE.toList srcDirs)

118+ [ "type" ==> E.string "application"

119+ , "source-directories" ==> E.list (E.string . Utf8.fromChars) (NE.toList srcDirs)

130120 , "elm-version" ==> V.encode elm

131121 , "dependencies" ==>

132122 E.object

@@ -142,7 +132,7 @@ encode outline =

142132

143133 Pkg (PkgOutline name summary license version exposed deps tests elm) ->

144134 E.object

145− [ "type" ==> E.string (Json.fromChars "package")

135+ [ "type" ==> E.string "package"

146136 , "name" ==> Pkg.encode name

147137 , "summary" ==> E.string summary

148138 , "license" ==> Licenses.encode license

@@ -154,6 +144,11 @@ encode outline =

154144 ]

155145

156146

147+(==>) :: a -> b -> (a, b)

148+(==>) a b =

149+ (a, b)

150+

151+

157152encodeExposed :: Exposed -> E.Value

158153encodeExposed exposed =

159154 case exposed of

@@ -171,14 +166,7 @@ encodeModule name =

171166

172167encodeDeps :: (a -> E.Value) -> Map.Map Pkg.Name a -> E.Value

173168encodeDeps encodeValue deps =

174− E.dict Pkg.toJsonString encodeValue deps

175−

176−

177−encodeSrcDir :: SrcDir -> E.Value

178−encodeSrcDir srcDir =

179− case srcDir of

180− AbsoluteSrcDir dir -> E.chars dir

181− RelativeSrcDir dir -> E.chars dir

169+ E.dict Pkg.toString encodeValue deps

182170

183171

184172

@@ -194,72 +182,19 @@ read root =

194182

195183 Right outline ->

196184 case outline of

197− Pkg (PkgOutline pkg _ _ _ _ deps _ _) ->

198− return $

199− if Map.notMember Pkg.core deps && pkg /= Pkg.core

200− then Left Exit.OutlineNoPkgCore

201− else Right outline

202−

203− App (AppOutline _ srcDirs direct indirect _ _)

204− | Map.notMember Pkg.core direct ->

205− return $ Left Exit.OutlineNoAppCore

206−

207− | Map.notMember Pkg.json direct && Map.notMember Pkg.json indirect ->

208− return $ Left Exit.OutlineNoAppJson

209−

210− | otherwise ->

211− do badDirs <- filterM (isSrcDirMissing root) (NE.toList srcDirs)

212− case map toGiven badDirs of

213− d:ds ->

214− return $ Left (Exit.OutlineHasMissingSrcDirs d ds)

215−

216− [] ->

217− do maybeDups <- detectDuplicates root (NE.toList srcDirs)

218− case maybeDups of

219− Nothing ->

220− return $ Right outline

221−

222− Just (canonicalDir, (dir1,dir2)) ->

223− return $ Left (Exit.OutlineHasDuplicateSrcDirs canonicalDir dir1 dir2)

185+ Pkg _ ->

186+ return $ Right outline

224187

188+ App (AppOutline _ srcDirs _ _ _ _) ->

189+ do badDirs <- filterM (isBadSrcDir root) (NE.toList srcDirs)

190+ case badDirs of

191+ [] -> return $ Right outline

192+ d:ds -> return $ Left (Exit.OutlineHasBadSrcDirs d ds)

225193

226−isSrcDirMissing :: FilePath -> SrcDir -> IO Bool

227−isSrcDirMissing root srcDir =

228− not <$> Dir.doesDirectoryExist (toAbsolute root srcDir)

229194

230−

231−toGiven :: SrcDir -> FilePath

232−toGiven srcDir =

233− case srcDir of

234− AbsoluteSrcDir dir -> dir

235− RelativeSrcDir dir -> dir

236−

237−

238−toAbsolute :: FilePath -> SrcDir -> FilePath

239−toAbsolute root srcDir =

240− case srcDir of

241− AbsoluteSrcDir dir -> dir

242− RelativeSrcDir dir -> root </> dir

243−

244−

245−detectDuplicates :: FilePath -> [SrcDir] -> IO (Maybe (FilePath, (FilePath, FilePath)))

246−detectDuplicates root srcDirs =

247− do pairs <- traverse (toPair root) srcDirs

248− return $ Map.lookupMin $ Map.mapMaybe isDup $

249− Map.fromListWith OneOrMore.more pairs

250−

251−

252−toPair :: FilePath -> SrcDir -> IO (FilePath, OneOrMore.OneOrMore FilePath)

253−toPair root srcDir =

254− do key <- Dir.canonicalizePath (toAbsolute root srcDir)

255− return (key, OneOrMore.one (toGiven srcDir))

256−

257−

258−isDup :: OneOrMore.OneOrMore FilePath -> Maybe (FilePath, FilePath)

259−isDup paths =

260− case paths of

261− OneOrMore.One _ -> Nothing

262− OneOrMore.More a b -> Just (OneOrMore.getFirstTwo a b)

195+isBadSrcDir :: FilePath -> FilePath -> IO Bool

196+isBadSrcDir root dir =

197+ not <$> Dir.doesDirectoryExist (root </> dir)

263198

264199

265200

@@ -272,14 +207,16 @@ type Decoder a =

272207

273208decoder :: Decoder Outline

274209decoder =

275− let

276− application = Json.fromChars "application"

277− package = Json.fromChars "package"

278− in

279210 do tipe <- D.field "type" D.string

280− if | tipe == application -> App <$> appDecoder

281− | tipe == package -> Pkg <$> pkgDecoder

282− | otherwise -> D.failure Exit.OP_BadType

211+ case tipe of

212+ "application" ->

213+ App <$> appDecoder

214+

215+ "package" ->

216+ Pkg <$> pkgDecoder

217+

218+ other ->

219+ D.failure (Exit.OP_BadType other)

283220

284221

285222appDecoder :: Decoder AppOutline

@@ -296,7 +233,7 @@ appDecoder =

296233pkgDecoder :: Decoder PkgOutline

297234pkgDecoder =

298235 PkgOutline

299− <$> D.field "name" nameDecoder

236+ <$> D.field "name" (D.mapError Exit.OP_BadPkgName Pkg.decoder)

300237 <*> D.field "summary" summaryDecoder

301238 <*> D.field "license" (Licenses.decoder Exit.OP_BadLicense)

302239 <*> D.field "version" versionDecoder

@@ -310,21 +247,17 @@ pkgDecoder =

310247-- JSON DECODE HELPERS

311248

312249

313−nameDecoder :: Decoder Pkg.Name

314−nameDecoder =

315− D.mapError (uncurry Exit.OP_BadPkgName) Pkg.decoder

316−

317−

318−summaryDecoder :: Decoder Json.String

250+summaryDecoder :: Decoder Utf8.String

319251summaryDecoder =

320− D.customString

321− (boundParser 80 Exit.OP_BadSummaryTooLong)

322− (\_ _ -> Exit.OP_BadSummaryTooLong)

252+ do summary <- D.string

253+ if Utf8.size summary < 80

254+ then return summary

255+ else D.failure Exit.OP_BadSummaryTooLong

323256

324257

325258versionDecoder :: Decoder V.Version

326259versionDecoder =

327− D.mapError (uncurry Exit.OP_BadVersion) V.decoder

260+ D.mapError Exit.OP_BadVersion V.decoder

328261

329262

330263constraintDecoder :: Decoder Con.Constraint

@@ -334,19 +267,27 @@ constraintDecoder =

334267

335268depsDecoder :: Decoder a -> Decoder (Map.Map Pkg.Name a)

336269depsDecoder valueDecoder =

337− D.dict (Pkg.keyDecoder Exit.OP_BadDependencyName) valueDecoder

270+ Map.fromList <$> (

271+ traverse validateKey =<< D.pairs valueDecoder

272+ )

338273

339274

340−dirsDecoder :: Decoder (NE.List SrcDir)

341−dirsDecoder =

342− fmap (toSrcDir . Json.toChars) <$> D.nonEmptyList D.string Exit.OP_NoSrcDirs

275+validateKey :: (Utf8.String, a) -> Decoder (Pkg.Name, a)

276+validateKey (key, value) =

277+ case Pkg.fromString key of

278+ Right name ->

279+ return (name, value)

343280

281+ Left _ ->

282+ D.failure (Exit.OP_BadDependencyName key)

344283

345−toSrcDir :: FilePath -> SrcDir

346−toSrcDir path =

347− if FP.isRelative path

348− then RelativeSrcDir path

349− else AbsoluteSrcDir path

284+

285+dirsDecoder :: Decoder (NE.List FilePath)

286+dirsDecoder =

287+ do dirs <- D.list D.string

288+ case map Utf8.toChars dirs of

289+ d:ds -> return (NE.List d ds)

290+ [] -> D.failure Exit.OP_NoSrcDirs

350291

351292

352293

@@ -357,51 +298,81 @@ exposedDecoder :: Decoder Exposed

357298exposedDecoder =

358299 D.oneOf

359300 [ ExposedList <$> D.list moduleDecoder

360− , ExposedDict <$> D.pairs headerKeyDecoder (D.list moduleDecoder)

301+ , do pairs <- D.pairs (D.list moduleDecoder)

302+ traverse_ (checkHeader . fst) pairs

303+ return (ExposedDict pairs)

361304 ]

362305

363306

364307moduleDecoder :: Decoder ModuleName.Raw

365308moduleDecoder =

366− D.mapError (uncurry Exit.OP_BadModuleName) ModuleName.decoder

309+ D.mapError Exit.OP_BadModuleName ModuleName.decoder

310+

367311

312+checkHeader :: Utf8.String -> Decoder ()

313+checkHeader header =

314+ if Utf8.size header < 20

315+ then return ()

316+ else D.failure (Exit.OP_BadModuleHeaderTooLong header)

368317

369−headerKeyDecoder :: D.KeyDecoder Exit.OutlineProblem Json.String

370−headerKeyDecoder =

371− D.KeyDecoder

372− (boundParser 20 Exit.OP_BadModuleHeaderTooLong)

373− (\_ _ -> Exit.OP_BadModuleHeaderTooLong)

374318

375319

320+-- BINARY

321+

376322

377−-- BOUND PARSER

323+instance Binary Outline where

324+ put outline =

325+ case outline of

326+ App a -> putWord8 0 >> put a

327+ Pkg a -> putWord8 1 >> put a

378328

329+ get =

330+ do n <- getWord8

331+ case n of

332+ 0 -> liftM App get

333+ 1 -> liftM Pkg get

334+ _ -> error "binary encoding of Outline was corrupted"

379335

380−boundParser :: Int -> x -> P.Parser x Json.String

381−boundParser bound tooLong =

382− P.Parser $ \(P.State src pos end indent row col) cok _ cerr _ ->

383− let

384− len = minusPtr end pos

385− newCol = col + fromIntegral len

386− in

387− if len < bound

388− then cok (Json.fromPtr pos end) (P.State src end end indent row newCol)

389− else cerr row newCol (\_ _ -> tooLong)

390336

337+instance Binary AppOutline where

338+ put (AppOutline a b c d e f) =

339+ put a >> put b >> put c >> put d >> put e >> put f

391340

341+ get =

342+ do a <- get

343+ b <- get

344+ c <- get

345+ d <- get

346+ e <- get

347+ f <- get

348+ return (AppOutline a b c d e f)

392349

393−-- BINARY

394350

351+instance Binary PkgOutline where

352+ put (PkgOutline a b c d e f g h) =

353+ put a >> put b >> put c >> put d >> put e >> put f >> put g >> put h

395354

396−instance Binary SrcDir where

397− put outline =

398− case outline of

399− AbsoluteSrcDir a -> putWord8 0 >> put a

400− RelativeSrcDir a -> putWord8 1 >> put a

355+ get =

356+ do a <- get

357+ b <- get

358+ c <- get

359+ d <- get

360+ e <- get

361+ f <- get

362+ g <- get

363+ h <- get

364+ return (PkgOutline a b c d e f g h)

365+

366+

367+instance Binary Exposed where

368+ put exposed =

369+ case exposed of

370+ ExposedList a -> putWord8 0 >> put a

371+ ExposedDict a -> putWord8 1 >> put a

401372

402373 get =

403374 do n <- getWord8

404375 case n of

405− 0 -> liftM AbsoluteSrcDir get

406− 1 -> liftM RelativeSrcDir get

407− _ -> fail "binary encoding of SrcDir was corrupted"

376+ 0 -> liftM ExposedList get

377+ 1 -> liftM ExposedDict get

378+ _ -> error "binary encoding of ProjectDeps was corrupted"

builder/src/Elm/Publish.hsnew file+255

@@ -0,0 +1,255 @@

1+{-# OPTIONS_GHC -Wall #-}

2+module Elm.Publish (publish) where

3+

4+

5+import Control.Monad (when)

6+import Control.Monad.Except (catchError, runExceptT)

7+import Control.Monad.Trans (liftIO, lift)

8+import qualified Data.List as List

9+import qualified Data.Utf8 as Utf8

10+import qualified System.Directory as Dir

11+import qualified System.Exit as Exit

12+import System.FilePath ((</>))

13+import qualified System.IO as IO

14+import qualified System.Process as Process

15+

16+import qualified Deps.Cache as Cache

17+import qualified Deps.Diff as Diff

18+import qualified Deps.Website as Website

19+import qualified Elm.Bump as Bump

20+import qualified Elm.Docs as Docs

21+import qualified Elm.Package as Pkg

22+import qualified Elm.Project.Json as Project

23+import qualified Elm.Project.Summary as Summary

24+import qualified Elm.Version as V

25+import qualified Reporting.Exit as Exit

26+import qualified Reporting.Exit.Publish as E

27+import qualified Reporting.Progress as Progress

28+import qualified Reporting.Task as Task

29+import qualified Stuff.Paths as Path

30+

31+

32+

33+-- PUBLISH

34+

35+

36+publish :: Summary.Summary -> Task.Task ()

37+publish summary@(Summary.Summary root project _ _ _) =

38+ case project of

39+ Project.App _ ->

40+ throw E.Application

41+

42+ Project.Pkg (Project.PkgInfo name smry _ version exposed _ _ _) ->

43+ do

44+ registry <- Cache.mandatoryUpdate

45+ let maybePublishedVersions = either (const Nothing) Just (Cache.getVersions name registry)

46+

47+ Task.report (Progress.PublishStart name version maybePublishedVersions)

48+

49+ when (noExposed exposed) $ throw E.NoExposed

50+ when (badSummary smry) $ throw E.NoSummary

51+

52+ verifyReadme root

53+ verifyLicense root

54+ docs <- Task.silently (error "TODO Project.generateDocs summary" summary)

55+ verifyVersion name version docs maybePublishedVersions

56+ commitHash <- verifyTag name version

57+ verifyNoChanges commitHash version

58+ zipHash <- verifyZip name version

59+

60+ Website.register name version commitHash zipHash

61+

62+ Task.report Progress.PublishEnd

63+

64+

65+throw :: E.Exit -> Task.Task a

66+throw exit =

67+ Task.throw (Exit.Publish exit)

68+

69+

70+

71+-- VERIFY SUMMARY

72+

73+

74+badSummary :: Utf8.String -> Bool

75+badSummary summary =

76+ Utf8.isEmpty summary || Project.defaultSummary == summary

77+

78+

79+noExposed :: Project.Exposed -> Bool

80+noExposed exposed =

81+ case exposed of

82+ Project.ExposedList modules ->

83+ null modules

84+

85+ Project.ExposedDict chunks ->

86+ all (null . snd) chunks

87+

88+

89+

90+-- VERIFY README

91+

92+

93+verifyReadme :: FilePath -> Task.Task ()

94+verifyReadme root =

95+ phase Progress.CheckReadme $

96+ do let readmePath = root </> "README.md"

97+ exists <- liftIO $ Dir.doesFileExist readmePath

98+ case exists of

99+ False ->

100+ throw E.NoReadme

101+

102+ True ->

103+ do size <- liftIO $ IO.withFile readmePath IO.ReadMode IO.hFileSize

104+ if size < 300

105+ then throw E.ShortReadme

106+ else return ()

107+

108+

109+

110+-- VERIFY LICENSE

111+

112+

113+verifyLicense :: FilePath -> Task.Task ()

114+verifyLicense root =

115+ phase Progress.CheckLicense $

116+ do let licensePath = root </> "LICENSE"

117+ exists <- liftIO $ Dir.doesFileExist licensePath

118+ if exists

119+ then return ()

120+ else throw E.NoLicense

121+

122+

123+

124+-- VERIFY GITHUB TAG

125+

126+

127+verifyTag :: Pkg.Name -> V.Version -> Task.Task String

128+verifyTag name version =

129+ phase (Progress.CheckTag version) $

130+ Website.githubCommit name version `catchError` \_ ->

131+ throw (E.MissingTag version)

132+

133+

134+

135+-- VERIFY NO LOCAL CHANGES SINCE TAG

136+

137+

138+verifyNoChanges :: String -> V.Version -> Task.Task ()

139+verifyNoChanges commitHash version =

140+ phase Progress.CheckChanges $

141+ do maybeGit <- liftIO $ Dir.findExecutable "git"

142+ case maybeGit of

143+ Nothing ->

144+ throw E.NoGit

145+

146+ Just git ->

147+ do -- https://stackoverflow.com/questions/3878624/how-do-i-programmatically-determine-if-there-are-uncommited-changes

148+ exitCode <- liftIO $

149+ Process.rawSystem git [ "diff-index", "--quiet", commitHash, "--" ]

150+

151+ case exitCode of

152+ Exit.ExitSuccess ->

153+ return ()

154+

155+ Exit.ExitFailure _ ->

156+ throw (E.LocalChanges version)

157+

158+

159+

160+-- VERIFY THAT ZIP BUILDS / COMPUTE HASH

161+

162+

163+verifyZip :: Pkg.Name -> V.Version -> Task.Task Website.Sha

164+verifyZip name version =

165+ withTempDir $ \dir ->

166+ do hash <- phase Progress.CheckDownload $

167+ Website.githubDownload name version dir

168+

169+ phase Progress.CheckBuild $

170+ do runner <- Task.getSilentRunner

171+ result <- liftIO $ Dir.withCurrentDirectory dir $ runner $

172+ Task.silently $ error "TODO Project.generateDocs =<< Project.getRoot"

173+ either Task.throw (\_ -> return ()) result

174+

175+ return hash

176+

177+

178+withTempDir :: (FilePath -> Task.Task a) -> Task.Task a

179+withTempDir callback =

180+ do liftIO $ Dir.createDirectoryIfMissing True Path.prepublishDir

181+ result <- lift $ runExceptT $ callback Path.prepublishDir

182+ liftIO $ Dir.removeDirectoryRecursive Path.prepublishDir

183+ either Task.throw return result

184+

185+

186+

187+-- PHASE REPORTING

188+

189+

190+phase :: Progress.PublishPhase -> Task.Task a -> Task.Task a

191+phase publishPhase task =

192+ do Task.report $ Progress.PublishProgress publishPhase Nothing

193+

194+ result <- task `catchError` \exit ->

195+ do Task.report $ Progress.PublishProgress publishPhase (Just Progress.Bad)

196+ Task.throw exit

197+

198+ Task.report $ Progress.PublishProgress publishPhase (Just Progress.Good)

199+

200+ return result

201+

202+

203+

204+-- VERIFY VERSION

205+

206+

207+verifyVersion :: Pkg.Name -> V.Version -> Docs.Documentation -> Maybe [V.Version] -> Task.Task ()

208+verifyVersion name version docs maybePublishedVersions =

209+ let

210+ reportBumpPhase bumpPhase =

211+ Task.report $ Progress.PublishCheckBump version bumpPhase

212+ in

213+ do reportBumpPhase Progress.StatedVersion

214+ case maybePublishedVersions of

215+ Nothing ->

216+ if version == V.one then

217+ reportBumpPhase Progress.GoodStart

218+ else

219+ throw (E.NotInitialVersion version)

220+

221+ Just publishedVersions ->

222+ if elem version publishedVersions then

223+ throw $ E.AlreadyPublished version

224+ else

225+ do (old, magnitude) <- verifyBump name version docs publishedVersions

226+ reportBumpPhase (Progress.GoodBump old magnitude)

227+

228+ `catchError` \exit ->

229+ do reportBumpPhase Progress.BadBump

230+ Task.throw exit

231+

232+

233+verifyBump :: Pkg.Name -> V.Version -> Docs.Documentation -> [V.Version] -> Task.Task (V.Version, Diff.Magnitude)

234+verifyBump name statedVersion newDocs publishedVersions =

235+ let

236+ possibleBumps =

237+ Bump.toPossibleBumps publishedVersions

238+

239+ isTheBump (_ ,new, _) =

240+ statedVersion == new

241+ in

242+ case List.find isTheBump possibleBumps of

243+ Nothing ->

244+ throw $ E.InvalidBump statedVersion (last publishedVersions)

245+

246+ Just (old, new, magnitude) ->

247+ do oldDocs <- Cache.getDocs name old

248+ let changes = Diff.diff oldDocs newDocs

249+ let realNew = Diff.bump changes old

250+ if new == realNew

251+ then

252+ return (old, magnitude)

253+ else

254+ throw $ E.BadBump old new magnitude realNew $

255+ Diff.toMagnitude changes

builder/src/File.hs+5−28

@@ -1,7 +1,6 @@

11module File

22 ( Time

33 , getTime

4− , zeroTime

54 , writeBinary

65 , readBinary

76 , writeUtf8

@@ -24,7 +23,6 @@ import qualified Data.ByteString.Builder as B

2423import qualified Data.ByteString.Lazy as LBS

2524import qualified Data.Fixed as Fixed

2625import qualified Data.List as List

27−import qualified Data.Time.Clock as Time

2826import qualified Data.Time.Clock.POSIX as Time

2927import qualified Foreign.ForeignPtr as FPtr

3028import GHC.IO.Exception (IOException, IOErrorType(InvalidArgument))

@@ -46,15 +44,11 @@ newtype Time = Time Fixed.Pico

4644getTime :: FilePath -> IO Time

4745getTime path =

4846 fmap

49− (Time . Time.nominalDiffTimeToSeconds . Time.utcTimeToPOSIXSeconds)

47+ (Time . realToFrac . Time.utcTimeToPOSIXSeconds)

48+-- TODO (Time . Time.nominalDiffTimeToSeconds . Time.utcTimeToPOSIXSeconds)

5049 (Dir.getModificationTime path)

5150

5251

53−zeroTime :: Time

54−zeroTime =

55− Time 0

56−

57−

5852instance Binary.Binary Time where

5953 put (Time time) = Binary.put time

6054 get = Time <$> Binary.get

@@ -78,21 +72,8 @@ readBinary path =

7872 then

7973 do result <- Binary.decodeFileOrFail path

8074 case result of

81− Right a ->

82− return (Just a)

83−

84− Left (offset, message) ->

85− do IO.hPutStrLn IO.stderr $ unlines $

86− [ "+-------------------------------------------------------------------------------"

87− , "| Corrupt File: " ++ path

88− , "| Byte Offset: " ++ show offset

89− , "| Message: " ++ message

90− , "|"

91− , "| Please report this to https://github.com/elm/compiler/issues"

92− , "| Trying to continue anyway."

93− , "+-------------------------------------------------------------------------------"

94− ]

95− return Nothing

75+ Right a -> return (Just a)

76+ Left e -> return Nothing

9677 else

9778 return Nothing

9879

@@ -190,11 +171,7 @@ writeEntry destination root entry =

190171 let

191172 path = drop root (Zip.eRelativePath entry)

192173 in

193− if List.isPrefixOf "src/" path

194− || path == "LICENSE"

195− || path == "README.md"

196− || path == "elm.json"

197− then

174+ if List.isPrefixOf "src/" path then

198175 if not (null path) && last path == '/'

199176 then Dir.createDirectoryIfMissing True (destination </> path)

200177 else LBS.writeFile (destination </> path) (Zip.fromEntry entry)

builder/src/Generate.hsdeleted−211

@@ -1,211 +0,0 @@

1−{-# LANGUAGE BangPatterns #-}

2−module Generate

3− ( debug

4− , dev

5− , prod

6− , repl

7− )

8− where

9−

10−

11−import Prelude hiding (cycle, print)

12−import Control.Concurrent (MVar, forkIO, newEmptyMVar, newMVar, putMVar, readMVar)

13−import Control.Monad (liftM2)

14−import qualified Data.ByteString.Builder as B

15−import Data.Map ((!))

16−import qualified Data.Map as Map

17−import qualified Data.Maybe as Maybe

18−import qualified Data.Name as N

19−import qualified Data.NonEmptyList as NE

20−

21−import qualified AST.Optimized as Opt

22−import qualified Build

23−import qualified Elm.Compiler.Type.Extract as Extract

24−import qualified Elm.Details as Details

25−import qualified Elm.Interface as I

26−import qualified Elm.ModuleName as ModuleName

27−import qualified Elm.Package as Pkg

28−import qualified File

29−import qualified Generate.JavaScript as JS

30−import qualified Generate.Mode as Mode

31−import qualified Nitpick.Debug as Nitpick

32−import qualified Reporting.Exit as Exit

33−import qualified Reporting.Task as Task

34−import qualified Stuff

35−

36−

37−-- NOTE: This is used by Make, Repl, and Reactor right now. But it may be

38−-- desireable to have Repl and Reactor to keep foreign objects in memory

39−-- to make things a bit faster?

40−

41−

42−

43−-- GENERATORS

44−

45−

46−type Task a =

47− Task.Task Exit.Generate a

48−

49−

50−debug :: FilePath -> Details.Details -> Build.Artifacts -> Task B.Builder

51−debug root details (Build.Artifacts pkg ifaces roots modules) =

52− do loading <- loadObjects root details modules

53− types <- loadTypes root ifaces modules

54− objects <- finalizeObjects loading

55− let mode = Mode.Dev (Just types)

56− let graph = objectsToGlobalGraph objects

57− let mains = gatherMains pkg objects roots

58− return $ JS.generate mode graph mains

59−

60−

61−dev :: FilePath -> Details.Details -> Build.Artifacts -> Task B.Builder

62−dev root details (Build.Artifacts pkg _ roots modules) =

63− do objects <- finalizeObjects =<< loadObjects root details modules

64− let mode = Mode.Dev Nothing

65− let graph = objectsToGlobalGraph objects

66− let mains = gatherMains pkg objects roots

67− return $ JS.generate mode graph mains

68−

69−

70−prod :: FilePath -> Details.Details -> Build.Artifacts -> Task B.Builder

71−prod root details (Build.Artifacts pkg _ roots modules) =

72− do objects <- finalizeObjects =<< loadObjects root details modules

73− checkForDebugUses objects

74− let graph = objectsToGlobalGraph objects

75− let mode = Mode.Prod (Mode.shortenFieldNames graph)

76− let mains = gatherMains pkg objects roots

77− return $ JS.generate mode graph mains

78−

79−

80−repl :: FilePath -> Details.Details -> Bool -> Build.ReplArtifacts -> N.Name -> Task B.Builder

81−repl root details ansi (Build.ReplArtifacts home modules localizer annotations) name =

82− do objects <- finalizeObjects =<< loadObjects root details modules

83− let graph = objectsToGlobalGraph objects

84− return $ JS.generateForRepl ansi localizer graph home name (annotations ! name)

85−

86−

87−

88−-- CHECK FOR DEBUG

89−

90−

91−checkForDebugUses :: Objects -> Task ()

92−checkForDebugUses (Objects _ locals) =

93− case Map.keys (Map.filter Nitpick.hasDebugUses locals) of

94− [] -> return ()

95− m:ms -> Task.throw (Exit.GenerateCannotOptimizeDebugValues m ms)

96−

97−

98−

99−-- GATHER MAINS

100−

101−

102−gatherMains :: Pkg.Name -> Objects -> NE.List Build.Root -> Map.Map ModuleName.Canonical Opt.Main

103−gatherMains pkg (Objects _ locals) roots =

104− Map.fromList $ Maybe.mapMaybe (lookupMain pkg locals) (NE.toList roots)

105−

106−

107−lookupMain :: Pkg.Name -> Map.Map ModuleName.Raw Opt.LocalGraph -> Build.Root -> Maybe (ModuleName.Canonical, Opt.Main)

108−lookupMain pkg locals root =

109− let

110− toPair name (Opt.LocalGraph maybeMain _ _) =

111− (,) (ModuleName.Canonical pkg name) <$> maybeMain

112− in

113− case root of

114− Build.Inside name -> toPair name =<< Map.lookup name locals

115− Build.Outside name _ g -> toPair name g

116−

117−

118−

119−-- LOADING OBJECTS

120−

121−

122−data LoadingObjects =

123− LoadingObjects

124− { _foreign_mvar :: MVar (Maybe Opt.GlobalGraph)

125− , _local_mvars :: Map.Map ModuleName.Raw (MVar (Maybe Opt.LocalGraph))

126− }

127−

128−

129−loadObjects :: FilePath -> Details.Details -> [Build.Module] -> Task LoadingObjects

130−loadObjects root details modules =

131− Task.io $

132− do mvar <- Details.loadObjects root details

133− mvars <- traverse (loadObject root) modules

134− return $ LoadingObjects mvar (Map.fromList mvars)

135−

136−

137−loadObject :: FilePath -> Build.Module -> IO (ModuleName.Raw, MVar (Maybe Opt.LocalGraph))

138−loadObject root modul =

139− case modul of

140− Build.Fresh name _ graph ->

141− do mvar <- newMVar (Just graph)

142− return (name, mvar)

143−

144− Build.Cached name _ _ ->

145− do mvar <- newEmptyMVar

146− _ <- forkIO $ putMVar mvar =<< File.readBinary (Stuff.elmo root name)

147− return (name, mvar)

148−

149−

150−

151−-- FINALIZE OBJECTS

152−

153−

154−data Objects =

155− Objects

156− { _foreign :: Opt.GlobalGraph

157− , _locals :: Map.Map ModuleName.Raw Opt.LocalGraph

158− }

159−

160−

161−finalizeObjects :: LoadingObjects -> Task Objects

162−finalizeObjects (LoadingObjects mvar mvars) =

163− Task.eio id $

164− do result <- readMVar mvar

165− results <- traverse readMVar mvars

166− case liftM2 Objects result (sequence results) of

167− Just loaded -> return (Right loaded)

168− Nothing -> return (Left Exit.GenerateCannotLoadArtifacts)

169−

170−

171−objectsToGlobalGraph :: Objects -> Opt.GlobalGraph

172−objectsToGlobalGraph (Objects globals locals) =

173− foldr Opt.addLocalGraph globals locals

174−

175−

176−

177−-- LOAD TYPES

178−

179−

180−loadTypes :: FilePath -> Map.Map ModuleName.Canonical I.DependencyInterface -> [Build.Module] -> Task Extract.Types

181−loadTypes root ifaces modules =

182− Task.eio id $

183− do mvars <- traverse (loadTypesHelp root) modules

184− let !foreigns = Extract.mergeMany (Map.elems (Map.mapWithKey Extract.fromDependencyInterface ifaces))

185− results <- traverse readMVar mvars

186− case sequence results of

187− Just ts -> return (Right (Extract.merge foreigns (Extract.mergeMany ts)))

188− Nothing -> return (Left Exit.GenerateCannotLoadArtifacts)

189−

190−

191−loadTypesHelp :: FilePath -> Build.Module -> IO (MVar (Maybe Extract.Types))

192−loadTypesHelp root modul =

193− case modul of

194− Build.Fresh name iface _ ->

195− newMVar (Just (Extract.fromInterface name iface))

196−

197− Build.Cached name _ ciMVar ->

198− do cachedInterface <- readMVar ciMVar

199− case cachedInterface of

200− Build.Unneeded ->

201− do mvar <- newEmptyMVar

202− _ <- forkIO $

203− do maybeIface <- File.readBinary (Stuff.elmi root name)

204− putMVar mvar (Extract.fromInterface name <$> maybeIface)

205− return mvar

206−

207− Build.Loaded iface ->

208− newMVar (Just (Extract.fromInterface name iface))

209−

210− Build.Corrupted ->

211− newMVar Nothing

builder/src/Http.hs+1−14

@@ -16,7 +16,6 @@ module Http

1616 -- upload

1717 , upload

1818 , filePart

19− , jsonPart

2019 , stringPart

2120 )

2221 where

@@ -27,7 +26,6 @@ import qualified Codec.Archive.Zip as Zip

2726import Control.Exception (SomeException, handle)

2827import qualified Data.Binary as Binary

2928import qualified Data.Binary.Get as Binary

30−import qualified Data.ByteString.Builder as B

3129import qualified Data.ByteString.Char8 as BS

3230import qualified Data.Digest.Pure.SHA as SHA

3331import qualified Data.String as String

@@ -36,10 +34,8 @@ import Network.HTTP.Client

3634import Network.HTTP.Client.TLS (tlsManagerSettings)

3735import Network.HTTP.Types.Header (Header, hAccept, hAcceptEncoding, hUserAgent)

3836import Network.HTTP.Types.Method (Method, methodGet, methodPost)

39−import qualified Network.HTTP.Client as Multi (RequestBody(RequestBodyLBS))

4037import qualified Network.HTTP.Client.MultipartFormData as Multi

4138

42−import qualified Json.Encode as Encode

4339import qualified Elm.Version as V

4440

4541

@@ -230,15 +226,6 @@ filePart name filePath =

230226 Multi.partFileSource (String.fromString name) filePath

231227

232228

233−jsonPart :: String -> FilePath -> Encode.Value -> Multi.Part

234−jsonPart name filePath value =

235− let

236− body =

237− Multi.RequestBodyLBS $ B.toLazyByteString $ Encode.encodeUgly value

238− in

239− Multi.partFileRequestBody (String.fromString name) filePath body

240−

241−

242229stringPart :: String -> String -> Multi.Part

243230stringPart name string =

244− Multi.partBS (String.fromString name) (BS.pack string)

231+ Multi.partBS (String.fromString name) (BS.pack string)

builder/src/Reporting.hs+22−43

@@ -1,7 +1,6 @@

11{-# LANGUAGE BangPatterns, OverloadedStrings #-}

22module Reporting

33 ( Style

4− , silent

54 , json

65 , terminal

76 --

@@ -33,7 +32,7 @@ import qualified Data.ByteString.Builder as B

3332import qualified Data.NonEmptyList as NE

3433import qualified System.Exit as Exit

3534import qualified System.Info as Info

36−import System.IO (hFlush, hPutStr, hPutStrLn, stderr, stdout)

35+import System.IO (hFlush, hPutStr, stderr, stdout)

3736

3837import qualified Elm.ModuleName as ModuleName

3938import qualified Elm.Package as Pkg

@@ -50,16 +49,10 @@ import qualified Reporting.Exit.Help as Help

5049

5150

5251data Style

53− = Silent

54− | Json

52+ = Json

5553 | Terminal (MVar ())

5654

5755

58−silent :: Style

59−silent =

60− Silent

61−

62−

6356json :: Style

6457json =

6558 Json

@@ -78,9 +71,7 @@ attempt :: (x -> Help.Report) -> IO (Either x a) -> IO a

7871attempt toReport work =

7972 do result <- work `catch` reportExceptionsNicely

8073 case result of

81− Right a ->

82− return a

83−

74+ Right a -> return a

8475 Left x ->

8576 do Exit.toStderr (toReport x)

8677 Exit.exitFailure

@@ -90,14 +81,9 @@ attemptWithStyle :: Style -> (x -> Help.Report) -> IO (Either x a) -> IO a

9081attemptWithStyle style toReport work =

9182 do result <- work `catch` reportExceptionsNicely

9283 case result of

93− Right a ->

94− return a

95−

84+ Right a -> return a

9685 Left x ->

9786 case style of

98− Silent ->

99− do Exit.exitFailure

100−

10187 Json ->

10288 do B.hPutBuilder stderr (Encode.encodeUgly (Exit.toJson (toReport x)))

10389 Exit.exitFailure

@@ -122,6 +108,11 @@ badMark =

122108 D.red $ if isWindows then "X" else "✗"

123109

124110

111+_waitingMark :: D.Doc

112+_waitingMark =

113+ D.dullyellow $ if isWindows then "-" else "→"

114+

115+

125116isWindows :: Bool

126117isWindows =

127118 Info.os == "mingw32"

@@ -177,9 +168,6 @@ type DKey = Key DMsg

177168trackDetails :: Style -> (DKey -> IO a) -> IO a

178169trackDetails style callback =

179170 case style of

180− Silent ->

181− callback (Key (\_ -> return ()))

182−

183171 Json ->

184172 callback (Key (\_ -> return ()))

185173

@@ -264,8 +252,8 @@ putDownload :: D.Doc -> Pkg.Name -> V.Version -> IO ()

264252putDownload mark pkg vsn =

265253 Help.toStdout $ D.indent 2 $

266254 mark

267− <+> D.fromPackage pkg

268− <+> D.fromVersion vsn

255+ <+> D.fromUtf8 (Pkg.toString pkg)

256+ <+> D.fromUtf8 (V.toString vsn)

269257 <> "\n"

270258

271259

@@ -309,9 +297,6 @@ type BResult a = Either Exit.BuildProblem a

309297trackBuild :: Style -> (BKey -> IO (BResult a)) -> IO (BResult a)

310298trackBuild style callback =

311299 case style of

312− Silent ->

313− callback (Key (\_ -> return ()))

314−

315300 Json ->

316301 callback (Key (\_ -> return ()))

317302

@@ -364,10 +349,10 @@ toFinalMessage done result =

364349

365350 Left problem ->

366351 case problem of

367− Exit.BuildBadModules _ _ [] ->

352+ Exit.BuildModuleProblems _ [] ->

368353 "Detected problems in 1 module."

369354

370− Exit.BuildBadModules _ _ (_:ps) ->

355+ Exit.BuildModuleProblems _ (_:ps) ->

371356 "Detected problems in " ++ show (2 + length ps) ++ " modules."

372357

373358 Exit.BuildProjectProblem _ ->

@@ -381,9 +366,6 @@ toFinalMessage done result =

381366reportGenerate :: Style -> NE.List ModuleName.Raw -> FilePath -> IO ()

382367reportGenerate style names output =

383368 case style of

384− Silent ->

385− return ()

386−

387369 Json ->

388370 return ()

389371

@@ -446,23 +428,20 @@ reportExceptionsNicely e =

446428

447429

448430putException :: SomeException -> IO ()

449−putException e = do

450− hPutStrLn stderr ""

431+putException e =

451432 Help.toStderr $ D.stack $

452− [ D.dullyellow "-- ERROR -----------------------------------------------------------------------"

453− , D.reflow $

454− "I ran into something that bypassed the normal error reporting process!\

433+ [ D.reflow $

434+ "Oh no! I ran into something that bypassed the normal error reporting process!\

455435 \ I extracted whatever information I could from the internal error:"

456436 , D.vcat $ map (\line -> D.red ">" <> " " <> D.fromChars line) (lines (show e))

457437 , D.reflow $

458− "These errors are usually pretty confusing, so start by asking around on one of\

459− \ forums listed at https://elm-lang.org/community to see if anyone can get you\

460− \ unstuck quickly."

461− , D.dullyellow "-- REQUEST ---------------------------------------------------------------------"

438+ "These errors are usually pretty confusing, so start by asking around on Slack\

439+ \ or Discourse to see if anyone can get you unstuck quickly."

440+ , "------------------------------------------------------------"

462441 , D.reflow $

463− "If you are feeling up to it, please try to get your code down to the smallest\

464− \ version that still triggers this message. Ideally in a single Main.elm and\

465− \ elm.json file."

442+ "From there, if you are feeling up to it, please try to get your code down to the\

443+ \ smallest version that still triggers this message. Ideally in a single Main.elm\

444+ \ and elm.json file."

466445 , D.reflow $

467446 "From there open a NEW issue at https://github.com/elm/compiler/issues with\

468447 \ your reduced example pasted in directly. (Not a link to a repo or gist!) Do not\

builder/src/Reporting/Exit.hs+378−1636

@@ -1,27 +1,31 @@

11{-# LANGUAGE OverloadedStrings #-}

22module Reporting.Exit

3− ( Init(..), initToReport

4− , Diff(..), diffToReport

5− , Make(..), makeToReport

6− , Bump(..), bumpToReport

7− , Repl(..), replToReport

8− , Publish(..), publishToReport

9− , Install(..), installToReport

10− , Reactor(..), reactorToReport

11− , newPackageOverview

3+ ( Exit(..)

4+ --

5+ , Init(..)

6+ , initToReport

7+ --

8+ , Diff(..)

9+ , diffToReport

10+ --

11+ , Install(..)

12+ , installToReport

1213 --

1314 , Solver(..)

15+ --

1416 , Outline(..)

1517 , OutlineProblem(..)

18+ --

1619 , Details(..)

17− , DetailsBadDep(..)

18− , PackageProblem(..)

1920 , RegistryProblem(..)

21+ , PackageProblem(..)

22+ --

23+ , Make(..)

2024 , BuildProblem(..)

2125 , BuildProjectProblem(..)

22− , DocsProblem(..)

23− , Generate(..)

26+ , makeToReport

2427 --

28+ , DocsProblem(..)

2529 , toString

2630 , toStderr

2731 , toJson

@@ -29,56 +33,59 @@ module Reporting.Exit

2933 where

3034

3135

32−import qualified Data.ByteString as BS

33−import qualified Data.ByteString.UTF8 as BS_UTF8

3436import qualified Data.List as List

35−import qualified Data.Map as Map

36−import qualified Data.Name as N

37−import qualified Data.NonEmptyList as NE

38−import qualified Network.HTTP.Client as HTTP

39−import qualified Network.HTTP.Types.Header as HTTP

40−import qualified Network.HTTP.Types.Status as HTTP

41−import qualified System.FilePath as FP

42−import System.FilePath ((</>), (<.>))

37+import qualified Data.Utf8 as Utf8

4338

4439import qualified Elm.Constraint as C

4540import qualified Elm.Magnitude as M

4641import qualified Elm.ModuleName as ModuleName

4742import qualified Elm.Package as Pkg

4843import qualified Elm.Version as V

49−import qualified File

5044import qualified Http

51−import qualified Json.Decode as Decode

5245import qualified Json.Encode as Encode

53−import qualified Json.String as Json

54−import Parse.Primitives (Row, Col)

55−import qualified Reporting.Annotation as A

5646import Reporting.Doc ((<>))

5747import qualified Reporting.Doc as D

58−import qualified Reporting.Error.Import as Import

5948import qualified Reporting.Error.Json as Json

6049import qualified Reporting.Exit.Help as Help

6150import qualified Reporting.Error as Error

62−import qualified Reporting.Render.Code as Code

63−

64−

6551

66−-- RENDERERS

6752

6853

69−toString :: Help.Report -> String

70−toString report =

71− Help.toString (Help.reportToDoc report)

54+-- ALL POSSIBLE ERRORS

7255

7356

74−toStderr :: Help.Report -> IO ()

75−toStderr report =

76− Help.toStderr (Help.reportToDoc report)

57+data Exit

58+ -- bump

59+ = BumpApplication

60+ | BumpUnexpectedVersion V.Version [V.Version]

61+ | BumpMustHaveLatestRegistry RegistryProblem

62+ | BumpCannotFindDocs Pkg.Name V.Version DocsProblem

63+ -- publish

64+ | PublishMustHaveLatestRegistry RegistryProblem

65+ | PublishApplication

66+ | PublishNotInitialVersion V.Version

67+ | PublishAlreadyPublished V.Version

68+ | PublishInvalidBump V.Version V.Version

69+ | PublishBadBump V.Version V.Version M.Magnitude V.Version M.Magnitude

70+ | PublishNoSummary

71+ | PublishNoExposed

72+ | PublishNoReadme

73+ | PublishShortReadme

74+ | PublishNoLicense

75+ | PublishCannotGetTag Http.Error

76+ | PublishCannotGetZip Http.Error

77+ | PublishCannotDecodeZip

78+ | PublishCannotGetDocs DocsProblem

79+ | PublishCannotRegister Http.Error

80+ | PublishMissingTag V.Version

81+ | PublishNoGit

82+ | PublishLocalChanges V.Version

7783

7884

79−toJson :: Help.Report -> Encode.Value

80−toJson report =

81− Help.reportToJson report

85+data DocsProblem

86+ = DP_Http Http.Error

87+ | DP_Data

88+ | DP_Cache

8289

8390

8491

@@ -109,18 +116,13 @@ initToReport exit =

109116

110117 InitNoOfflineSolution pkgs ->

111118 Help.report "NO OFFLINE SOLUTION" Nothing

112− "I tried to create an elm.json with the following direct dependencies:"

113− [ D.indent 4 $ D.vcat $

114− map (D.dullyellow . D.fromChars . Pkg.toChars) pkgs

115− , D.reflow $

116− "I could not find compatible versions though, but that may be because I could not\

117− \ connect to https://package.elm-lang.org to get the latest list of packages. Are\

118− \ you able to connect to the internet? Please ask around one of the community\

119− \ forums at https://elm-lang.org/community for help!"

120− ]

119+ (error "TODO InitNoOfflineSolution" pkgs)

120+ (error "TODO InitNoOfflineSolution" pkgs)

121+ -- note about Russia IP addresses?

122+ -- ask if they are on a plane or train

121123

122124 InitSolverProblem solver ->

123− toSolverReport solver

125+ error "TODO InitSolverProblem" solver

124126

125127 InitAlreadyExists ->

126128 Help.report "EXISTING PROJECT" Nothing

@@ -131,9 +133,8 @@ initToReport exit =

131133 ]

132134 ]

133135

134− InitRegistryProblem problem ->

135− toRegistryProblemReport "PROBLEM LOADING PACKAGE LIST" problem $

136− "I need the list of published packages before I can start initializing projects"

136+ InitRegistryProblem _ ->

137+ error "TODO InitRegistryProblem"

137138

138139

139140

@@ -141,48 +142,22 @@ initToReport exit =

141142

142143

143144data Diff

144− = DiffNoOutline

145− | DiffBadOutline Outline

146− | DiffApplication

147− | DiffNoExposed

145+ = DiffApplication

148146 | DiffUnpublished

149147 | DiffUnknownPackage Pkg.Name [Pkg.Name]

150148 | DiffUnknownVersion Pkg.Name V.Version [V.Version]

151− | DiffDocsProblem V.Version DocsProblem

149+ | DiffCannotFindDocs DocsProblem

152150 | DiffMustHaveLatestRegistry RegistryProblem

153− | DiffBadDetails Details

154− | DiffBadBuild BuildProblem

155151

156152

157153diffToReport :: Diff -> Help.Report

158154diffToReport diff =

159155 case diff of

160− DiffNoOutline ->

161− Help.report "DIFF WHAT?" Nothing

162− "I cannot find an elm.json so I am not sure what you want me to diff.\

163− \ Normally you run `elm diff` from within a project!"

164− [ D.reflow $ "If you are just curious to see a diff, try running this command:"

165− , D.indent 4 $ D.green $ "elm diff elm/http 1.0.0 2.0.0"

166− ]

167−

168− DiffBadOutline outline ->

169− toOutlineReport outline

170−

171156 DiffApplication ->

172− Help.report "CANNOT DIFF APPLICATIONS" (Just "elm.json")

173− "Your elm.json says this project is an application, but `elm diff` only works\

174− \ with packages. That way there are previously published versions of the API to\

175− \ diff against!"

176− [ D.reflow $ "If you are just curious to see a diff, try running this command:"

177− , D.indent 4 $ D.dullyellow $ "elm diff elm/json 1.0.0 1.1.2"

178− ]

179−

180− DiffNoExposed ->

181− Help.report "NO EXPOSED MODULES" (Just "elm.json")

182− "Your elm.json has no \"exposed-modules\" which means there is no public API at\

183− \ all right now! What am I supposed to diff?"

184− [ D.reflow $

185− "Try adding some modules back to the \"exposed-modules\" field."

157+ Help.report "CANNOT DIFF APPLICATIONS" Nothing

158+ "I cannot perform diffs on applications, only packages! If you are\

159+ \ just curious to see a diff, try running this command:"

160+ [ D.indent 4 $ D.green $ "elm diff elm/html 5.1.1 6.0.0"

186161 ]

187162

188163 DiffUnpublished ->

@@ -194,16 +169,16 @@ diffToReport diff =

194169 Help.report "UNKNOWN PACKAGE" Nothing

195170 ( "I cannot find a package called:"

196171 )

197− [ D.indent 4 $ D.red $ D.fromChars $ Pkg.toChars pkg

172+ [ D.indent 4 $ D.red $ D.fromUtf8 $ Pkg.toString pkg

198173 , "Maybe you want one of these instead?"

199− , D.indent 4 $ D.dullyellow $ D.vcat $ map (D.fromChars . Pkg.toChars) suggestions

174+ , D.indent 4 $ D.dullyellow $ D.vcat $ map (D.fromUtf8 . Pkg.toString) suggestions

200175 , "But check <https://package.elm-lang.org> to see all possibilities!"

201176 ]

202177

203178 DiffUnknownVersion _pkg vsn realVersions ->

204179 Help.docReport "UNKNOWN VERSION" Nothing

205180 ( D.fillSep $

206− [ "Version", D.red (D.fromVersion vsn)

181+ [ "Version", D.red (D.fromUtf8 (V.toString vsn))

207182 , "has", "never", "been", "published,", "so", "I"

208183 , "cannot", "diff", "against", "it."

209184 ]

@@ -212,57 +187,231 @@ diffToReport diff =

212187 , D.indent 4 $ D.dullyellow $ D.vcat $

213188 let

214189 sameMajor v1 v2 = V._major v1 == V._major v2

215− mkRow vsns = D.hsep $ map D.fromVersion vsns

190+ mkRow vsns = D.hsep $ map (D.fromUtf8 . V.toString) vsns

216191 in

217192 map mkRow $ List.groupBy sameMajor (List.sort realVersions)

218193 , "Want one of those instead?"

219194 ]

220195

221− DiffDocsProblem version problem ->

222− toDocsProblemReport problem $

223− "I need the docs for " ++ V.toChars version ++ " to compute this diff"

196+ DiffCannotFindDocs problem ->

197+ error "TODO DiffCannotFindDocs" problem

224198

225199 DiffMustHaveLatestRegistry problem ->

226− toRegistryProblemReport "PROBLEM UPDATING PACKAGE LIST" problem $

227− "I need the latest list of published packages before I do this diff"

200+ error "TODO DiffMustHaveLatestRegistry" problem

228201

229− DiffBadDetails details ->

230− toDetailsReport details

231202

232− DiffBadBuild buildProblem ->

233− toBuildProblemReport buildProblem

234203

204+-- INSTALL

235205

236206

237−-- BUMP

207+data Install

208+ = InstallNoProject

209+ | InstallNoArgs FilePath

210+ | InstallNoOnlineSolution

211+ | InstallNoOfflineSolution

212+ | InstallHadSolverTrouble Solver

213+ | InstallUnknownPackageOnline [Pkg.Name]

214+ | InstallUnknownPackageOffline [Pkg.Name]

215+ | InstallHasBadDetails Details

238216

239217

240−data Bump

241− = BumpNoOutline

242− | BumpBadOutline Outline

243− | BumpApplication

244− | BumpUnexpectedVersion V.Version [V.Version]

245− | BumpMustHaveLatestRegistry RegistryProblem

246− | BumpCannotFindDocs Pkg.Name V.Version DocsProblem

247− | BumpBadDetails Details

248− | BumpNoExposed

249− | BumpBadBuild BuildProblem

218+installToReport :: Install -> Help.Report

219+installToReport exit =

220+ case exit of

221+ InstallNoProject ->

222+ Help.report "NEW PROJECT?" Nothing

223+ "Are you trying to start a new project? Try this command instead:"

224+ [ D.indent 4 $ D.green "elm init"

225+ , D.reflow "It will help you get started!"

226+ ]

250227

228+ InstallNoArgs elmHome ->

229+ Help.report "INSTALL WHAT?" Nothing

230+ "I am expecting commands like:"

231+ [ D.green $ D.indent 4 $ D.vcat $

232+ [ "elm install elm/http"

233+ , "elm install elm/json"

234+ , "elm install elm/random"

235+ ]

236+ , D.toFancyHint

237+ ["In","JavaScript","folks","run","`npm install`","to","start","projects."

238+ ,"\"Gotta","download","everything!\"","But","why","download","packages"

239+ ,"again","and","again?","Instead,","Elm","caches","packages","in"

240+ ,D.dullyellow (D.fromChars elmHome)

241+ ,"so","each","one","is","downloaded","and","built","ONCE","on","your","machine."

242+ ,"Elm","projects","check","that","cache","before","trying","the","internet."

243+ ,"This","reduces","build","times,","reduces","server","costs,","and","makes","it"

244+ ,"easier","to","work","offline.","As","a","result"

245+ ,D.dullcyan "elm install","is","only","for","adding","dependencies","to","elm.json,"

246+ ,"whereas",D.dullcyan "elm make","is","in","charge","of","gathering","dependencies"

247+ ,"and","building","everything.","So","maybe","try",D.green "elm make","instead?"

248+ ]

249+ ]

251250

252−bumpToReport :: Bump -> Help.Report

253−bumpToReport bump =

254− case bump of

255− BumpNoOutline ->

256− Help.report "BUMP WHAT?" Nothing

257− "I cannot find an elm.json so I am not sure what you want me to bump."

258− [ D.reflow $

259− "Elm packages always have an elm.json that says current the version number. If\

260− \ you run this command from a directory with an elm.json file, I will try to bump\

261− \ the version in there based on the API changes."

251+ InstallNoOnlineSolution ->

252+ Help.report "UNSOLVABLE DEPENDENCIES" (Just "elm.json") -- TODO recommend using solver in `elm reactor`

253+ "This usually happens if you try to modify dependency constraints by\

254+ \ hand. I recommend deleting any dependency you added recently (or all\

255+ \ of them if things are bad) and then adding them again with:"

256+ [ D.indent 4 $ D.green "elm install"

257+ , D.reflow $

258+ "And do not be afaid to ask for help on Slack if you get stuck!"

262259 ]

263260

264− BumpBadOutline outline ->

265− toOutlineReport outline

261+ InstallNoOfflineSolution ->

262+ error "TODO InstallNoOfflineSolution"

263+

264+ InstallHadSolverTrouble solver ->

265+ error "TODO InstallHadSolverTrouble" solver

266+

267+ InstallUnknownPackageOnline suggestions ->

268+ error "TODO InstallUnknownPackageOnline" suggestions

269+

270+ InstallUnknownPackageOffline suggestions ->

271+ error "TODO InstallUnknownPackageOffline" suggestions

272+

273+ InstallHasBadDetails _ ->

274+ error "TODO InstallHasBadDetails"

275+

276+

277+{- TODO detect if library has no 0.19.0 version. Maybe do this on website though?

278+ Help.report "OLD DEPENDENCIES" (Just "elm.json")

279+ ( "The following packages do not work with Elm " ++ V.toChars V.compiler ++ " right now:"

280+ )

281+ [ D.indent 4 $ D.vcat $ map (D.red . D.fromUtf8 . Pkg.toString) badPackages

282+ , D.reflow $

283+ "This may be because it is not upgraded yet. It may be because a\

284+ \ better solution came along, so there was no need to upgrade it.\

285+ \ Etc. Try asking around on Slack to learn more about the topic."

286+ , D.toSimpleNote

287+ "Whatever the case, please be kind to the relevant package authors! Having\

288+ \ friendly interactions with users is great motivation, and conversely, getting\

289+ \ berated by strangers on the internet sucks your soul dry. Furthermore, package\

290+ \ authors are humans with families, friends, jobs, vacations, responsibilities,\

291+ \ goals, etc. They face obstacles outside of their technical work you will never\

292+ \ know about, so please assume the best and try to be patient and supportive!"

293+ ]

294+-}

295+

296+

297+

298+-- SOLVER

299+

300+

301+data Solver

302+ = SolverBadCacheData Pkg.Name V.Version

303+ | SolverBadHttpData Pkg.Name V.Version

304+ | SolverBadHttp Http.Error

305+

306+

307+

308+-- OUTLINE

309+

310+

311+data Outline

312+ = OutlineHasBadStructure (Json.Error OutlineProblem)

313+ | OutlineHasBadSrcDirs FilePath [FilePath]

314+

315+

316+data OutlineProblem

317+ = OP_BadType Utf8.String

318+ | OP_BadPkgName Pkg.BadName

319+ | OP_BadVersion Utf8.String

320+ | OP_BadConstraint C.Error

321+ | OP_BadModuleName Utf8.String

322+ | OP_BadModuleHeaderTooLong Utf8.String

323+ | OP_BadDependencyName Utf8.String

324+ | OP_BadLicense Utf8.String [Utf8.String]

325+ | OP_BadSummaryTooLong

326+ | OP_NoSrcDirs

327+

328+

329+

330+-- DETAILS

331+

332+

333+data Details

334+ = DetailsCorrupt

335+ | DetailsNoSolution

336+ | DetailsNoOfflineSolution

337+ | DetailsSolverProblem Solver

338+ | DetailsBadElmInPkg C.Constraint

339+ | DetailsBadElmInAppOutline V.Version

340+ | DetailsHandEditedDependencies

341+ | DetailsBadOutline Outline

342+ | DetailsCannotGetRegistry RegistryProblem

343+ | DetailsCannotBuildPackage Pkg.Name V.Version PackageProblem

344+

345+

346+data RegistryProblem

347+ = RP_Http Http.Error

348+ | RP_Data

349+

350+

351+data PackageProblem

352+ = PP_BadEndpointRequest Http.Error

353+ | PP_BadEndpointContent

354+ | PP_BadArchiveRequest Http.Error

355+ | PP_BadArchiveContent

356+ | PP_BadArchiveHash String String

357+

358+

359+

360+-- MAKE

361+

362+

363+data Make

364+ = MakeNeedsOutline

365+ | MakeCannotOptimizeAndDebug

366+ | MakeBlockedByDetailsProblem Details

367+ | MakeAppNeedsFileNames

368+ | MakePkgNeedsExposing

369+ | MakeMultipleFilesIntoHtml

370+ | MakeNonMainFilesIntoJavaScript ModuleName.Raw [ModuleName.Raw]

371+ | MakeCannotOptimizeDebugValues ModuleName.Raw [ModuleName.Raw]

372+ | MakeCannotBuild BuildProblem

373+ | MakeCannotLoadArtifacts

374+

375+

376+data BuildProblem

377+ = BuildModuleProblems Error.Module [Error.Module]

378+ | BuildProjectProblem BuildProjectProblem

379+

380+

381+data BuildProjectProblem

382+ = BP_PathUnknown FilePath

383+ | BP_WithBadExtension FilePath

384+ | BP_WithAmbiguousSrcDir FilePath FilePath

385+ | BP_MainPathDuplicate FilePath FilePath

386+ | BP_MainNameDuplicate ModuleName.Raw FilePath FilePath

387+ | BP_CannotLoadDependencies

388+ | BP_Cycle ModuleName.Raw [ModuleName.Raw]

389+

390+

391+

392+-- RENDERERS

393+

394+

395+toString :: Help.Report -> String

396+toString report =

397+ Help.toString (Help.reportToDoc report)

398+

399+

400+toStderr :: Help.Report -> IO ()

401+toStderr report =

402+ Help.toStderr (Help.reportToDoc report)

403+

404+

405+toJson :: Help.Report -> Encode.Value

406+toJson report =

407+ Help.reportToJson report

408+

409+

410+_toReport :: Exit -> Help.Report

411+_toReport exit =

412+ case exit of

413+

414+ -- bump

266415

267416 BumpApplication ->

268417 Help.report "CANNOT BUMP APPLICATIONS" (Just "elm.json")

@@ -274,7 +423,7 @@ bumpToReport bump =

274423 Help.docReport "CANNOT BUMP" (Just "elm.json")

275424 ( D.fillSep

276425 ["Your","elm.json","says","I","should","bump","relative","to","version"

277− ,D.red (D.fromVersion vsn) <> ","

426+ ,D.red (D.fromUtf8 (V.toString vsn)) <> ","

278427 ,"but","I","cannot","find","that","version","on","<https://package.elm-lang.org>."

279428 ,"That","means","there","is","no","API","for","me","to","diff","against","and"

280429 ,"figure","out","if","these","are","MAJOR,","MINOR,","or","PATCH","changes."

@@ -283,116 +432,19 @@ bumpToReport bump =

283432 [ D.fillSep $

284433 ["Try","bumping","again","after","changing","the",D.dullyellow "\"version\"","in","elm.json"]

285434 ++ if length versions == 1 then ["to:"] else ["to","one","of","these:"]

286− , D.vcat $ map (D.green . D.fromVersion) versions

435+ , D.vcat $ map (D.green . D.fromUtf8 . V.toString) versions

287436 ]

288437

289438 BumpMustHaveLatestRegistry problem ->

290− toRegistryProblemReport "PROBLEM UPDATING PACKAGE LIST" problem $

291− "I need the latest list of published packages before I can bump any versions"

292−

293− BumpCannotFindDocs _ version problem ->

294− toDocsProblemReport problem $

295− "I need the docs for " ++ V.toChars version ++ " to compute the next version number"

296−

297− BumpBadDetails details ->

298− toDetailsReport details

299−

300− BumpNoExposed ->

301− Help.docReport "NO EXPOSED MODULES" (Just "elm.json")

302− ( D.fillSep $

303− [ "To", "bump", "a", "package,", "the"

304− , D.dullyellow "\"exposed-modules\"", "field", "of", "your"

305− , "elm.json", "must", "list", "at", "least", "one", "module."

306− ]

307− )

308− [ D.reflow $

309− "Try adding some modules back to the \"exposed-modules\" field."

310− ]

311−

312− BumpBadBuild problem ->

313− toBuildProblemReport problem

314−

315−

316−

317−-- OVERVIEW OF VERSIONING

318−

319−

320−newPackageOverview :: String

321−newPackageOverview =

322− unlines

323− [ "This package has never been published before. Here's how things work:"

324− , ""

325− , " - Versions all have exactly three parts: MAJOR.MINOR.PATCH"

326− , ""

327− , " - All packages start with initial version " ++ V.toChars V.one

328− , ""

329− , " - Versions are incremented based on how the API changes:"

330− , ""

331− , " PATCH = the API is the same, no risk of breaking code"

332− , " MINOR = values have been added, existing values are unchanged"

333− , " MAJOR = existing values have been changed or removed"

334− , ""

335− , " - I will bump versions for you, automatically enforcing these rules"

336− , ""

337− ]

338−

339−

340−

341−-- PUBLISH

342−

343−

344−data Publish

345− = PublishNoOutline

346− | PublishBadOutline Outline

347− | PublishBadDetails Details

348− | PublishMustHaveLatestRegistry RegistryProblem

349− | PublishApplication

350− | PublishNotInitialVersion V.Version

351− | PublishAlreadyPublished V.Version

352− | PublishInvalidBump V.Version V.Version

353− | PublishBadBump V.Version V.Version M.Magnitude V.Version M.Magnitude

354− | PublishNoSummary

355− | PublishNoExposed

356− | PublishNoReadme

357− | PublishShortReadme

358− | PublishNoLicense

359− | PublishBuildProblem BuildProblem

360− | PublishMissingTag V.Version

361− | PublishCannotGetTag V.Version Http.Error

362− | PublishCannotGetTagData V.Version String BS.ByteString

363− | PublishCannotGetZip Http.Error

364− | PublishCannotDecodeZip String

365− | PublishCannotGetDocs V.Version V.Version DocsProblem

366− | PublishCannotRegister Http.Error

367− | PublishNoGit

368− | PublishLocalChanges V.Version

369− --

370− | PublishZipBadDetails Details

371− | PublishZipApplication

372− | PublishZipNoExposed

373− | PublishZipBuildProblem BuildProblem

374−

375−

376−publishToReport :: Publish -> Help.Report

377−publishToReport publish =

378− case publish of

379− PublishNoOutline ->

380− Help.report "PUBLISH WHAT?" Nothing

381− "I cannot find an elm.json so I am not sure what you want me to publish."

382− [ D.reflow $

383− "Elm packages always have an elm.json that states the version number,\

384− \ dependencies, exposed modules, etc."

385− ]

439+ error "TODO BumpMustHaveLatestRegistry" problem

386440

387− PublishBadOutline outline ->

388− toOutlineReport outline

441+ BumpCannotFindDocs name version problem ->

442+ error "TODO BumpCannotFindDocs" name version problem

389443

390− PublishBadDetails problem ->

391− toDetailsReport problem

444+ -- publish

392445

393446 PublishMustHaveLatestRegistry problem ->

394− toRegistryProblemReport "PROBLEM UPDATING PACKAGE LIST" problem $

395− "I need the latest list of published packages to make sure this is safe to publish"

447+ error "TODO PublishMustHaveLatestRegistry" problem

396448

397449 PublishApplication ->

398450 Help.report "UNPUBLISHABLE" Nothing "I cannot publish applications, only packages!" []

@@ -401,7 +453,7 @@ publishToReport publish =

401453 Help.docReport "INVALID VERSION" Nothing

402454 ( D.fillSep

403455 ["I","cannot","publish"

404− ,D.red (D.fromVersion vsn)

456+ ,D.red (D.fromUtf8 (V.toString vsn))

405457 ,"as","the","initial","version."

406458 ]

407459 )

@@ -415,7 +467,7 @@ publishToReport publish =

415467 Help.docReport "ALREADY PUBLISHED" Nothing

416468 ( D.vcat

417469 [ D.fillSep

418− [ "Version", D.green (D.fromVersion vsn)

470+ [ "Version", D.green (D.fromUtf8 (V.toString vsn))

419471 , "has", "already", "been", "published.", "You", "cannot"

420472 , "publish", "it", "again!"

421473 ]

@@ -432,14 +484,14 @@ publishToReport publish =

432484 Help.docReport "INVALID VERSION" (Just "elm.json")

433485 ( D.fillSep $

434486 ["Your","elm.json","says","the","next","version","should","be"

435− ,D.red (D.fromVersion statedVersion) <> ","

487+ ,D.red (D.fromUtf8 (V.toString statedVersion)) <> ","

436488 ,"but","that","is","not","valid","based","on","the","previously"

437489 ,"published","versions."

438490 ]

439491 )

440492 [ D.fillSep $

441493 ["Change","the","version","back","to"

442− ,D.green (D.fromVersion latestVersion)

494+ ,D.green (D.fromUtf8 (V.toString latestVersion))

443495 ,"which","is","the","most","recently","published","version."

444496 ,"From","there,","have","Elm","bump","the","version","by","running:"

445497 ]

@@ -454,7 +506,7 @@ publishToReport publish =

454506 (

455507 D.fillSep $

456508 ["Your","elm.json","says","the","next","version","should","be"

457− ,D.red (D.fromVersion new) <> ","

509+ ,D.red (D.fromUtf8 (V.toString new)) <> ","

458510 ,"indicating","a",D.fromChars (M.toChars magnitude)

459511 ,"change","to","the","public","API."

460512 ,"This","does","not","match","the","API","diff","given","by:"

@@ -467,7 +519,7 @@ publishToReport publish =

467519 ["This","command","says","this","is","a"

468520 ,D.fromChars (M.toChars realMagnitude)

469521 ,"change,","so","the","next","version","should","be"

470− ,D.green (D.fromVersion realNew) <> "."

522+ ,D.green (D.fromUtf8 (V.toString realNew)) <> "."

471523 ,"Double","check","everything","to","make","sure","you"

472524 ,"are","publishing","what","you","want!"

473525 ]

@@ -497,17 +549,16 @@ publishToReport publish =

497549 ]

498550 )

499551 [ D.reflow $

500− "Which modules do you want users of the package to have access to? Add their\

501− \ names to the \"exposed-modules\" list."

552+ "What is the point of a package that has no modules?!"

502553 ]

503554

504555 PublishNoReadme ->

505− toBadReadmeReport "NO README" $

556+ badReadmeReport "NO README" $

506557 "Every published package must have a helpful README.md\

507558 \ file, but I do not see one in your project."

508559

509560 PublishShortReadme ->

510− toBadReadmeReport "SHORT README" $

561+ badReadmeReport "SHORT README" $

511562 "This README.md is too short. Having more details will help\

512563 \ people assess your package quickly and fairly."

513564

@@ -524,8 +575,20 @@ publishToReport publish =

524575 \ named LICENSE. Add that file and you will be all set!"

525576 ]

526577

527− PublishBuildProblem buildProblem ->

528− toBuildProblemReport buildProblem

578+ PublishCannotGetTag httpError ->

579+ error "TODO PublishCannotGetTag" httpError

580+

581+ PublishCannotGetZip httpError ->

582+ error "TODO PublishCannotGetZip" httpError

583+

584+ PublishCannotDecodeZip ->

585+ error "TODO PublishCannotDecodeZip"

586+

587+ PublishCannotGetDocs docsProblem ->

588+ error "TODO PublishCannotGetDocs" docsProblem

589+

590+ PublishCannotRegister httpError ->

591+ error "TODO PublishCannotRegister" httpError

529592

530593 PublishMissingTag version ->

531594 let vsn = V.toChars version in

@@ -546,82 +609,18 @@ publishToReport publish =

546609 , "The -m flag is for a helpful message. Try to make it more informative!"

547610 ]

548611

549− PublishCannotGetTag version httpError ->

550− case httpError of

551− Http.BadHttp _ (HTTP.StatusCodeException response _)

552− | HTTP.statusCode (HTTP.responseStatus response) == 404 ->

553− let vsn = V.toChars version in

554− Help.report "NO TAG ON GITHUB" Nothing

555− ("You have version " ++ vsn ++ " tagged locally, but not on GitHub.")

556− [ D.reflow

557− "Run the following command to make this tag available on GitHub:"

558− , D.indent 4 $ D.dullyellow $ D.fromChars $

559− "git push origin " ++ vsn

560− , D.reflow

561− "This will make it possible to find your code online based on the version number."

562− ]

563−

564− _ ->

565− toHttpErrorReport "PROBLEM VERIFYING TAG" httpError

566− "I need to check that the version tag is registered on GitHub"

567−

568− PublishCannotGetTagData version url body ->

569− Help.report "PROBLEM VERIFYING TAG" Nothing

570− ("I need to check that version " ++ V.toChars version ++ " is tagged on GitHub, so I fetched:")

571− [ D.indent 4 $ D.dullyellow $ D.fromChars url

572− , D.reflow $

573− "I got the data back, but it was not what I was expecting. The response\

574− \ body contains " ++ show (BS.length body) ++ " bytes. Here is the "

575− ++ if BS.length body <= 76 then "whole thing:" else "beginning:"

576− , D.indent 4 $ D.dullyellow $ D.fromChars $

577− if BS.length body <= 76

578− then BS_UTF8.toString body

579− else take 73 (BS_UTF8.toString body) ++ "..."

580− , D.reflow $

581− "Does this error keep showing up? Maybe there is something weird with your\

582− \ internet connection. We have gotten reports that schools, businesses,\

583− \ airports, etc. sometimes intercept requests and add things to the body\

584− \ or change its contents entirely. Could that be the problem?"

585− ]

586−

587− PublishCannotGetZip httpError ->

588− toHttpErrorReport "PROBLEM DOWNLOADING CODE" httpError $

589− "I need to check that folks can download and build the source code when they\

590− \ install this package"

591−

592− PublishCannotDecodeZip url ->

593− Help.report "PROBLEM DOWNLOADING CODE" Nothing

594− "I need to check that folks can download and build the source code when they\

595− \ install this package, so I downloaded the code from:"

596− [ D.indent 4 $ D.dullyellow $ D.fromChars url

597− , D.reflow $

598− "I was unable to unzip the archive though. Maybe there is something weird with\

599− \ your internet connection. We have gotten reports that schools, businesses,\

600− \ airports, etc. sometimes intercept requests and add things to the body or\

601− \ change its contents entirely. Could that be the problem?"

602− ]

603−

604− PublishCannotGetDocs old new docsProblem ->

605− toDocsProblemReport docsProblem $

606− "I need the docs for " ++ V.toChars old ++ " to verify that "

607− ++ V.toChars new ++ " really does come next"

608−

609− PublishCannotRegister httpError ->

610− toHttpErrorReport "PROBLEM PUBLISHING PACKAGE" httpError $

611− "I need to send information about your package to the package website"

612−

613− PublishNoGit ->

614− Help.report "NO GIT" Nothing

615− "I searched your PATH environment variable for `git` and could not\

616− \ find it. Is it available through your PATH?"

617− [ D.reflow $

618− "Who cares about this? Well, I currently use `git` to check if there\

619− \ are any local changes in your code. Local changes are a good sign\

620− \ that some important improvements have gotten mistagged, so this\

621− \ check can be extremely helpful for package authors!"

622− , D.toSimpleNote $

623− "We plan to do this without the `git` binary in a future release."

624− ]

612+ PublishNoGit ->

613+ Help.report "NO GIT" Nothing

614+ "I searched your PATH environment variable for `git` and could not\

615+ \ find it. Is it available through your PATH?"

616+ [ D.reflow $

617+ "Who cares about this? Well, I currently use `git` to check if there\

618+ \ are any local changes in your code. Local changes are a good sign\

619+ \ that some important improvements have gotten mistagged, so this\

620+ \ check can be extremely helpful for package authors!"

621+ , D.toSimpleNote $

622+ "We plan to do this without the `git` binary in a future release."

623+ ]

625624

626625 PublishLocalChanges version ->

627626 let vsn = V.toChars version in

@@ -639,21 +638,9 @@ publishToReport publish =

639638 ++ vsn ++ "` and publish your code from there."

640639 ]

641640

642− PublishZipBadDetails _ ->

643− badZipReport

644−

645− PublishZipApplication ->

646− badZipReport

647−

648− PublishZipNoExposed ->

649− badZipReport

650−

651− PublishZipBuildProblem _ ->

652− badZipReport

653−

654641

655−toBadReadmeReport :: String -> String -> Help.Report

656−toBadReadmeReport title summary =

642+badReadmeReport :: String -> String -> Help.Report

643+badReadmeReport title summary =

657644 Help.report title (Just "README.md") summary

658645 [ D.reflow $

659646 "When people look at your README, they are wondering:"

@@ -666,653 +653,32 @@ toBadReadmeReport title summary =

666653 \ most common usage scenario. Show people what they can expect if\

667654 \ they learn more!"

668655 , D.toSimpleNote $

669− "By publishing your package, you are inviting people to invest time in\

670− \ understanding your work. Spending an hour on your README to communicate your\

671− \ knowledge more clearly can save the community days or weeks of time in\

672− \ aggregate, and saving time in aggregate is the whole point of publishing\

673− \ packages! People really appreciate it, and it makes the whole ecosystem feel\

674− \ nicer!"

656+ "By publishing your package, you are inviting people to invest time\

657+ \ in understanding your work. Spending an hour to communicate your\

658+ \ knowledge more clearly can save the community days or weeks of time\

659+ \ in aggregate, and saving time in aggregate is the whole point of\

660+ \ publishing packages! People really appreciate it, and it makes the\

661+ \ whole ecosystem feel nicer!"

675662 ]

676663

677664

678−badZipReport :: Help.Report

679−badZipReport =

680− Help.report "PROBLEM VERIFYING PACKAGE" Nothing

681− "Before publishing packages, I download the code from GitHub and try to build it\

682− \ from scratch. That way I can be more confident that it will work for other\

683− \ people too. But I am not able to build it!"

684− [ D.reflow $

685− "I was just able to build your local copy though. Is there some way the version\

686− \ on GitHub could be different?"

687− ]

688−

689−

690−

691−-- DOCS

692−

693−

694−data DocsProblem

695− = DP_Http Http.Error

696− | DP_Data String BS.ByteString

697− | DP_Cache

698−

699−

700−toDocsProblemReport :: DocsProblem -> String -> Help.Report

701−toDocsProblemReport problem context =

702− case problem of

703− DP_Http httpError ->

704− toHttpErrorReport "PROBLEM LOADING DOCS" httpError context

705−

706− DP_Data url body ->

707− Help.report "PROBLEM LOADING DOCS" Nothing (context ++ ", so I fetched:")

708− [ D.indent 4 $ D.dullyellow $ D.fromChars url

709− , D.reflow $

710− "I got the data back, but it was not what I was expecting. The response\

711− \ body contains " ++ show (BS.length body) ++ " bytes. Here is the "

712− ++ if BS.length body <= 76 then "whole thing:" else "beginning:"

713− , D.indent 4 $ D.dullyellow $ D.fromChars $

714− if BS.length body <= 76

715− then BS_UTF8.toString body

716− else take 73 (BS_UTF8.toString body) ++ "..."

717− , D.reflow $

718− "Does this error keep showing up? Maybe there is something weird with your\

719− \ internet connection. We have gotten reports that schools, businesses,\

720− \ airports, etc. sometimes intercept requests and add things to the body\

721− \ or change its contents entirely. Could that be the problem?"

722− ]

723−

724− DP_Cache ->

725− Help.report "PROBLEM LOADING DOCS" Nothing (context ++ ", but the local copy seems to be corrupted.")

726− [ D.reflow $

727− "I deleted the cached version, so the next run should download a fresh copy of\

728− \ the docs. Hopefully that will get you unstuck, but it will not resolve the root\

729− \ problem if, for example, a 3rd party editor plugin is modifing cached files\

730− \ for some reason."

731− ]

732−

733−

734−

735−-- INSTALL

736−

737−

738−data Install

739− = InstallNoOutline

740− | InstallBadOutline Outline

741− | InstallBadRegistry RegistryProblem

742− | InstallNoArgs FilePath

743− | InstallNoOnlineAppSolution Pkg.Name

744− | InstallNoOfflineAppSolution Pkg.Name

745− | InstallNoOnlinePkgSolution Pkg.Name

746− | InstallNoOfflinePkgSolution Pkg.Name

747− | InstallHadSolverTrouble Solver

748− | InstallUnknownPackageOnline Pkg.Name [Pkg.Name]

749− | InstallUnknownPackageOffline Pkg.Name [Pkg.Name]

750− | InstallBadDetails Details

751−

752−

753−installToReport :: Install -> Help.Report

754−installToReport exit =

755− case exit of

756− InstallNoOutline ->

757− Help.report "NEW PROJECT?" Nothing

758− "Are you trying to start a new project? Try this command instead:"

759− [ D.indent 4 $ D.green "elm init"

760− , D.reflow "It will help you get started!"

761− ]

762−

763− InstallBadOutline outline ->

764− toOutlineReport outline

765−

766− InstallBadRegistry problem ->

767− toRegistryProblemReport "PROBLEM LOADING PACKAGE LIST" problem $

768− "I need the list of published packages to figure out how to install things"

769−

770− InstallNoArgs elmHome ->

771− Help.report "INSTALL WHAT?" Nothing

772− "I am expecting commands like:"

773− [ D.green $ D.indent 4 $ D.vcat $

774− [ "elm install elm/http"

775− , "elm install elm/json"

776− , "elm install elm/random"

777− ]

778− , D.toFancyHint

779− ["In","JavaScript","folks","run","`npm install`","to","start","projects."

780− ,"\"Gotta","download","everything!\"","But","why","download","packages"

781− ,"again","and","again?","Instead,","Elm","caches","packages","in"

782− ,D.dullyellow (D.fromChars elmHome)

783− ,"so","each","one","is","downloaded","and","built","ONCE","on","your","machine."

784− ,"Elm","projects","check","that","cache","before","trying","the","internet."

785− ,"This","reduces","build","times,","reduces","server","costs,","and","makes","it"

786− ,"easier","to","work","offline.","As","a","result"

787− ,D.dullcyan "elm install","is","only","for","adding","dependencies","to","elm.json,"

788− ,"whereas",D.dullcyan "elm make","is","in","charge","of","gathering","dependencies"

789− ,"and","building","everything.","So","maybe","try",D.green "elm make","instead?"

790− ]

791− ]

792−

793− InstallNoOnlineAppSolution pkg ->

794− Help.report "CANNOT FIND COMPATIBLE VERSION" (Just "elm.json")

795− (

796− "I cannot find a version of " ++ Pkg.toChars pkg ++ " that is compatible\

797− \ with your existing dependencies."

798− )

799− [ D.reflow $

800− "I checked all the published versions. When that failed, I tried to find any\

801− \ compatible combination of these packages, even if it meant changing all your\

802− \ existing dependencies! That did not work either!"

803− , D.reflow $

804− "This is most likely to happen when a package is not upgraded yet. Maybe a new\

805− \ version of Elm came out recently? Maybe a common package was changed recently?\

806− \ Maybe a better package came along, so there was no need to upgrade this one?\

807− \ Try asking around https://elm-lang.org/community to learn what might be going on\

808− \ with this package."

809− , D.toSimpleNote $

810− "Whatever the case, please be kind to the relevant package authors! Having\

811− \ friendly interactions with users is great motivation, and conversely, getting\

812− \ berated by strangers on the internet sucks your soul dry. Furthermore, package\

813− \ authors are humans with families, friends, jobs, vacations, responsibilities,\

814− \ goals, etc. They face obstacles outside of their technical work you will never\

815− \ know about, so please assume the best and try to be patient and supportive!"

816− ]

817−

818− InstallNoOfflineAppSolution pkg ->

819− Help.report "CANNOT FIND COMPATIBLE VERSION LOCALLY" (Just "elm.json")

820− (

821− "I cannot find a version of " ++ Pkg.toChars pkg ++ " that is compatible\

822− \ with your existing dependencies."

823− )

824− [ D.reflow $

825− "I was not able to connect to https://package.elm-lang.org/ though, so I was only\

826− \ able to look through packages that you have downloaded in the past."

827− , D.reflow $

828− "Try again later when you have internet!"

829− ]

830−

831− InstallNoOnlinePkgSolution pkg ->

832− Help.report "CANNOT FIND COMPATIBLE VERSION" (Just "elm.json")

833− (

834− "I cannot find a version of " ++ Pkg.toChars pkg ++ " that is compatible\

835− \ with your existing constraints."

836− )

837− [ D.reflow $

838− "With applications, I try to broaden the constraints to see if anything works,\

839− \ but messing with package constraints is much more delicate business. E.g. making\

840− \ your constraints stricter may make it harder for applications to find compatible\

841− \ dependencies. So fixing something here may break it for a lot of other people!"

842− , D.reflow $

843− "So I recommend making an application with the same dependencies as your package.\

844− \ See if there is a solution at all. From there it may be easier to figure out\

845− \ how to proceed in a way that will disrupt your users as little as possible. And\

846− \ the solution may be to help other package authors to get their packages updated,\

847− \ or to drop a dependency entirely."

848− ]

849−

850− InstallNoOfflinePkgSolution pkg ->

851− Help.report "CANNOT FIND COMPATIBLE VERSION LOCALLY" (Just "elm.json")

852− (

853− "I cannot find a version of " ++ Pkg.toChars pkg ++ " that is compatible\

854− \ with your existing constraints."

855− )

856− [ D.reflow $

857− "I was not able to connect to https://package.elm-lang.org/ though, so I was only\

858− \ able to look through packages that you have downloaded in the past."

859− , D.reflow $

860− "Try again later when you have internet!"

861− ]

862−

863− InstallHadSolverTrouble solver ->

864− toSolverReport solver

865−

866− InstallUnknownPackageOnline pkg suggestions ->

867− Help.docReport "UNKNOWN PACKAGE" Nothing

868− (

869− D.fillSep

870− ["I","cannot","find","a","package","named",D.red (D.fromPackage pkg) <> "."]

871− )

872− [ D.reflow $

873− "I looked through https://package.elm-lang.org for packages with similar names\

874− \ and found these:"

875− , D.indent 4 $ D.dullyellow $ D.vcat $ map D.fromPackage suggestions

876− , D.reflow $ "Maybe you want one of these instead?"

877− ]

878−

879− InstallUnknownPackageOffline pkg suggestions ->

880− Help.docReport "UNKNOWN PACKAGE" Nothing

881− (

882− D.fillSep

883− ["I","cannot","find","a","package","named",D.red (D.fromPackage pkg) <> "."]

884− )

885− [ D.reflow $

886− "I could not connect to https://package.elm-lang.org though, so new packages may\

887− \ have been published since I last updated my local cache of package names."

888− , D.reflow $

889− "Looking through the locally cached names, the closest ones are:"

890− , D.indent 4 $ D.dullyellow $ D.vcat $ map D.fromPackage suggestions

891− , D.reflow $ "Maybe you want one of these instead?"

892− ]

893−

894− InstallBadDetails details ->

895− toDetailsReport details

896−

897−

898−

899−-- SOLVER

900−

901−

902−data Solver

903− = SolverBadCacheData Pkg.Name V.Version

904− | SolverBadHttpData Pkg.Name V.Version String

905− | SolverBadHttp Pkg.Name V.Version Http.Error

906−

907−

908−toSolverReport :: Solver -> Help.Report

909−toSolverReport problem =

910− case problem of

911− SolverBadCacheData pkg vsn ->

912− Help.report "PROBLEM SOLVING PACKAGE CONSTRAINTS" Nothing

913− (

914− "I need the elm.json of " ++ Pkg.toChars pkg ++ " " ++ V.toChars vsn ++ " to\

915− \ help me search for a set of compatible packages. I had it cached locally, but\

916− \ it looks like the file was corrupted!"

917− )

918− [ D.reflow $

919− "I deleted the cached version, so the next run should download a fresh copy.\

920− \ Hopefully that will get you unstuck, but it will not resolve the root\

921− \ problem if a 3rd party tool is modifing cached files for some reason."

922− ]

923−

924− SolverBadHttpData pkg vsn url ->

925− Help.report "PROBLEM SOLVING PACKAGE CONSTRAINTS" Nothing

926− (

927− "I need the elm.json of " ++ Pkg.toChars pkg ++ " " ++ V.toChars vsn ++ " to\

928− \ help me search for a set of compatible packages, but I ran into corrupted\

929− \ information from:"

930− )

931− [ D.indent 4 $ D.dullyellow $ D.fromChars url

932− , D.reflow $

933− "Is something weird with your internet connection. We have gotten reports that\

934− \ schools, businesses, airports, etc. sometimes intercept requests and add things\

935− \ to the body or change its contents entirely. Could that be the problem?"

936− ]

937−

938− SolverBadHttp pkg vsn httpError ->

939− toHttpErrorReport "PROBLEM SOLVING PACKAGE CONSTRAINTS" httpError $

940− "I need the elm.json of " ++ Pkg.toChars pkg ++ " " ++ V.toChars vsn

941− ++ " to help me search for a set of compatible packages"

942−

943−

944−

945−-- OUTLINE

946−

947−

948−data Outline

949− = OutlineHasBadStructure (Decode.Error OutlineProblem)

950− | OutlineHasMissingSrcDirs FilePath [FilePath]

951− | OutlineHasDuplicateSrcDirs FilePath FilePath FilePath

952− | OutlineNoPkgCore

953− | OutlineNoAppCore

954− | OutlineNoAppJson

955−

956−

957−data OutlineProblem

958− = OP_BadType

959− | OP_BadPkgName Row Col

960− | OP_BadVersion Row Col

961− | OP_BadConstraint C.Error

962− | OP_BadModuleName Row Col

963− | OP_BadModuleHeaderTooLong

964− | OP_BadDependencyName Row Col

965− | OP_BadLicense Json.String [Json.String]

966− | OP_BadSummaryTooLong

967− | OP_NoSrcDirs

968−

969−

970−toOutlineReport :: Outline -> Help.Report

971−toOutlineReport problem =

972− case problem of

973− OutlineHasBadStructure decodeError ->

974− Json.toReport "elm.json" (Json.FailureToReport toOutlineProblemReport) decodeError $

975− Json.ExplicitReason "I ran into a problem with your elm.json file."

976−

977− OutlineHasMissingSrcDirs dir dirs ->

978− case dirs of

979− [] ->

980− Help.report "MISSING SOURCE DIRECTORY" (Just "elm.json")

981− "I need a valid elm.json file, but the \"source-directories\" field lists the following directory:"

982− [ D.indent 4 $ D.red $ D.fromChars dir

983− , D.reflow $

984− "I cannot find it though. Is it missing? Is there a typo?"

985− ]

986−

987− _:_ ->

988− Help.report "MISSING SOURCE DIRECTORIES" (Just "elm.json")

989− "I need a valid elm.json file, but the \"source-directories\" field lists the following directories:"

990− [ D.indent 4 $ D.vcat $

991− map (D.red . D.fromChars) (dir:dirs)

992− , D.reflow $

993− "I cannot find them though. Are they missing? Are there typos?"

994− ]

995−

996− OutlineHasDuplicateSrcDirs canonicalDir dir1 dir2 ->

997− if dir1 == dir2 then

998− Help.report "REDUNDANT SOURCE DIRECTORIES" (Just "elm.json")

999− "I need a valid elm.json file, but the \"source-directories\" field lists the same directory twice:"

1000− [ D.indent 4 $ D.vcat $

1001− map (D.red . D.fromChars) [dir1,dir2]

1002− , D.reflow $

1003− "Remove one of the entries!"

1004− ]

1005− else

1006− Help.report "REDUNDANT SOURCE DIRECTORIES" (Just "elm.json")

1007− "I need a valid elm.json file, but the \"source-directories\" field has some redundant directories:"

1008− [ D.indent 4 $ D.vcat $

1009− map (D.red . D.fromChars) [dir1,dir2]

1010− , D.reflow $

1011− "These are two different ways of refering to the same directory:"

1012− , D.indent 4 $ D.dullyellow $ D.fromChars canonicalDir

1013− , D.reflow $

1014− "Remove one of the redundant entries from your \"source-directories\" field."

1015− ]

1016−

1017− OutlineNoPkgCore ->

1018− Help.report "MISSING DEPENDENCY" (Just "elm.json")

1019− "I need to see an \"elm/core\" dependency your elm.json file. The default imports\

1020− \ of `List` and `Maybe` do not work without it."

1021− [ D.reflow $

1022− "If you modified your elm.json by hand, try to change it back! And if you are\

1023− \ having trouble getting back to a working elm.json, it may be easier to find a\

1024− \ working package and start fresh with their elm.json file."

1025− ]

1026−

1027− OutlineNoAppCore ->

1028− Help.report "MISSING DEPENDENCY" (Just "elm.json")

1029− "I need to see an \"elm/core\" dependency your elm.json file. The default imports\

1030− \ of `List` and `Maybe` do not work without it."

1031− [ D.reflow $

1032− "If you modified your elm.json by hand, try to change it back! And if you are\

1033− \ having trouble getting back to a working elm.json, it may be easier to delete it\

1034− \ and use `elm init` to start fresh."

1035− ]

1036−

1037− OutlineNoAppJson ->

1038− Help.report "MISSING DEPENDENCY" (Just "elm.json")

1039− "I need to see an \"elm/json\" dependency your elm.json file. It helps me handle\

1040− \ flags and ports."

1041− [ D.reflow $

1042− "If you modified your elm.json by hand, try to change it back! And if you are\

1043− \ having trouble getting back to a working elm.json, it may be easier to delete it\

1044− \ and use `elm init` to start fresh."

1045− ]

1046−

1047−

1048−toOutlineProblemReport :: FilePath -> Code.Source -> Json.Context -> A.Region -> OutlineProblem -> Help.Report

1049−toOutlineProblemReport path source _ region problem =

1050− let

1051− toHighlight row col =

1052− Just $ A.Region (A.Position row col) (A.Position row col)

1053−

1054− toSnippet title highlight pair =

1055− Help.jsonReport title (Just path) $

1056− Code.toSnippet source region highlight pair

1057− in

1058− case problem of

1059− OP_BadType ->

1060− toSnippet "UNEXPECTED TYPE" Nothing

1061− ( D.reflow $

1062− "I got stuck while reading your elm.json file. I cannot handle a \"type\" like this:"

1063− , D.fillSep

1064− ["Try","changing","the","\"type\"","to"

1065− ,D.green "\"application\"","or",D.green "\"package\"","instead."

1066− ]

1067− )

1068−

1069− OP_BadPkgName row col ->

1070− toSnippet "INVALID PACKAGE NAME" (toHighlight row col)

1071− ( D.reflow $

1072− "I got stuck while reading your elm.json file. I ran into trouble with the package name:"

1073− , D.stack

1074− [ D.fillSep

1075− ["Package","names","are","always","written","as"

1076− ,D.green "\"author/project\""

1077− ,"so","I","am","expecting","to","see","something","like:"

1078− ]

1079− , D.dullyellow $ D.indent 4 $ D.vcat $

1080− [ "\"mdgriffith/elm-ui\""

1081− , "\"w0rm/elm-physics\""

1082− , "\"Microsoft/elm-json-tree-view\""

1083− , "\"FordLabs/elm-star-rating\""

1084− , "\"1602/json-schema\""

1085− ]

1086− , D.reflow

1087− "The author name should match your GitHub name exactly, and the project name\

1088− \ needs to follow these rules:"

1089− , D.indent 4 $ D.vcat $

1090− [ "+--------------------------------------+-----------+-----------+"

1091− , "| RULE | BAD | GOOD |"

1092− , "+--------------------------------------+-----------+-----------+"

1093− , "| only lower case, digits, and hyphens | elm-HTTP | elm-http |"

1094− , "| no leading digits | 3D | elm-3d |"

1095− , "| no non-ASCII characters | elm-bjørn | elm-bear |"

1096− , "| no underscores | elm_ui | elm-ui |"

1097− , "| no double hyphens | elm--hash | elm-hash |"

1098− , "| no starting or ending hyphen | -elm-tar- | elm-tar |"

1099− , "+--------------------------------------+-----------+-----------+"

1100− ]

1101− , D.toSimpleNote $

1102− "These rules only apply to the project name, so you should never need\

1103− \ to change your GitHub name!"

1104− ]

1105− )

1106−

1107− OP_BadVersion row col ->

1108− toSnippet "PROBLEM WITH VERSION" (toHighlight row col)

1109− ( D.reflow $

1110− "I got stuck while reading your elm.json file. I was expecting a version number here:"

1111− , D.fillSep

1112− ["I","need","something","like",D.green "\"1.0.0\"","or",D.green "\"2.0.4\""

1113− ,"that","explicitly","states","all","three","numbers!"

1114− ]

1115− )

1116−

1117− OP_BadConstraint constraintError ->

1118− case constraintError of

1119− C.BadFormat row col ->

1120− toSnippet "PROBLEM WITH CONSTRAINT" (toHighlight row col)

1121− ( D.reflow $

1122− "I got stuck while reading your elm.json file. I do not understand this version constraint:"

1123− , D.stack

1124− [ D.fillSep

1125− ["I","need","something","like",D.green "\"1.0.0 <= v < 2.0.0\""

1126− ,"that","explicitly","lists","the","lower","and","upper","bounds."

1127− ]

1128− , D.toSimpleNote $

1129− "The spaces in there are required! Taking them out will confuse me. Adding\

1130− \ extra spaces confuses me too. I recommend starting with a valid example\

1131− \ and just changing the version numbers."

1132− ]

1133− )

1134−

1135− C.InvalidRange before after ->

1136− if before == after then

1137− toSnippet "PROBLEM WITH CONSTRAINT" Nothing

1138− ( D.reflow $

1139− "I got stuck while reading your elm.json file. I ran into an invalid version constraint:"

1140− , D.fillSep

1141− ["Elm","checks","that","all","package","APIs","follow","semantic","versioning,"

1142− ,"so","it","is","best","to","use","wide","constraints.","I","recommend"

1143− ,D.green $ "\"" <> D.fromVersion before <> " <= v < " <> D.fromVersion (V.bumpMajor after) <> "\""

1144− ,"since","it","is","guaranteed","that","breaking","API","changes","cannot"

1145− ,"happen","in","any","of","the","versions","in","that","range."

1146− ]

1147− )

1148−

1149− else

1150− toSnippet "PROBLEM WITH CONSTRAINT" Nothing

1151− ( D.reflow $

1152− "I got stuck while reading your elm.json file. I ran into an invalid version constraint:"

1153− , D.fillSep

1154− ["Maybe","you","want","something","like"

1155− ,D.green $ "\"" <> D.fromVersion before <> " <= v < " <> D.fromVersion (V.bumpMajor before) <> "\""

1156− ,"instead?","Elm","checks","that","all","package","APIs","follow","semantic"

1157− ,"versioning,","so","it","is","guaranteed","that","breaking","API","changes"

1158− ,"cannot","happen","in","any","of","the","versions","in","that","range."

1159− ]

1160− )

1161−

1162− OP_BadModuleName row col ->

1163− toSnippet "PROBLEM WITH MODULE NAME" (toHighlight row col)

1164− ( D.reflow $

1165− "I got stuck while reading your elm.json file. I was expecting a module name here:"

1166− , D.fillSep

1167− ["I","need","something","like",D.green "\"Html.Events\""

1168− ,"or",D.green "\"Browser.Navigation\""

1169− ,"where","each","segment","starts","with","a","capital"

1170− ,"letter","and","the","segments","are","separated","by","dots."

1171− ]

1172− )

1173−

1174− OP_BadModuleHeaderTooLong ->

1175− toSnippet "HEADER TOO LONG" Nothing

1176− ( D.reflow $

1177− "I got stuck while reading your elm.json file. This section header is too long:"

1178− , D.stack

1179− [ D.fillSep

1180− ["I","need","it","to","be"

1181− ,D.green "under",D.green "20",D.green "bytes"

1182− ,"so","it","renders","nicely","on","the","package","website!"

1183− ]

1184− , D.toSimpleNote

1185− "I count the length in bytes, so using non-ASCII characters costs extra.\

1186− \ Please report your case at https://github.com/elm/compiler/issues if this seems\

1187− \ overly restrictive for your needs."

1188− ]

1189− )

1190−

1191− OP_BadDependencyName row col ->

1192− toSnippet "PROBLEM WITH DEPENDENCY NAME" (toHighlight row col)

1193− ( D.reflow $

1194− "I got stuck while reading your elm.json file. There is something wrong with this dependency name:"

1195− , D.stack

1196− [ D.fillSep

1197− ["Package","names","always","include","the","name","of","the","author,"

1198− ,"so","I","am","expecting","to","see","dependencies","like"

1199− ,D.dullyellow "\"mdgriffith/elm-ui\"","and"

1200− ,D.dullyellow "\"Microsoft/elm-json-tree-view\"" <> "."

1201− ]

1202− , D.fillSep $

1203− ["I","generally","recommend","finding","the","package","you","want","on"

1204− ,"the","package","website,","and","installing","it","with","the"

1205− ,D.green "elm install","command!"

1206− ]

1207− ]

1208− )

1209−

1210− OP_BadLicense _ suggestions ->

1211− toSnippet "UNKNOWN LICENSE" Nothing

1212− ( D.reflow $

1213− "I got stuck while reading your elm.json file. I do not know about this type of license:"

1214− ,

1215− D.stack

1216− [ D.fillSep

1217− ["Elm","packages","generally","use"

1218− ,D.green "\"BSD-3-Clause\"","or",D.green "\"MIT\"" <> ","

1219− ,"but","I","accept","any","OSI","approved","SPDX","license."

1220− ,"Here","some","that","seem","close","to","what","you","wrote:"

1221− ]

1222− , D.indent 4 $ D.dullyellow $ D.vcat $ map (D.fromChars . Json.toChars) suggestions

1223− , D.reflow $

1224− "Check out https://spdx.org/licenses/ for the full list of options."

1225− ]

1226− )

1227−

1228− OP_BadSummaryTooLong ->

1229− toSnippet "SUMMARY TOO LONG" Nothing

1230− ( D.reflow $

1231− "I got stuck while reading your elm.json file. Your \"summary\" is too long:"

1232− , D.stack

1233− [ D.fillSep

1234− ["I","need","it","to","be"

1235− ,D.green "under",D.green "80",D.green "bytes"

1236− ,"so","it","renders","nicely","on","the","package","website!"

1237− ]

1238− , D.toSimpleNote

1239− "I count the length in bytes, so using non-ASCII characters costs extra.\

1240− \ Please report your case at https://github.com/elm/compiler/issues if this seems\

1241− \ overly restrictive for your needs."

1242− ]

1243− )

1244−

1245− OP_NoSrcDirs ->

1246− toSnippet "NO SOURCE DIRECTORIES" Nothing

1247− ( D.reflow $

1248− "I got stuck while reading your elm.json file. You do not have any \"source-directories\" listed here:"

1249− , D.fillSep

1250− ["I","need","something","like",D.green "[\"src\"]"

1251− ,"so","I","know","where","to","look","for","your","modules!"

1252− ]

1253− )

1254−

1255−

1256−

1257−-- DETAILS

1258665

1259−

1260−data Details

1261− = DetailsNoSolution

1262− | DetailsNoOfflineSolution

1263− | DetailsSolverProblem Solver

1264− | DetailsBadElmInPkg C.Constraint

1265− | DetailsBadElmInAppOutline V.Version

1266− | DetailsHandEditedDependencies

1267− | DetailsBadOutline Outline

1268− | DetailsCannotGetRegistry RegistryProblem

1269− | DetailsBadDeps FilePath [DetailsBadDep]

1270−

1271−

1272−data DetailsBadDep

1273− = BD_BadDownload Pkg.Name V.Version PackageProblem

1274− | BD_BadBuild Pkg.Name V.Version (Map.Map Pkg.Name V.Version)

666+-- DETAILS TO REPORT

1275667

1276668

1277−toDetailsReport :: Details -> Help.Report

1278−toDetailsReport details =

669+detailsToReport :: Details -> Help.Report

670+detailsToReport details =

1279671 case details of

1280− DetailsNoSolution ->

1281− Help.report "INCOMPATIBLE DEPENDENCIES" (Just "elm.json")

1282− "The dependencies in your elm.json are not compatible."

1283− [ D.fillSep

1284− ["Did","you","change","them","by","hand?","Try","to","change","it","back!"

1285− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."

1286− ]

1287− , D.reflow $

1288− "Please ask for help on the community forums if you try those paths and are still\

1289− \ having problems!"

1290− ]

1291−

1292− DetailsNoOfflineSolution ->

1293− Help.report "TROUBLE VERIFYING DEPENDENCIES" (Just "elm.json")

1294− "I could not connect to https://package.elm-lang.org to get the latest list of\

1295− \ packages, and I was unable to verify your dependencies with the information I\

1296− \ have cached locally."

1297− [ D.reflow $

1298− "Are you able to connect to the internet? These dependencies may work once you\

1299− \ get access to the registry!"

1300− , D.toFancyNote

1301− ["If","you","changed","your","dependencies","by","hand,","try","to","change","them","back!"

1302− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."

1303− ]

1304− ]

1305−

1306− DetailsSolverProblem solver ->

1307− toSolverReport solver

672+ DetailsCorrupt ->

673+ error "TODO DetailsCorrupt"

1308674

1309675 DetailsBadElmInPkg constraint ->

1310676 Help.report "ELM VERSION MISMATCH" (Just "elm.json")

1311677 "Your elm.json says this package needs a version of Elm in this range:"

1312− [ D.indent 4 $ D.dullyellow $ D.fromChars $ C.toChars constraint

678+ [ D.indent 4 $ D.dullyellow $ D.fromUtf8 $ C.toString constraint

1313679 , D.fillSep

1314680 [ "But", "you", "are", "using", "Elm"

1315− , D.red (D.fromVersion V.compiler)

681+ , D.red (D.fromUtf8 (V.toString V.compiler))

1316682 , "right", "now."

1317683 ]

1318684 ]

@@ -1322,286 +688,40 @@ toDetailsReport details =

1322688 "Your elm.json says this application needs a different version of Elm."

1323689 [ D.fillSep

1324690 [ "It", "requires"

1325− , D.green (D.fromVersion version) <> ","

691+ , D.green (D.fromUtf8 (V.toString version)) <> ","

1326692 , "but", "you", "are", "using"

1327− , D.red (D.fromVersion V.compiler)

693+ , D.red (D.fromUtf8 (V.toString V.compiler))

1328694 , "right", "now."

1329695 ]

1330696 ]

1331697

1332698 DetailsHandEditedDependencies ->

1333− Help.report "ERROR IN DEPENDENCIES" (Just "elm.json")

1334− "It looks like the dependencies elm.json in were edited by hand (or by a 3rd\

1335− \ party tool) leaving them in an invalid state."

1336− [ D.fillSep

1337− ["Try","to","change","them","back","to","what","they","were","before!"

1338− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."

1339− ]

1340− , D.reflow $

1341− "Please ask for help on the community forums if you try those paths and are still\

1342− \ having problems!"

1343− ]

699+ error "TODO DetailsHandEditedDependencies"

1344700

1345− DetailsBadOutline outline ->

1346− toOutlineReport outline

701+ DetailsBadOutline problem ->

702+ error "TODO DetailsBadOutline" problem

1347703

1348704 DetailsCannotGetRegistry problem ->

1349− toRegistryProblemReport "PROBLEM LOADING PACKAGE LIST" problem $

1350− "I need the list of published packages to verify your dependencies"

1351−

1352− DetailsBadDeps cacheDir deps ->

1353− case List.sortOn toBadDepRank deps of

1354− [] ->

1355− Help.report "PROBLEM BUILDING DEPENDENCIES" Nothing

1356− "I am not sure what is going wrong though."

1357− [ D.reflow $

1358− "I would try deleting the " ++ cacheDir ++ " and elm-stuff/ directories, then\

1359− \ trying to build again. That will work if some cached files got corrupted\

1360− \ somehow."

1361− , D.reflow $

1362− "If that does not work, go to https://elm-lang.org/community and ask for\

1363− \ help. This is a weird case!"

1364− ]

1365−

1366− d:_ ->

1367− case d of

1368− BD_BadDownload pkg vsn packageProblem ->

1369− toPackageProblemReport pkg vsn packageProblem

1370−

1371− BD_BadBuild pkg vsn fingerprint ->

1372− Help.report "PROBLEM BUILDING DEPENDENCIES" Nothing

1373− "I ran into a compilation error when trying to build the following package:"

1374− [ D.indent 4 $ D.red $ D.fromChars $ Pkg.toChars pkg ++ " " ++ V.toChars vsn

1375− , D.reflow $

1376− "This probably means it has package constraints that are too wide. It may be\

1377− \ possible to tweak your elm.json to avoid the root problem as a stopgap. Head\

1378− \ over to https://elm-lang.org/community to get help figuring out how to take\

1379− \ this path!"

1380− , D.toSimpleNote $

1381− "To help with the root problem, please report this to the package author along\

1382− \ with the following information:"

1383− , D.indent 4 $ D.vcat $

1384− map (\(p,v) -> D.fromChars $ Pkg.toChars p ++ " " ++ V.toChars v) $

1385− Map.toList fingerprint

1386− , D.reflow $

1387− "If you want to help out even more, try building the package locally. That should\

1388− \ give you much more specific information about why this package is failing to\

1389− \ build, which will in turn make it easier for the package author to fix it!"

1390− ]

1391−

1392−

1393−toBadDepRank :: DetailsBadDep -> Int -- lower is better

1394−toBadDepRank badDep =

1395− case badDep of

1396− BD_BadDownload _ _ _ -> 0

1397− BD_BadBuild _ _ _ -> 1

1398−

1399−

1400−

1401−-- PACKAGE PROBLEM

1402−

1403−

1404−data PackageProblem

1405− = PP_BadEndpointRequest Http.Error

1406− | PP_BadEndpointContent String

1407− | PP_BadArchiveRequest Http.Error

1408− | PP_BadArchiveContent String

1409− | PP_BadArchiveHash String String String

1410−

1411−

1412−toPackageProblemReport :: Pkg.Name -> V.Version -> PackageProblem -> Help.Report

1413−toPackageProblemReport pkg vsn problem =

1414− let

1415− thePackage =

1416− Pkg.toChars pkg ++ " " ++ V.toChars vsn

1417− in

1418− case problem of

1419− PP_BadEndpointRequest httpError ->

1420− toHttpErrorReport "PROBLEM DOWNLOADING PACKAGE" httpError $

1421− "I need to find the latest download link for " ++ thePackage

1422−

1423− PP_BadEndpointContent url ->

1424− Help.report "PROBLEM DOWNLOADING PACKAGE" Nothing

1425− (

1426− "I need to find the latest download link for " ++ thePackage ++ ", but I ran into corrupted information from:"

1427− )

1428− [ D.indent 4 $ D.dullyellow $ D.fromChars url

1429− , D.reflow $

1430− "Is something weird with your internet connection. We have gotten reports that\

1431− \ schools, businesses, airports, etc. sometimes intercept requests and add things\

1432− \ to the body or change its contents entirely. Could that be the problem?"

1433− ]

1434−

1435− PP_BadArchiveRequest httpError ->

1436− toHttpErrorReport "PROBLEM DOWNLOADING PACKAGE" httpError $

1437− "I was trying to download the source code for " ++ thePackage

1438−

1439− PP_BadArchiveContent url ->

1440− Help.report "PROBLEM DOWNLOADING PACKAGE" Nothing

1441− (

1442− "I downloaded the source code for " ++ thePackage ++ " from:"

1443− )

1444− [ D.indent 4 $ D.dullyellow $ D.fromChars url

1445− , D.reflow $

1446− "But I was unable to unzip the data. Maybe there is something weird with\

1447− \ your internet connection. We have gotten reports that schools, businesses,\

1448− \ airports, etc. sometimes intercept requests and add things to the body or\

1449− \ change its contents entirely. Could that be the problem?"

1450− ]

1451−

1452− PP_BadArchiveHash url expectedHash actualHash ->

1453− Help.report "CORRUPT PACKAGE DATA" Nothing

1454− (

1455− "I downloaded the source code for " ++ thePackage ++ " from:"

1456− )

1457− [ D.indent 4 $ D.dullyellow $ D.fromChars url

1458− , D.reflow "But it looks like the hash of the archive has changed since publication:"

1459− , D.vcat $ map D.fromChars $

1460− [ " Expected: " ++ expectedHash

1461− , " Actual: " ++ actualHash

1462− ]

1463− , D.reflow $

1464− "This usually means that the package author moved the version\

1465− \ tag, so report it to them and see if that is the issue. Folks\

1466− \ on Elm slack can probably help as well."

1467− ]

1468−

1469−

1470−

1471−-- REGISTRY PROBLEM

1472−

1473−

1474−data RegistryProblem

1475− = RP_Http Http.Error

1476− | RP_Data String BS.ByteString

1477−

1478−

1479−toRegistryProblemReport :: String -> RegistryProblem -> String -> Help.Report

1480−toRegistryProblemReport title problem context =

1481− case problem of

1482− RP_Http err ->

1483− toHttpErrorReport title err context

1484−

1485− RP_Data url body ->

1486− Help.report title Nothing (context ++ ", so I fetched:")

1487− [ D.indent 4 $ D.dullyellow $ D.fromChars url

1488− , D.reflow $

1489− "I got the data back, but it was not what I was expecting. The response\

1490− \ body contains " ++ show (BS.length body) ++ " bytes. Here is the "

1491− ++ if BS.length body <= 76 then "whole thing:" else "beginning:"

1492− , D.indent 4 $ D.dullyellow $ D.fromChars $

1493− if BS.length body <= 76

1494− then BS_UTF8.toString body

1495− else take 73 (BS_UTF8.toString body) ++ "..."

1496− , D.reflow $

1497− "Does this error keep showing up? Maybe there is something weird with your\

1498− \ internet connection. We have gotten reports that schools, businesses,\

1499− \ airports, etc. sometimes intercept requests and add things to the body\

1500− \ or change its contents entirely. Could that be the problem?"

1501− ]

1502−

1503−

1504−toHttpErrorReport :: String -> Http.Error -> String -> Help.Report

1505−toHttpErrorReport title err context =

1506− let

1507− toHttpReport intro url details =

1508− Help.report title Nothing intro $

1509− D.indent 4 (D.dullyellow (D.fromChars url)) : details

1510− in

1511− case err of

1512− Http.BadUrl url reason ->

1513− toHttpReport (context ++ ", so I wanted to fetch:") url

1514− [ D.reflow $ "But my HTTP library is saying this is not a valid URL. It is saying:"

1515− , D.indent 4 $ D.fromChars reason

1516− , D.reflow $

1517− "This may indicate that there is some problem in the compiler, so please open an\

1518− \ issue at https://github.com/elm/compiler/issues listing your operating system, Elm\

1519− \ version, the command you ran, the terminal output, and any additional information\

1520− \ that might help others reproduce the error."

1521− ]

1522−

1523− Http.BadHttp url httpExceptionContent ->

1524− case httpExceptionContent of

1525− HTTP.StatusCodeException response body ->

1526− let

1527− (HTTP.Status code message) = HTTP.responseStatus response

1528− in

1529− toHttpReport (context ++ ", so I tried to fetch:") url

1530− [ D.fillSep $

1531− ["But","it","came","back","as",D.red (D.fromInt code)]

1532− ++ map D.fromChars (words (BS_UTF8.toString message))

1533− , D.indent 4 $ D.reflow $ BS_UTF8.toString body

1534− , D.reflow $

1535− "This may mean some online endpoint changed in an unexpected way, so if does not\

1536− \ seem like something on your side is causing this (e.g. firewall) please report\

1537− \ this to https://github.com/elm/compiler/issues with your operating system, Elm\

1538− \ version, the command you ran, the terminal output, and any additional information\

1539− \ that can help others reproduce the error!"

1540− ]

1541−

1542− HTTP.TooManyRedirects responses ->

1543− toHttpReport (context ++ ", so I tried to fetch:") url

1544− [ D.reflow $ "But I gave up after following these " ++ show (length responses) ++ " redirects:"

1545− , D.indent 4 $ D.vcat $ map toRedirectDoc responses

1546− , D.reflow $

1547− "Is it possible that your internet connection intercepts certain requests? That\

1548− \ sometimes causes problems for folks in schools, businesses, airports, hotels,\

1549− \ and certain countries. Try asking for help locally or in a community forum!"

1550− ]

1551−

1552− otherException ->

1553− toHttpReport (context ++ ", so I tried to fetch:") url

1554− [ D.reflow $ "But my HTTP library is giving me the following error message:"

1555− , D.indent 4 $ D.fromChars (show otherException)

1556− , D.reflow $

1557− "Are you somewhere with a slow internet connection? Or no internet?\

1558− \ Does the link I am trying to fetch work in your browser? Maybe the\

1559− \ site is down? Does your internet connection have a firewall that\

1560− \ blocks certain domains? It is usually something like that!"

1561− ]

1562−

1563− Http.BadMystery url someException ->

1564− toHttpReport (context ++ ", so I tried to fetch:") url

1565− [ D.reflow $ "But I ran into something weird! I was able to extract this error message:"

1566− , D.indent 4 $ D.fromChars (show someException)

1567− , D.reflow $

1568− "Is it possible that your internet connection intercepts certain requests? That\

1569− \ sometimes causes problems for folks in schools, businesses, airports, hotels,\

1570− \ and certain countries. Try asking for help locally or in a community forum!"

1571− ]

1572−

1573−

1574−toRedirectDoc :: HTTP.Response body -> D.Doc

1575−toRedirectDoc response =

1576− let

1577− (HTTP.Status code message) = HTTP.responseStatus response

1578− in

1579− case List.lookup HTTP.hLocation (HTTP.responseHeaders response) of

1580− Just loc -> D.red (D.fromInt code) <> " - " <> D.fromChars (BS_UTF8.toString loc)

1581− Nothing -> D.red (D.fromInt code) <> " - " <> D.fromChars (BS_UTF8.toString message)

705+ error "TODO DetailsCannotGetRegistry" problem

1582706

707+ DetailsCannotBuildPackage name version problem ->

708+ error "TODO DetailsCannotBuildPackage" name version problem

1583709

710+ DetailsNoSolution ->

711+ error "TODO DetailsNoSolution"

1584712

1585−-- MAKE

713+ DetailsNoOfflineSolution ->

714+ error "TODO DetailsNoOfflineSolution"

1586715

716+ DetailsSolverProblem _ ->

717+ error "TODO DetailsSolverProblem"

1587718

1588−data Make

1589− = MakeNoOutline

1590− | MakeCannotOptimizeAndDebug

1591− | MakeBadDetails Details

1592− | MakeAppNeedsFileNames

1593− | MakePkgNeedsExposing

1594− | MakeMultipleFilesIntoHtml

1595− | MakeNoMain

1596− | MakeNonMainFilesIntoJavaScript ModuleName.Raw [ModuleName.Raw]

1597− | MakeCannotBuild BuildProblem

1598− | MakeBadGenerate Generate

1599719

1600720

1601721makeToReport :: Make -> Help.Report

1602722makeToReport make =

1603723 case make of

1604− MakeNoOutline ->

724+ MakeNeedsOutline ->

1605725 Help.report "NO elm.json FILE" Nothing

1606726 "It looks like you are starting a new Elm project. Very exciting! Try running:"

1607727 [ D.indent 4 $ D.green $ "elm init"

@@ -1622,344 +742,27 @@ makeToReport make =

1622742 \ at once though! Pick just one of those flags and it should work!"

1623743 ]

1624744

1625− MakeBadDetails detailsProblem ->

1626− toDetailsReport detailsProblem

745+ MakeBlockedByDetailsProblem detailsProblem ->

746+ detailsToReport detailsProblem

1627747

1628748 MakeAppNeedsFileNames ->

1629749 Help.report "NO INPUT" Nothing

1630− "What should I make though? I need specific files like:"

1631− [ D.vcat

1632− [ D.indent 4 $ D.green "elm make src/Main.elm"

1633− , D.indent 4 $ D.green "elm make src/This.elm src/That.elm"

1634− ]

1635− , D.reflow $

1636− "I recommend reading through https://guide.elm-lang.org for guidance on what to\

1637− \ actually put in those files!"

750+ "What should I make though? I need a specific file like this:"

751+ [ D.indent 4 $ D.green "elm make src/Main.elm"

752+ , D.reflow

753+ "However many files you give, I will create one JS file out of them."

1638754 ]

1639755

1640756 MakePkgNeedsExposing ->

1641− Help.report "NO INPUT" Nothing

1642− "What should I make though? I need specific files like:"

1643− [ D.vcat

1644− [ D.indent 4 $ D.green "elm make src/Main.elm"

1645− , D.indent 4 $ D.green "elm make src/This.elm src/That.elm"

1646− ]

1647− , D.reflow $

1648− "You can also entries to the \"exposed-modules\" list in your elm.json file, and\

1649− \ I will try to compile the relevant files."

1650− ]

757+ error "TODO MakePkgNeedsExposing"

1651758

1652759 MakeMultipleFilesIntoHtml ->

1653− Help.report "TOO MANY FILES" Nothing

1654− (

1655− "When producing an HTML file, I can only handle one file."

1656− )

1657− [ D.fillSep

1658− ["Switch","to",D.dullyellow "--output=/dev/null","if","you","just","want"

1659− ,"to","get","compile","errors.","This","skips","the","code","gen","phase,"

1660− ,"so","it","can","be","a","bit","faster","than","other","options","sometimes."

1661− ]

1662− , D.fillSep

1663− ["Switch","to",D.dullyellow "--output=elm.js","if","you","want","multiple"

1664− ,"`main`","values","available","in","a","single","JavaScript","file.","Then"

1665− ,"you","can","make","your","own","customized","HTML","file","that","embeds"

1666− ,"multiple","Elm","nodes.","The","generated","JavaScript","also","shares"

1667− ,"dependencies","between","modules,","so","it","should","be","smaller","than"

1668− ,"compiling","each","module","separately."

1669− ]

1670− ]

760+ error "TODO MakeMultipleFilesIntoHtml"

1671761

1672− MakeNoMain ->

1673− Help.report "NO MAIN" Nothing

1674− (

1675− "When producing an HTML file, I require that the given file has a `main` value.\

1676− \ That way I have something to show on screen!"

1677− )

1678− [ D.reflow $

1679− "Try adding a `main` value to your file? Or if you just want to verify that this\

1680− \ module compiles, switch to --output=/dev/null to skip the code gen phase\

1681− \ altogether."

1682− , D.toSimpleNote $

1683− "Adding a `main` value can be as brief as adding something like this:"

1684− , D.vcat

1685− [ D.fillSep [D.cyan "import","Html"]

1686− , ""

1687− , D.fillSep [D.green "main","="]

1688− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]

1689− ]

1690− , D.reflow $

1691− "From there I can create an HTML file that says \"Hello!\" on screen. I recommend\

1692− \ looking through https://guide.elm-lang.org for more guidance on how to fill in\

1693− \ the `main` value."

1694− ]

1695−

1696− MakeNonMainFilesIntoJavaScript m ms ->

1697− case ms of

1698− [] ->

1699− Help.report "NO MAIN" Nothing

1700− (

1701− "When producing a JS file, I require that the given file has a `main` value. That\

1702− \ way Elm." ++ ModuleName.toChars m ++ ".init() is definitely defined in the\

1703− \ resulting file!"

1704− )

1705− [ D.reflow $

1706− "Try adding a `main` value to your file? Or if you just want to verify that this\

1707− \ module compiles, switch to --output=/dev/null to skip the code gen phase\

1708− \ altogether."

1709− , D.toSimpleNote $

1710− "Adding a `main` value can be as brief as adding something like this:"

1711− , D.vcat

1712− [ D.fillSep [D.cyan "import","Html"]

1713− , ""

1714− , D.fillSep [D.green "main","="]

1715− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]

1716− ]

1717− , D.reflow $

1718− "Or use https://package.elm-lang.org/packages/elm/core/latest/Platform#worker to\

1719− \ make a `main` with no user interface."

1720− ]

1721−

1722− _:_ ->

1723− Help.report "NO MAIN" Nothing

1724− (

1725− "When producing a JS file, I require that given files all have `main` values.\

1726− \ That way functions like Elm." ++ ModuleName.toChars m ++ ".init() are\

1727− \ definitely defined in the resulting file. I am missing `main` values in:"

1728− )

1729− [ D.indent 4 $ D.red $ D.vcat $ map D.fromName (m:ms)

1730− , D.reflow $

1731− "Try adding a `main` value to them? Or if you just want to verify that these\

1732− \ modules compile, switch to --output=/dev/null to skip the code gen phase\

1733− \ altogether."

1734− , D.toSimpleNote $

1735− "Adding a `main` value can be as brief as adding something like this:"

1736− , D.vcat

1737− [ D.fillSep [D.cyan "import","Html"]

1738− , ""

1739− , D.fillSep [D.green "main","="]

1740− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]

1741− ]

1742− , D.reflow $

1743− "Or use https://package.elm-lang.org/packages/elm/core/latest/Platform#worker to\

1744− \ make a `main` with no user interface."

1745− ]

1746−

1747− MakeCannotBuild buildProblem ->

1748− toBuildProblemReport buildProblem

1749−

1750− MakeBadGenerate generateProblem ->

1751− toGenerateReport generateProblem

1752−

1753−

1754−

1755−-- BUILD PROBLEM

1756−

1757−

1758−data BuildProblem

1759− = BuildBadModules FilePath Error.Module [Error.Module]

1760− | BuildProjectProblem BuildProjectProblem

1761−

1762−

1763−data BuildProjectProblem

1764− = BP_PathUnknown FilePath

1765− | BP_WithBadExtension FilePath

1766− | BP_WithAmbiguousSrcDir FilePath FilePath FilePath

1767− | BP_MainPathDuplicate FilePath FilePath

1768− | BP_RootNameDuplicate ModuleName.Raw FilePath FilePath

1769− | BP_RootNameInvalid FilePath FilePath [String]

1770− | BP_CannotLoadDependencies

1771− | BP_Cycle ModuleName.Raw [ModuleName.Raw]

1772− | BP_MissingExposed (NE.List (ModuleName.Raw, Import.Problem))

762+ MakeNonMainFilesIntoJavaScript _ _ ->

763+ error "TODO MakeNonMainFilesIntoJavaScript"

1773764

1774−

1775−toBuildProblemReport :: BuildProblem -> Help.Report

1776−toBuildProblemReport problem =

1777− case problem of

1778− BuildBadModules root e es ->

1779− Help.compilerReport root e es

1780−

1781− BuildProjectProblem projectProblem ->

1782− toProjectProblemReport projectProblem

1783−

1784−

1785−toProjectProblemReport :: BuildProjectProblem -> Help.Report

1786−toProjectProblemReport projectProblem =

1787− case projectProblem of

1788− BP_PathUnknown path ->

1789− Help.report "FILE NOT FOUND" Nothing

1790− "I cannot find this file:"

1791− [ D.indent 4 $ D.red $ D.fromChars path

1792− , D.reflow $ "Is there a typo?"

1793− , D.toSimpleNote $

1794− "If you are just getting started, try working through the examples in the\

1795− \ official guide https://guide.elm-lang.org to get an idea of the kinds of things\

1796− \ that typically go in a src/Main.elm file."

1797− ]

1798−

1799− BP_WithBadExtension path ->

1800− Help.report "UNEXPECTED FILE EXTENSION" Nothing

1801− "I can only compile Elm files (with a .elm extension) but you want me to compile:"

1802− [ D.indent 4 $ D.red $ D.fromChars path

1803− , D.reflow $ "Is there a typo? Can the file extension be changed?"

1804− ]

1805−

1806− BP_WithAmbiguousSrcDir path srcDir1 srcDir2 ->

1807− Help.report "CONFUSING FILE" Nothing

1808− "I am getting confused when I try to compile this file:"

1809− [ D.indent 4 $ D.red $ D.fromChars path

1810− , D.reflow $

1811− "I always check if files appear in any of the \"source-directories\" listed in\

1812− \ your elm.json to see if there might be some cached information about them. That\

1813− \ can help me compile faster! But in this case, it looks like this file may be in\

1814− \ either of these directories:"

1815− , D.indent 4 $ D.red $ D.vcat $ map D.fromChars [srcDir1,srcDir2]

1816− , D.reflow $

1817− "Try to make it so no source directory contains another source directory!"

1818− ]

1819−

1820− BP_MainPathDuplicate path1 path2 ->

1821− Help.report "CONFUSING FILES" Nothing

1822− "You are telling me to compile these two files:"

1823− [ D.indent 4 $ D.red $ D.vcat $ map D.fromChars [ path1, path2 ]

1824− , D.reflow $

1825− if path1 == path2 then

1826− "Why are you telling me twice? Is something weird going on with a script?\

1827− \ I figured I would let you know about it just in case something is wrong.\

1828− \ Only list it once and you should be all set!"

1829− else

1830− "But seem to be the same file though... It makes me think something tricky is\

1831− \ going on with symlinks in your project, so I figured I would let you know\

1832− \ about it just in case. Remove one of these files from your command to get\

1833− \ unstuck!"

1834− ]

1835−

1836− BP_RootNameDuplicate name outsidePath otherPath ->

1837− Help.report "MODULE NAME CLASH" Nothing

1838− "These two files are causing a module name clash:"

1839− [ D.indent 4 $ D.red $ D.vcat $ map D.fromChars [ outsidePath, otherPath ]

1840− , D.reflow $

1841− "They both say `module " ++ ModuleName.toChars name ++ " exposing (..)` up\

1842− \ at the top, but they cannot have the same name!"

1843− , D.reflow $

1844− "Try changing to a different module name in one of them!"

1845− ]

1846−

1847− BP_RootNameInvalid givenPath srcDir _ ->

1848− Help.report "UNEXPECTED FILE NAME" Nothing

1849− "I am having trouble with this file name:"

1850− [ D.indent 4 $ D.red $ D.fromChars givenPath

1851− , D.reflow $

1852− "I found it in your " ++ FP.addTrailingPathSeparator srcDir ++ " directory\

1853− \ which is good, but I expect all of the files in there to use the following\

1854− \ module naming convention:"

1855− , toModuleNameConventionTable srcDir [ "Main", "HomePage", "Http.Helpers" ]

1856− , D.reflow $

1857− "Notice that the names always start with capital letters! Can you make your file\

1858− \ use this naming convention?"

1859− , D.toSimpleNote $

1860− "Having a strict naming convention like this makes it a lot easier to find\

1861− \ things in large projects. If you see a module imported, you know where to look\

1862− \ for the corresponding file every time!"

1863− ]

1864−

1865− BP_CannotLoadDependencies ->

1866− corruptCacheReport

1867−

1868− BP_Cycle name names ->

1869− Help.report "IMPORT CYCLE" Nothing

1870− "Your module imports form a cycle:"

1871− [ D.cycle 4 name names

1872− , D.reflow $

1873− "Learn more about why this is disallowed and how to break cycles here:"

1874− ++ D.makeLink "import-cycles"

1875− ]

1876−

1877− BP_MissingExposed (NE.List (name, problem) _) ->

1878− case problem of

1879− Import.NotFound ->

1880− Help.report "MISSING MODULE" (Just "elm.json")

1881− "The \"exposed-modules\" of your elm.json lists the following module:"

1882− [ D.indent 4 $ D.red $ D.fromName name

1883− , D.reflow $

1884− "But I cannot find it in your src/ directory. Is there a typo? Was it renamed?"

1885− ]

1886−

1887− Import.Ambiguous _ _ pkg _ ->

1888− Help.report "AMBIGUOUS MODULE NAME" (Just "elm.json")

1889− "The \"exposed-modules\" of your elm.json lists the following module:"

1890− [ D.indent 4 $ D.red $ D.fromName name

1891− , D.reflow $

1892− "But a module from " ++ Pkg.toChars pkg ++ " already uses that name. Try\

1893− \ choosing a different name for your local file."

1894− ]

1895−

1896− Import.AmbiguousLocal path1 path2 paths ->

1897− Help.report "AMBIGUOUS MODULE NAME" (Just "elm.json")

1898− "The \"exposed-modules\" of your elm.json lists the following module:"

1899− [ D.indent 4 $ D.red $ D.fromName name

1900− , D.reflow $

1901− "But I found multiple files with that name:"

1902− , D.dullyellow $ D.indent 4 $ D.vcat $

1903− map D.fromChars (path1:path2:paths)

1904− , D.reflow $

1905− "Change the module names to be distinct!"

1906− ]

1907−

1908− Import.AmbiguousForeign _ _ _ ->

1909− Help.report "MISSING MODULE" (Just "elm.json")

1910− "The \"exposed-modules\" of your elm.json lists the following module:"

1911− [ D.indent 4 $ D.red $ D.fromName name

1912− , D.reflow $

1913− "But I cannot find it in your src/ directory. Is there a typo? Was it renamed?"

1914− , D.toSimpleNote $

1915− "It is not possible to \"re-export\" modules from other packages. You can only\

1916− \ expose modules that you define in your own code."

1917− ]

1918−

1919−

1920−toModuleNameConventionTable :: FilePath -> [String] -> D.Doc

1921−toModuleNameConventionTable srcDir names =

1922− let

1923− toPair name =

1924− ( name

1925− , srcDir </> map (\c -> if c == '.' then FP.pathSeparator else c) name <.> "elm"

1926− )

1927−

1928− namePairs = map toPair names

1929− nameWidth = maximum (11 : map (length . fst) namePairs)

1930− pathWidth = maximum ( 9 : map (length . snd) namePairs)

1931−

1932− padded width str =

1933− str ++ replicate (width - length str) ' '

1934−

1935− toRow (name, path) =

1936− D.fromChars $

1937− "| " ++ padded nameWidth name ++ " | " ++ padded pathWidth path ++ " |"

1938−

1939− bar =

1940− D.fromChars $

1941− "+-" ++ replicate nameWidth '-' ++ "-+-" ++ replicate pathWidth '-' ++ "-+"

1942− in

1943− D.indent 4 $ D.vcat $

1944− [ bar, toRow ("Module Name", "File Path"), bar ] ++ map toRow namePairs ++ [ bar ]

1945−

1946−

1947−

1948−-- GENERATE

1949−

1950−

1951−data Generate

1952− = GenerateCannotLoadArtifacts

1953− | GenerateCannotOptimizeDebugValues ModuleName.Raw [ModuleName.Raw]

1954−

1955−

1956−toGenerateReport :: Generate -> Help.Report

1957−toGenerateReport problem =

1958− case problem of

1959− GenerateCannotLoadArtifacts ->

1960− corruptCacheReport

1961−

1962− GenerateCannotOptimizeDebugValues m ms ->

765+ MakeCannotOptimizeDebugValues m ms ->

1963766 Help.report "DEBUG REMNANTS" Nothing

1964767 "There are uses of the `Debug` module in the following modules:"

1965768 [ D.indent 4 $ D.red $ D.vcat $ map (D.fromChars . ModuleName.toChars) (m:ms)

@@ -1968,7 +771,7 @@ toGenerateReport problem =

1968771 "The issue is that --optimize strips out info needed by `Debug` functions.\

1969772 \ Here are two examples:"

1970773 , D.indent 4 $ D.reflow $

1971− "(1) It shortens record field names. This makes the generated JavaScript\

774+ "(1) It shortens record field names. This makes the generated JavaScript is\

1972775 \ smaller, but `Debug.toString` cannot know the real field names anymore."

1973776 , D.indent 4 $ D.reflow $

1974777 "(2) Values like `type Height = Height Float` are unboxed. This reduces\

@@ -1981,89 +784,28 @@ toGenerateReport problem =

1981784 \ exists!"

1982785 ]

1983786

787+ MakeCannotBuild buildProblem ->

788+ case buildProblem of

789+ BuildProjectProblem bp ->

790+ case bp of

791+ BP_PathUnknown _ -> error "TODO BP_PathUnknown"

792+ BP_WithBadExtension _ -> error "TODO BP_WithBadExtension"

793+ BP_WithAmbiguousSrcDir _ _ -> error "TODO BP_WithAmbiguousSrcDir"

794+ BP_MainPathDuplicate _ _ -> error "TODO BP_MainPathDuplicate"

795+ BP_MainNameDuplicate _ _ _ -> error "TODO BP_MainNameDuplicate"

796+ BP_CannotLoadDependencies -> error "TODO BP_CannotLoadDependencies"

797+ BP_Cycle name names ->

798+ Help.report "IMPORT CYCLE" Nothing

799+ "Your module imports form a cycle:"

800+ [ D.cycle 4 name names

801+ , D.reflow $

802+ "Learn more about why this is disallowed and how to break cycles here:"

803+ ++ D.makeLink "import-cycles"

804+ ]

1984805

1985806

1986−-- CORRUPT CACHE

1987−

1988−

1989−corruptCacheReport :: Help.Report

1990−corruptCacheReport =

1991− Help.report "CORRUPT CACHE" Nothing

1992− "It looks like some of the information cached in elm-stuff/ has been corrupted."

1993− [ D.reflow $

1994− "Try deleting your elm-stuff/ directory to get unstuck."

1995− , D.toSimpleNote $

1996− "This almost certainly means that a 3rd party tool (or editor plugin) is\

1997− \ causing problems your the elm-stuff/ directory. Try disabling 3rd party tools\

1998− \ one by one until you figure out which it is!"

1999− ]

2000−

2001−

2002−

2003−-- REACTOR

2004−

2005−

2006−data Reactor

2007− = ReactorNoOutline

2008− | ReactorBadDetails Details

2009− | ReactorBadBuild BuildProblem

2010− | ReactorBadGenerate Generate

2011−

2012−

2013−reactorToReport :: Reactor -> Help.Report

2014−reactorToReport problem =

2015− case problem of

2016− ReactorNoOutline ->

2017− Help.report "NEW PROJECT?" Nothing

2018− "Are you trying to start a new project? Try this command in the terminal:"

2019− [ D.indent 4 $ D.green "elm init"

2020− , D.reflow "It will help you get started!"

2021− ]

2022−

2023− ReactorBadDetails details ->

2024− toDetailsReport details

2025−

2026− ReactorBadBuild buildProblem ->

2027− toBuildProblemReport buildProblem

2028−

2029− ReactorBadGenerate generate ->

2030− toGenerateReport generate

2031−

2032−

2033−

2034−-- REPL

2035−

2036−

2037−data Repl

2038− = ReplBadDetails Details

2039− | ReplBadInput BS.ByteString Error.Error

2040− | ReplBadLocalDeps FilePath Error.Module [Error.Module]

2041− | ReplProjectProblem BuildProjectProblem

2042− | ReplBadGenerate Generate

2043− | ReplBadCache

2044− | ReplBlocked

2045−

2046−

2047−replToReport :: Repl -> Help.Report

2048−replToReport problem =

2049− case problem of

2050− ReplBadDetails details ->

2051− toDetailsReport details

2052−

2053− ReplBadInput source err ->

2054− Help.compilerReport "/" (Error.Module N.replModule "REPL" File.zeroTime source err) []

2055−

2056− ReplBadLocalDeps root e es ->

2057− Help.compilerReport root e es

2058−

2059− ReplProjectProblem projectProblem ->

2060− toProjectProblemReport projectProblem

2061−

2062− ReplBadGenerate generate ->

2063− toGenerateReport generate

2064−

2065− ReplBadCache ->

2066− corruptCacheReport

807+ BuildModuleProblems p ps ->

808+ Help.compilerReport p ps

2067809

2068− ReplBlocked ->

2069− corruptCacheReport

810+ MakeCannotLoadArtifacts ->

811+ error "TODO MakeCannotLoadArtifacts"

builder/src/Reporting/Exit/Assets.hsnew file+227

@@ -0,0 +1,227 @@

1+{-# LANGUAGE OverloadedStrings #-}

2+module Reporting.Exit.Assets

3+ ( Exit(..)

4+ , ElmJsonProblem(..)

5+ , toReport

6+ , BadElmJsonContent(..)

7+ , badContentToDocs

8+ )

9+ where

10+

11+

12+import qualified Data.Text as Text

13+

14+import qualified Elm.Package as Pkg

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

16+import qualified Reporting.Doc as D

17+import qualified Reporting.Exit.Help as Help

18+

19+

20+

21+-- EXITS

22+

23+

24+data Exit

25+ = BadElmJson ElmJsonProblem

26+ | CorruptElmJson Pkg.Name Pkg.Version

27+ | CorruptDocumentation Pkg.Name Pkg.Version

28+ | CorruptBinary FilePath FilePath

29+

30+

31+

32+-- ELM JSON PROBLEM

33+

34+

35+data ElmJsonProblem

36+ = BadJson D.Doc

37+ | BadSrcDir FilePath

38+ | NoPkgCore

39+ | NoAppCore

40+ | NoAppJson

41+

42+

43+

44+-- TO REPORT

45+

46+

47+toReport :: Exit -> Help.Report

48+toReport exit =

49+ case exit of

50+ CorruptElmJson pkg vsn ->

51+ corruptJsonToReport "elm.json" pkg vsn

52+

53+ CorruptDocumentation pkg vsn ->

54+ corruptJsonToReport "docs.json" pkg vsn

55+

56+ CorruptBinary elmHome path ->

57+ Help.report "CORRUPT BINARY" (Just path)

58+ ("The binary data at " ++ path ++ " is corrupt.")

59+ [ D.reflow "Elm caches build artifacts in the following directories:"

60+ , D.dullyellow $ D.indent 4 $ D.vcat $

61+ [ D.fromString elmHome

62+ , "elm-stuff/"

63+ ]

64+ , D.reflow

65+ "Maybe you recently installed a command line tool or editor plugin that messes\

66+ \ with them? They definitely should not be doing that, but you never know! So\

67+ \ maybe try deleting them? Everything will be rebuilt from scratch. This may\

68+ \ help reveal the corrupting influence."

69+ ]

70+

71+ BadElmJson problem ->

72+ elmJsonProblemToReport problem

73+

74+

75+

76+-- CORRUPT JSON

77+

78+

79+corruptJsonToReport :: FilePath -> Pkg.Name -> Pkg.Version -> Help.Report

80+corruptJsonToReport path pkg vsn =

81+ Help.report "CORRUPT JSON" Nothing

82+ ( "The " ++ path ++ " for " ++ Pkg.toString pkg

83+ ++ " " ++ Pkg.versionToString vsn ++ " got corrupted somehow."

84+ )

85+ [ D.reflow $

86+ "I removed it from my file cache, so if it was some transient\

87+ \ error it should be fixed if you try the same thing again.\

88+ \ Please report this if it seems like an Elm problem though!"

89+ ]

90+

91+

92+

93+-- BAD ELM JSON

94+

95+

96+elmJsonProblemToReport :: ElmJsonProblem -> Help.Report

97+elmJsonProblemToReport problem =

98+ case problem of

99+ BadJson doc ->

100+ Help.jsonReport "BAD JSON" (Just "elm.json") doc

101+

102+ BadSrcDir dir ->

103+ Help.report "BAD JSON" (Just "elm.json")

104+ "The \"source-directories\" in your elm.json lists the following directory:"

105+ [ D.indent 4 (D.dullyellow (D.fromString dir))

106+ , D.reflow "I cannot find that directory though! Is it missing? Is there a typo?"

107+ ]

108+

109+ NoPkgCore ->

110+ Help.report "MISSING DEPENDENCY" (Just "elm.json")

111+ "A package must have \"elm/core\" as a dependency. Try running:"

112+ [ D.indent 4 $ D.green $ "elm install elm/core"

113+ , D.reflow "I need it for the default imports that make `List` and `Maybe` available."

114+ ]

115+

116+ NoAppCore ->

117+ Help.report "MISSING DEPENDENCY" (Just "elm.json")

118+ "An application must have \"elm/core\" as a dependency. Try running:"

119+ [ D.indent 4 $ D.green $ "elm install elm/core"

120+ , D.reflow "It has some supporting code that is needed by every Elm application!"

121+ ]

122+

123+ NoAppJson ->

124+ Help.report "MISSING DEPENDENCY" (Just "elm.json")

125+ "An application must have \"elm/json\" as a dependency. Try running:"

126+ [ D.indent 4 $ D.green $ "elm install elm/json"

127+ , D.reflow "It helps me handle flags and ports."

128+ ]

129+

130+

131+

132+-- PROBLEM TO DOCS

133+

134+

135+data BadElmJsonContent

136+ = BadType Text.Text

137+ | BadPkgName String

138+ | BadVersion Text.Text

139+ | BadConstraint String

140+ | BadModuleName Text.Text

141+ | BadModuleHeaderTooLong Text.Text

142+ | BadDependencyName Text.Text

143+ | BadLicense Text.Text [Text.Text]

144+ | BadDirectoryNotString

145+ | BadSummaryTooLong

146+

147+

148+badContentToDocs :: BadElmJsonContent -> [D.Doc]

149+badContentToDocs badContent =

150+ case badContent of

151+ BadType _ ->

152+ ["The","only","valid","types","of","elm.json","are"

153+ ,D.green "\"application\"","and",D.green "\"package\"" <> "."

154+ ]

155+

156+ BadPkgName problem ->

157+ map D.fromString (words problem)

158+

159+ BadVersion txt ->

160+ ["You","provided",D.red (D.fromString (show txt))

161+ ,"which","is","not","a","valid","version.","I","need","something","like"

162+ ,D.green "\"1.0.0\"","or",D.green "\"2.0.4\"" <> "."

163+ ]

164+

165+ BadConstraint problem ->

166+ map D.fromString (words ("It is not a valid constraint. " ++ problem))

167+

168+ BadModuleName name ->

169+ ["You","provided",D.fromString (show name),"which","is","not","a","valid","module","name."

170+ ,"I","need","something","like",D.green "\"Html.Events\"","or",D.green "\"Browser.Navigation\"" <> "."

171+ ]

172+

173+ BadModuleHeaderTooLong header ->

174+ ["The",D.fromString (show header),"header","is","too","long."

175+ ,"I","need","it","to","be",D.green "under",D.green "20",D.green "characters"

176+ ,"to","ensure","that","formatting","is","nice","on","the","package","website."

177+ ]

178+

179+ BadDependencyName name ->

180+ ["The",D.fromString (show name),"entry","is","not","a","valid","package","name."

181+ ,"I","recommend","deleting","it,","finding","the","package","you","want","on"

182+ ,"the","package","website,","and","installing","it","with","the"

183+ ,D.green "`elm install`","command","instead."

184+ ]

185+

186+ BadLicense _given suggestions ->

187+ case suggestions of

188+ [] ->

189+ ["I","need","an","OSI","approved","SPDX","license,","like"

190+ ,D.green "\"BSD-3-Clause\"","or",D.green "\"MIT\".","See"

191+ ,"<https://spdx.org/licenses/>","for","a","full","list","of","options."

192+ ]

193+

194+ code:codes ->

195+ ["I","need","an","OSI","approved","SPDX","license."]

196+ ++ ["Maybe you wanted"] ++ oneOf code codes ++ ["instead?"]

197+ ++ ["See","<https://spdx.org/licenses/>","for","a","full","list","of","options."]

198+

199+ BadDirectoryNotString ->

200+ ["I","need","a",D.green "STRING","that","points","to","a","directory","of","Elm","code."

201+ ]

202+

203+ BadSummaryTooLong ->

204+ ["Your","summary","is","too","long.","I","need","it","to"

205+ ,"be",D.green "under",D.green "80",D.green "characters."

206+ ]

207+

208+

209+oneOf :: Text.Text -> [Text.Text] -> [D.Doc]

210+oneOf code codes =

211+ let

212+ toDoc spdx =

213+ D.green (D.fromString (show spdx))

214+ in

215+ case codes of

216+ [] ->

217+ [toDoc code]

218+

219+ [code2] ->

220+ [toDoc code,"or",toDoc code2]

221+

222+ _:_ ->

223+ let

224+ these = code : init codes

225+ final = last codes

226+ in

227+ map (\spdx -> toDoc spdx <> ",") these ++ ["or",toDoc final]

builder/src/Reporting/Exit/Crawl.hsnew file+345

@@ -0,0 +1,345 @@

1+{-# LANGUAGE OverloadedStrings #-}

2+module Reporting.Exit.Crawl

3+ ( Exit(..)

4+ , Problem(..)

5+ , Origin(..)

6+ , SrcDirs(..)

7+ , toReport

8+ )

9+ where

10+

11+

12+import qualified Data.Char as Char

13+import qualified Data.Map as Map

14+import qualified Data.Time.Clock as Time

15+

16+import qualified Elm.Compiler as Compiler

17+import qualified Elm.ModuleName as ModuleName

18+import qualified Elm.Package as Pkg

19+import qualified Elm.Version as V

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

21+import qualified Reporting.Doc as D

22+import qualified Reporting.Exit.Compile as Compile

23+import qualified Reporting.Exit.Help as Help

24+

25+

26+

27+-- EXIT

28+

29+

30+data Exit

31+ = RootFileNotFound FilePath

32+ | RootModuleNameDuplicate ModuleName.Raw [FilePath]

33+ | RootNameless FilePath

34+ | DependencyProblems Problem [Problem]

35+ | BadKernelHeader FilePath

36+

37+

38+data Problem

39+ = ModuleNotFound Origin ModuleName.Raw SrcDirs

40+ | ModuleAmbiguous Origin ModuleName.Raw [FilePath] [Pkg.Canonical]

41+ | BadHeader FilePath Time.UTCTime String Compiler.Error

42+ | ModuleNameReservedForKernel Origin ModuleName.Raw

43+ | ModuleNameMissing FilePath ModuleName.Raw

44+ | ModuleNameMismatch

45+ FilePath

46+ ModuleName.Raw -- expected

47+ ModuleName.Raw -- actual

48+ | PortsInPackage FilePath ModuleName.Raw

49+ | EffectsUnexpected FilePath ModuleName.Raw

50+

51+

52+data Origin

53+ = ElmJson

54+ | File FilePath

55+ | Module FilePath ModuleName.Raw

56+

57+

58+data SrcDirs

59+ = App [FilePath]

60+ | Pkg

61+

62+

63+

64+-- TO REPORT

65+

66+

67+toReport :: Exit -> Help.Report

68+toReport exit =

69+ case exit of

70+ RootFileNotFound path ->

71+ Help.report "FILE NOT FOUND" Nothing

72+ "You want me to compile this file:"

73+ [ D.indent 4 $ D.dullyellow $ D.fromChars path

74+ , "I cannot find it though! Is there a typo?"

75+ ]

76+

77+ RootModuleNameDuplicate name paths ->

78+ Help.report "DUPLICATE NAMES" Nothing

79+ "I am trying to compile multiple modules with the same name:"

80+ [ D.indent 4 $ D.dullyellow $ D.vcat $

81+ map D.fromChars paths

82+ , D.fillSep $

83+ [ "These", "modules", if length paths == 2 then "both" else "all", "claim"

84+ , "to", "be", "named", D.dullyellow (D.fromChars (ModuleName.nameToChars name)) <> "."

85+ , "Change", "them", "to", "have", "unique", "names", "and", "you"

86+ , "should", "be", "all", "set!"

87+ ]

88+ ]

89+

90+ RootNameless path ->

91+ namelessToDoc path "Main"

92+

93+ DependencyProblems problem otherProblems ->

94+ case otherProblems of

95+ [] ->

96+ problemToReport problem

97+

98+ _ ->

99+ problemToReport problem

100+ -- error "TODO handle multiple dependency errors"

101+

102+ BadKernelHeader filePath ->

103+ Help.report "BAD KERNEL HEADER" Nothing

104+ "I ran into a bad header in this file:"

105+ [ D.indent 4 $ D.dullyellow $ D.fromChars filePath

106+ , D.reflow $

107+ "NOTE: Kernel code is only available to core Elm libraries to ensure\

108+ \ the portability and security of the Elm ecosystem. This restriction\

109+ \ also makes it possible to improve code gen (i.e. performance) without\

110+ \ disrupting the ecosystem."

111+ ]

112+

113+

114+

115+-- PROBLEM TO REPORT

116+

117+

118+problemToReport :: Problem -> Help.Report

119+problemToReport problem =

120+ case problem of

121+ ModuleNotFound origin name srcDirs ->

122+ notFoundToDoc origin name srcDirs

123+

124+ ModuleAmbiguous origin child paths pkgs ->

125+ ambiguousToDoc origin child paths pkgs

126+

127+ BadHeader path time source compilerError ->

128+ let

129+ compilerExit =

130+ Compile.Exit "???" path time source [compilerError]

131+ in

132+ Help.compilerReport compilerExit []

133+

134+ ModuleNameMissing path name ->

135+ namelessToDoc path name

136+

137+ ModuleNameMismatch path expected actual ->

138+ Help.report "MODULE NAME MISMATCH" (Just path)

139+ ( "The file at " ++ path ++ " has a typo in the module name. It says:"

140+ )

141+ [ D.indent 4 $ D.dullyellow $ "module" <+> D.red (D.fromChars (ModuleName.nameToChars actual)) <+> "exposing (..)"

142+ , "Looks like a typo or copy/paste error. Instead it needs to say:"

143+ , D.indent 4 $ D.dullyellow $ "module" <+> D.green (D.fromChars (ModuleName.nameToChars expected)) <+> "exposing (..)"

144+ , "Make the change and you should be all set!"

145+ ]

146+

147+ ModuleNameReservedForKernel origin name ->

148+ kernelNameToDoc origin name

149+

150+ PortsInPackage path name ->

151+ badTagToDoc path name "port" "port-modules" $

152+ "Packages cannot have any `port` modules."

153+

154+ EffectsUnexpected path name ->

155+ badTagToDoc path name "effect" "effect-modules" $

156+ "Creating `effect` modules is relatively experimental. There are a\

157+ \ couple in @elm repos right now, but we have decided to be very\

158+ \ cautious in expanding its usage."

159+

160+

161+badTagToDoc :: FilePath -> ModuleName.Raw -> String -> String -> String -> Help.Report

162+badTagToDoc path name tag hintName summary =

163+ Help.report

164+ ("UNEXPECTED " ++ map Char.toUpper tag ++ " MODULE")

165+ (Just path)

166+ summary

167+ [ D.fillSep $

168+ [ "Get", "rid", "of", "all", "the"

169+ , D.red (D.fromChars tag)

170+ , "stuff", "in"

171+ , D.dullyellow (D.fromChars (ModuleName.nameToChars name))

172+ , "to", "proceed."

173+ ]

174+ , D.toSimpleNote $

175+ "You can learn the reasoning behind this design choice at "

176+ ++ D.makeLink hintName

177+ ]

178+

179+

180+

181+-- NAMELESS

182+

183+

184+namelessToDoc :: FilePath -> ModuleName.Raw -> Help.Report

185+namelessToDoc path name =

186+ Help.report "UNNAMED MODULE" (Just path)

187+ ( "The `" ++ ModuleName.nameToChars name

188+ ++ "` module must start with a line like this:"

189+ )

190+ [ D.indent 4 $ D.dullyellow $ D.fromChars $

191+ "module " ++ ModuleName.nameToChars name ++ " exposing (..)"

192+ , D.reflow $

193+ "Try adding that as the first line of your file!"

194+ , D.toSimpleNote $

195+ "It is best to replace (..) with an explicit list of types and\

196+ \ functions you want to expose. If you know a value is only used\

197+ \ WITHIN this module, it is extra easy to refactor. This kind of\

198+ \ information is great, especially as your project grows!"

199+ ]

200+

201+

202+

203+-- NOT FOUND

204+

205+

206+notFoundToDoc :: Origin -> ModuleName.Raw -> SrcDirs -> Help.Report

207+notFoundToDoc origin child srcDirs =

208+ case origin of

209+ ElmJson ->

210+ Help.report "MODULE NOT FOUND" (Just "elm.json")

211+ "Your elm.json says your project has the following module:"

212+ [ D.indent 4 $ D.red $ D.fromChars $ ModuleName.nameToChars child

213+ , D.reflow $

214+ "When creating packages, all modules must live in the src/ directory."

215+ ]

216+

217+ File path ->

218+ Help.report "UNKNOWN IMPORT" (Just path)

219+ ("I cannot find a `" ++ ModuleName.nameToChars child ++ "` module to import.")

220+ (notFoundDetails child srcDirs)

221+

222+ Module path parent ->

223+ Help.report "UNKNOWN IMPORT" (Just path)

224+ ("The " ++ ModuleName.nameToChars parent ++ " module has a bad import:")

225+ (notFoundDetails child srcDirs)

226+

227+

228+notFoundDetails :: ModuleName.Raw -> SrcDirs -> [D.Doc]

229+notFoundDetails child srcDirs =

230+ let

231+ simulatedCode =

232+ D.indent 4 $ D.red $ D.fromChars $ "import " ++ ModuleName.nameToChars child

233+ in

234+ case Map.lookup child Pkg.suggestions of

235+ Just pkg ->

236+ [ simulatedCode

237+ , D.reflow $

238+ "Do you want the one from the " ++ Pkg.toChars pkg

239+ ++ " package? If so, run this command to add that dependency to your elm.json file:"

240+ , D.indent 4 $ D.green $ D.fromChars $ "elm install " ++ Pkg.toChars pkg

241+ , case srcDirs of

242+ Pkg ->

243+ D.reflow $

244+ "If you want a local file, make sure the `"

245+ ++ ModuleName.nameToChars child

246+ ++ "` module is in your src/ directory."

247+

248+ App _ ->

249+ D.reflow $

250+ "If you want a local file, make sure the `"

251+ ++ ModuleName.nameToChars child

252+ ++ "` module is in one of the \"source-directories\" listed in your elm.json file."

253+ ]

254+

255+ Nothing ->

256+ [ simulatedCode

257+ , "I cannot find that module! Is there a typo in the module name?"

258+ , D.reflow $

259+ case srcDirs of

260+ Pkg ->

261+ "When creating a package, all modules must live in the src/ directory."

262+

263+ App [] ->

264+ "The \"source-directories\" field of your elm.json is empty, so I only\

265+ \ searched in packages. Maybe you need to add a \"src\" directory there?"

266+

267+ App [dir] ->

268+ "The \"source-directories\" field of your elm.json tells me to only look in the "

269+ ++ dir ++ " directory, but it is not there. Maybe it is in a package that is not installed yet?"

270+

271+ App (dir:_:_) ->

272+ "The \"source-directories\" field of your elm.json tells me to look in directories like "

273+ ++ dir ++ ", but it is not in any of them. Maybe it is in a package that is not installed yet?"

274+ ]

275+

276+

277+ambiguousToDoc :: Origin -> ModuleName.Raw -> [FilePath] -> [Pkg.Canonical] -> Help.Report

278+ambiguousToDoc origin child paths pkgs =

279+ let

280+ pkgToString (Pkg.Canonical pkg vsn) =

281+ "exposed by " ++ Pkg.toChars pkg ++ " " ++ V.toChars vsn

282+

283+ makeReport maybePath summary yellowString =

284+ Help.report "AMBIGUOUS IMPORT" maybePath summary

285+ [ D.indent 4 $ D.dullyellow $ D.fromChars yellowString

286+ , D.reflow $

287+ "I found multiple module with that name though:"

288+ , D.indent 4 $ D.dullyellow $ D.vcat $

289+ map D.fromChars $ paths ++ map pkgToString pkgs

290+ , D.reflow $

291+ if null paths then

292+ "It looks like the name clash is in your dependencies, which is\

293+ \ out of your control. Elm does not support this scenario right\

294+ \ now, but it may be worthwhile. Please open an issue describing\

295+ \ your scenario so we can gather more usage information!"

296+ else

297+ "Which is the right one? Try renaming your modules to have unique names."

298+ ]

299+ in

300+ case origin of

301+ ElmJson ->

302+ makeReport

303+ Nothing

304+ "Your elm.json wants the following module:"

305+ (ModuleName.nameToChars child)

306+

307+ File path ->

308+ makeReport

309+ (Just path)

310+ ("The file at " ++ path ++ " has an ambiguous import:")

311+ ("import " ++ ModuleName.nameToChars child)

312+

313+ Module path parent ->

314+ makeReport

315+ (Just path)

316+ ("The " ++ ModuleName.nameToChars parent ++ " module has an ambiguous import:")

317+ ("import " ++ ModuleName.nameToChars child)

318+

319+

320+kernelNameToDoc :: Origin -> ModuleName.Raw -> Help.Report

321+kernelNameToDoc origin kernelName =

322+ let

323+ (maybePath, statement) =

324+ case origin of

325+ ElmJson ->

326+ ( Nothing

327+ , "Your elm.json says your project has the following module:"

328+ )

329+

330+ File path ->

331+ ( Just path

332+ , "This file is trying to import the following module:"

333+ )

334+

335+ Module path parent ->

336+ ( Just path

337+ , "Your " ++ ModuleName.nameToChars parent ++ " module is trying to import:"

338+ )

339+ in

340+ Help.report "BAD MODULE NAME" maybePath statement

341+ [ D.indent 4 $ D.dullyellow $ D.fromChars $ ModuleName.nameToChars kernelName

342+ , D.reflow $

343+ "But names like that are reserved for internal use.\

344+ \ Switch to a name outside of the Elm/Kernel/ namespace."

345+ ]

builder/src/Reporting/Exit/Deps.hsnew file+123

@@ -0,0 +1,123 @@

1+{-# LANGUAGE OverloadedStrings #-}

2+module Reporting.Exit.Deps

3+ ( Exit(..)

4+ , toReport

5+ )

6+ where

7+

8+

9+import qualified Elm.Constraint as Con

10+import qualified Elm.Package as Pkg

11+import qualified Elm.Version as V

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

13+import qualified Reporting.Doc as D

14+import qualified Reporting.Exit.Help as Help

15+

16+

17+

18+-- EXITS

19+

20+

21+data Exit

22+ = CorruptVersionCache FilePath Pkg.Name

23+ | PackageNotFound Pkg.Name [Pkg.Name]

24+ -- verify

25+ | PkgBadElm Con.Constraint

26+ | AppBadElm V.Version

27+ | AppMissingTrans [(Pkg.Name, V.Version)]

28+ | BadDeps

29+ | BuildFailure FilePath Pkg.Name V.Version

30+

31+

32+

33+-- TO DOC

34+

35+

36+toReport :: Exit -> Help.Report

37+toReport exit =

38+ case exit of

39+ CorruptVersionCache elmHome pkg ->

40+ Help.report "CORRUPT CACHE" Nothing

41+ ( "I ran into an unknown package while exploring dependencies:"

42+ )

43+ [ D.indent 4 $ D.dullyellow $ D.fromUtf8 $ Pkg.toString pkg

44+ , D.reflow $

45+ "This suggests that your " ++ elmHome ++ " directory has been corrupted.\

46+ \ Maybe some program is messing with it? It is just cached files,\

47+ \ so you can delete it and see if that fixes the issue."

48+ ]

49+

50+ PackageNotFound package suggestions ->

51+ Help.docReport "PACKAGE NOT FOUND" Nothing

52+ ( D.fillSep

53+ ["I","cannot","find","a"

54+ ,D.red (D.fromUtf8 (Pkg.toString package))

55+ ,"package","on","the","package","website."

56+ ]

57+ )

58+ [ "Maybe you want one of these instead?"

59+ , D.indent 4 $ D.dullyellow $ D.vcat $ map (D.fromUtf8 . Pkg.toString) suggestions

60+ , "But check <https://package.elm-lang.org> to see all possibilities!"

61+ ]

62+

63+ PkgBadElm constraint ->

64+ Help.report "ELM VERSION MISMATCH" (Just "elm.json")

65+ "Your elm.json says this package needs a version of Elm in this range:"

66+ [ D.indent 4 $ D.dullyellow $ D.fromUtf8 $ Con.toString constraint

67+ , D.fillSep

68+ [ "But", "you", "are", "using", "Elm"

69+ , D.red (D.fromUtf8 (V.toString V.compiler))

70+ , "right", "now."

71+ ]

72+ ]

73+

74+ AppBadElm version ->

75+ Help.report "ELM VERSION MISMATCH" (Just "elm.json")

76+ "Your elm.json says this application needs a different version of Elm."

77+ [ D.fillSep

78+ [ "It", "requires"

79+ , D.green (D.fromUtf8 (V.toString version)) <> ","

80+ , "but", "you", "are", "using"

81+ , D.red (D.fromUtf8 (V.toString V.compiler))

82+ , "right", "now."

83+ ]

84+ ]

85+

86+ AppMissingTrans missingDeps ->

87+ let

88+ toEntry (pkg, vsn) =

89+ "\"" ++ Pkg.toChars pkg ++ "\": \"" ++ V.toChars vsn ++ "\""

90+ in

91+ Help.report "MISSING DEPENDENCIES" (Just "elm.json")

92+ "Your elm.json is missing some \"indirect\" dependencies:"

93+ [ D.indent 4 $ D.dullyellow $ D.vcat $ map (D.fromChars . toEntry) missingDeps

94+ , D.fillSep

95+ ["This","usually","means","you","are","editing","elm.json","by","hand."

96+ ,"It","is","much","more","reliable","to","use","the"

97+ ,D.green "elm install","command","instead."

98+ ]

99+ ]

100+

101+ BadDeps ->

102+ Help.report "INVALID PACKAGE DEPENDENCIES" (Just "elm.json")

103+ "The dependencies in your elm.json are not compatible."

104+ [ D.fillSep

105+ ["Did","you","change","them","by","hand?","Try","to","change","it","back!"

106+ ,"It","is","much","better","to","add","dependencies","with",D.green "elm install"

107+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."

108+ ]

109+ , D.reflow $

110+ "Please ask for help on the Elm slack <http://elmlang.herokuapp.com/> if\

111+ \ you try those paths and still cannot figure it out!"

112+ ]

113+

114+ BuildFailure elmHome pkg vsn ->

115+ Help.report "CORRUPT DEPENDENCY" Nothing

116+ "I ran into a problem while building the following package:"

117+ [ D.indent 4 $ D.red $ D.fromChars $ Pkg.toChars pkg ++ " " ++ V.toChars vsn

118+ , D.fillSep

119+ ["This","probably","means","the","downloaded","files","got","corrupted","somehow."

120+ ,"Try","deleting",D.dullyellow (D.fromChars elmHome),"(a","directory","for"

121+ ,"caching","build","artifacts)","and","see","if","that","resolves","the","issue."

122+ ]

123+ ]

builder/src/Reporting/Exit/Help.hs+10−9

@@ -14,6 +14,7 @@ module Reporting.Exit.Help

1414 where

1515

1616

17+import qualified Data.Utf8 as Utf8

1718import GHC.IO.Handle (hIsTerminalDevice)

1819import System.IO (Handle, hPutStr, stderr, stdout)

1920

@@ -29,7 +30,7 @@ import qualified Reporting.Error as Error

2930

3031

3132data Report

32− = CompilerReport FilePath Error.Module [Error.Module]

33+ = CompilerReport Error.Module [Error.Module]

3334 | Report

3435 { _title :: String

3536 , _path :: Maybe FilePath

@@ -52,7 +53,7 @@ jsonReport =

5253 Report

5354

5455

55−compilerReport :: FilePath -> Error.Module -> [Error.Module] -> Report

56+compilerReport :: Error.Module -> [Error.Module] -> Report

5657compilerReport =

5758 CompilerReport

5859

@@ -64,8 +65,8 @@ compilerReport =

6465reportToDoc :: Report -> D.Doc

6566reportToDoc report_ =

6667 case report_ of

67− CompilerReport root e es ->

68− Error.toDoc root e es

68+ CompilerReport e es ->

69+ Error.toDoc e es

6970

7071 Report title maybePath message ->

7172 let

@@ -94,17 +95,17 @@ reportToDoc report_ =

9495reportToJson :: Report -> E.Value

9596reportToJson report_ =

9697 case report_ of

97− CompilerReport _ e es ->

98+ CompilerReport e es ->

9899 E.object

99− [ "type" ==> E.chars "compile-errors"

100+ [ "type" ==> E.string "compile-errors"

100101 , "errors" ==> E.list Error.toJson (e:es)

101102 ]

102103

103104 Report title maybePath message ->

104105 E.object

105− [ "type" ==> E.chars "error"

106− , "path" ==> maybe E.null E.chars maybePath

107− , "title" ==> E.chars title

106+ [ "type" ==> E.string "error"

107+ , "path" ==> maybe E.null (E.string . Utf8.fromChars) maybePath

108+ , "title" ==> E.string (Utf8.fromChars title)

108109 , "message" ==> D.encode message

109110 ]

110111

builder/src/Reporting/Exit/Http.hsnew file+104

@@ -0,0 +1,104 @@

1+{-# LANGUAGE OverloadedStrings #-}

2+module Reporting.Exit.Http

3+ ( Exit(..)

4+ , toReport

5+ , BadJson(..)

6+ , badJsonToDocs

7+ )

8+ where

9+

10+

11+import qualified Data.Text as Text

12+

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

14+import qualified Reporting.Doc as D

15+import qualified Reporting.Exit.Help as Help

16+

17+

18+

19+-- EXITS

20+

21+

22+data Exit

23+ = Unknown String

24+ | BadJson String D.Doc

25+ | BadZipData

26+ | BadZipSha String String

27+

28+

29+

30+-- TO REPORT

31+

32+

33+toReport :: String -> Exit -> Help.Report

34+toReport url exit =

35+ let

36+ urlDoc =

37+ D.indent 4 $ D.dullyellow $ "<" <> D.fromString url <> ">"

38+ in

39+ case exit of

40+ Unknown message ->

41+ Help.report "HTTP PROBLEM" Nothing "The following HTTP request failed:"

42+ [ urlDoc

43+ , D.stack

44+ [ "Here is the error message I was able to extract:"

45+ , D.indent 4 $ D.reflow message

46+ ]

47+ ]

48+

49+ BadJson path doc ->

50+ Help.jsonReport "UNEXPECTED JSON" (Just path) doc

51+

52+ BadZipData ->

53+ Help.report "CORRUPT ZIP" Nothing "I could not unzip the file downloaded from:"

54+ [ urlDoc

55+ , D.reflow $

56+ "If it is a transient issue, it should be fixed if you try this\

57+ \ again. If it seems like an Elm problem, please report it though!"

58+ ]

59+

60+ BadZipSha expectedHash actualHash ->

61+ Help.report "CORRUPT ZIP" Nothing "I got an unexpected zip file from:"

62+ [ urlDoc

63+ , D.reflow "I check the hash the zip, and it seems off:"

64+ , D.vcat $ map D.fromString $

65+ [ " Expected: " ++ expectedHash

66+ , " Actual: " ++ actualHash

67+ ]

68+ , D.reflow $

69+ "This usually means that the package author moved the version\

70+ \ tag, so report it to them and see if that is the issue. Folks\

71+ \ on Elm slack can probably help as well."

72+ ]

73+

74+

75+

76+-- BAD JSON

77+

78+

79+data BadJson

80+ = BadNewPkg Text.Text

81+ | BadAllPkg Text.Text String

82+ | BadAllVsn Text.Text

83+

84+

85+badJsonToDocs :: BadJson -> [D.Doc]

86+badJsonToDocs badJson =

87+ case badJson of

88+ BadNewPkg txt ->

89+ ["I","ran","into",D.red (D.fromString (show txt)) <> ","

90+ ,"but","I","need","entries","like"

91+ ,D.green "\"elm/core@6.0.0\"" <> "."

92+ ]

93+

94+ BadAllPkg txt suggestion ->

95+ ["The",D.red (D.fromString (show txt)),"value","is","not","a","valid","package","name."

96+ ]

97+ ++ map D.fromString (words suggestion)

98+

99+ BadAllVsn txt ->

100+ ["You","provided",D.red (D.fromString (show txt))

101+ ,"which","is","not","a","valid","version.","I","need","something","like"

102+ ,D.green "\"1.0.0\"","or",D.green "\"2.0.4\"" <> "."

103+ ]

104+

builder/src/Reporting/Task.hs−17

@@ -3,10 +3,8 @@ module Reporting.Task

33 ( Task

44 , run

55 , throw

6− , mapError

76 --

87 , io

9− , mio

108 , eio

119 )

1210 where

@@ -33,12 +31,6 @@ throw x =

3331 Task $ \_ err -> err x

3432

3533

36−mapError :: (x -> y) -> Task x a -> Task y a

37−mapError func (Task task) =

38− Task $ \ok err ->

39− task ok (err . func)

40−

41−

4234

4335-- IO

4436

@@ -49,15 +41,6 @@ io work =

4941 Task $ \ok _ -> work >>= ok

5042

5143

52−mio :: x -> IO (Maybe a) -> Task x a

53−mio x work =

54− Task $ \ok err ->

55− do result <- work

56− case result of

57− Just a -> ok a

58− Nothing -> err x

59−

60−

6144eio :: (x -> y) -> IO (Either x a) -> Task y a

6245eio func work =

6346 Task $ \ok err ->

builder/src/Stuff.hs+9−8

@@ -8,8 +8,8 @@ module Stuff

88 , elmo

99 , temp

1010 , findRoot

11− , withRootLock

12− , withRegistryLock

11+ , withProjectLock

12+ , withCacheLock

1313 , PackageCache

1414 , getPackageCache

1515 , registry

@@ -120,16 +120,17 @@ findRootHelp dirs =

120120-- LOCKS

121121

122122

123−withRootLock :: FilePath -> IO a -> IO a

124−withRootLock root work =

123+withProjectLock :: FilePath -> IO a -> IO a

124+withProjectLock root work =

125125 do let dir = stuff root

126126 Dir.createDirectoryIfMissing True dir

127− Lock.withFileLock (dir </> "lock") Lock.Exclusive (\_ -> work)

127+ Lock.withFileLock (dir </> "project.lock") Lock.Exclusive (\_ -> work)

128128

129129

130−withRegistryLock :: PackageCache -> IO a -> IO a

131−withRegistryLock (PackageCache dir) work =

132− Lock.withFileLock (dir </> "lock") Lock.Exclusive (\_ -> work)

130+withCacheLock :: PackageCache -> IO a -> IO a

131+withCacheLock (PackageCache dir) work =

132+ Lock.withFileLock (dir </> "cache.lock") Lock.Exclusive (\_ -> work)

133+

133134

134135

135136

cabal.configdeleted−2

@@ -1,2 +0,0 @@

1−profiling: False

2−library-profiling: True

compiler/src/AST/Canonical.hs+9−10

@@ -56,14 +56,13 @@ import Data.Binary

5656import qualified Data.List as List

5757import qualified Data.Map as Map

5858import Data.Name (Name)

59+import qualified Data.Utf8 as Utf8

5960

6061import qualified AST.Source as Src

6162import qualified AST.Utils.Binop as Binop

6263import qualified AST.Utils.Shader as Shader

6364import qualified Data.Index as Index

64−import qualified Elm.Float as EF

6565import qualified Elm.ModuleName as ModuleName

66−import qualified Elm.String as ES

6766import qualified Reporting.Annotation as A

6867

6968

@@ -84,10 +83,10 @@ data Expr_

8483 | VarCtor CtorOpts ModuleName.Canonical Name Index.ZeroBased Annotation

8584 | VarDebug ModuleName.Canonical Name Annotation

8685 | VarOperator Name ModuleName.Canonical Name Annotation -- CACHE real name for optimization

87− | Chr ES.String

88− | Str ES.String

86+ | Chr Utf8.String

87+ | Str Utf8.String

8988 | Int Int

90− | Float EF.Float

89+ | Float (Utf8.Under256 Float)

9190 | List [Expr]

9291 | Negate Expr

9392 | Binop Name ModuleName.Canonical Name Annotation Expr Expr -- CACHE real name for optimization

@@ -152,8 +151,8 @@ data Pattern_

152151 | PList [Pattern]

153152 | PCons Pattern Pattern

154153 | PBool Union Bool

155− | PChr ES.String

156− | PStr ES.String

154+ | PChr Utf8.String

155+ | PStr Utf8.String

157156 | PInt Int

158157 | PCtor

159158 { _p_home :: ModuleName.Canonical

@@ -233,7 +232,7 @@ data Module =

233232 Module

234233 { _name :: ModuleName.Canonical

235234 , _exports :: Exports

236− , _docs :: Src.Docs

235+ , _docs :: Maybe Src.Docs

237236 , _decls :: Decls

238237 , _unions :: Map.Map Name Union

239238 , _aliases :: Map.Map Name Alias

@@ -342,7 +341,7 @@ instance Binary CtorOpts where

342341 0 -> return Normal

343342 1 -> return Enum

344343 2 -> return Unbox

345− _ -> fail "binary encoding of CtorOpts was corrupted"

344+ _ -> error "binary encoding of CtorOpts was corrupted"

346345

347346

348347instance Binary Annotation where

@@ -393,7 +392,7 @@ instance Binary AliasType where

393392 case n of

394393 0 -> liftM Holey get

395394 1 -> liftM Filled get

396− _ -> fail "binary encoding of AliasType was corrupted"

395+ _ -> error "binary encoding of AliasType was corrupted"

397396

398397

399398instance Binary FieldType where

compiler/src/AST/Optimized.hs+13−14

@@ -27,15 +27,14 @@ import qualified Data.Map as Map

2727import qualified Data.Name as Name

2828import Data.Name (Name)

2929import qualified Data.Set as Set

30+import qualified Data.Utf8 as Utf8

3031

3132import qualified AST.Canonical as Can

3233import qualified AST.Utils.Shader as Shader

3334import qualified Data.Index as Index

34−import qualified Elm.Float as EF

3535import qualified Elm.Kernel as K

3636import qualified Elm.ModuleName as ModuleName

3737import qualified Elm.Package as Pkg

38−import qualified Elm.String as ES

3938import qualified Optimize.DecisionTree as DT

4039import qualified Reporting.Annotation as A

4140

@@ -46,10 +45,10 @@ import qualified Reporting.Annotation as A

4645

4746data Expr

4847 = Bool Bool

49− | Chr ES.String

50− | Str ES.String

48+ | Chr Utf8.String

49+ | Str Utf8.String

5150 | Int Int

52− | Float EF.Float

51+ | Float (Utf8.Under256 Float)

5352 | VarLocal Name

5453 | VarGlobal Global

5554 | VarEnum Global Index.ZeroBased

@@ -135,7 +134,7 @@ data GlobalGraph =

135134data LocalGraph =

136135 LocalGraph

137136 { _l_main :: Maybe Main

138− , _l_nodes :: Map.Map Global Node -- PERF profile switching Global to Name

137+ , _l_nodes :: Map.Map Global Node -- TODO profile switching Global to Name

139138 , _l_fields :: Map.Map Name Int

140139 }

141140

@@ -308,7 +307,7 @@ instance Binary Expr where

308307 24 -> pure Unit

309308 25 -> liftM3 Tuple get get get

310309 26 -> liftM3 Shader get get get

311− _ -> fail "problem getting Opt.Expr binary"

310+ _ -> error "problem getting Opt.Expr binary"

312311

313312

314313instance Binary Def where

@@ -322,7 +321,7 @@ instance Binary Def where

322321 case word of

323322 0 -> liftM2 Def get get

324323 1 -> liftM3 TailDef get get get

325− _ -> fail "problem getting Opt.Def binary"

324+ _ -> error "problem getting Opt.Def binary"

326325

327326

328327instance Binary Destructor where

@@ -345,7 +344,7 @@ instance Binary Path where

345344 1 -> liftM2 Field get get

346345 2 -> liftM Unbox get

347346 3 -> liftM Root get

348− _ -> fail "problem getting Opt.Path binary"

347+ _ -> error "problem getting Opt.Path binary"

349348

350349

351350instance (Binary a) => Binary (Decider a) where

@@ -361,7 +360,7 @@ instance (Binary a) => Binary (Decider a) where

361360 0 -> liftM Leaf get

362361 1 -> liftM3 Chain get get get

363362 2 -> liftM3 FanOut get get get

364− _ -> fail "problem getting Opt.Decider binary"

363+ _ -> error "problem getting Opt.Decider binary"

365364

366365

367366instance Binary Choice where

@@ -375,7 +374,7 @@ instance Binary Choice where

375374 case word of

376375 0 -> liftM Inline get

377376 1 -> liftM Jump get

378− _ -> fail "problem getting Opt.Choice binary"

377+ _ -> error "problem getting Opt.Choice binary"

379378

380379

381380

@@ -400,7 +399,7 @@ instance Binary Main where

400399 case word of

401400 0 -> return Static

402401 1 -> liftM2 Dynamic get get

403− _ -> fail "problem getting Opt.Main binary"

402+ _ -> error "problem getting Opt.Main binary"

404403

405404

406405instance Binary Node where

@@ -432,7 +431,7 @@ instance Binary Node where

432431 8 -> liftM2 Kernel get get

433432 9 -> liftM2 PortIncoming get get

434433 10 -> liftM2 PortOutgoing get get

435− _ -> fail "problem getting Opt.Node binary"

434+ _ -> error "problem getting Opt.Node binary"

436435

437436

438437instance Binary EffectsType where

@@ -448,4 +447,4 @@ instance Binary EffectsType where

448447 0 -> return Cmd

449448 1 -> return Sub

450449 2 -> return Fx

451− _ -> fail "problem getting Opt.EffectsType binary"

450+ _ -> error "problem getting Opt.EffectsType binary"

compiler/src/AST/Source.hs+32−21

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

11{-# OPTIONS_GHC -Wall #-}

2+{-# LANGUAGE OverloadedStrings #-}

23module AST.Source

34 ( Expr, Expr_(..), VarType(..)

45 , Def(..)

@@ -25,13 +26,12 @@ module AST.Source

2526

2627

2728import Data.Name (Name)

28−import qualified Data.Name as Name

29+import qualified Data.Utf8 as Utf8

30+import Data.Word (Word8)

31+import Foreign.Ptr (Ptr)

2932

3033import qualified AST.Utils.Binop as Binop

3134import qualified AST.Utils.Shader as Shader

32−import qualified Elm.Float as EF

33−import qualified Elm.String as ES

34−import qualified Parse.Primitives as P

3535import qualified Reporting.Annotation as A

3636

3737

@@ -43,10 +43,10 @@ type Expr = A.Located Expr_

4343

4444

4545data Expr_

46− = Chr ES.String

47− | Str ES.String

46+ = Chr Utf8.String

47+ | Str Utf8.String

4848 | Int Int

49− | Float EF.Float

49+ | Float (Utf8.Under256 Float)

5050 | Var VarType Name

5151 | VarQual VarType Name Name

5252 | List [Expr]

@@ -97,8 +97,8 @@ data Pattern_

9797 | PCtorQual A.Region Name Name [Pattern]

9898 | PList [Pattern]

9999 | PCons Pattern Pattern

100− | PChr ES.String

101− | PStr ES.String

100+ | PChr Utf8.String

101+ | PStr Utf8.String

102102 | PInt Int

103103

104104

@@ -128,7 +128,7 @@ data Module =

128128 Module

129129 { _name :: Maybe (A.Located Name)

130130 , _exports :: A.Located Exposing

131− , _docs :: Docs

131+ , _docs :: Maybe Docs

132132 , _imports :: [Import]

133133 , _values :: [A.Located Value]

134134 , _unions :: [A.Located Union]

@@ -145,7 +145,13 @@ getName (Module maybeName _ _ _ _ _ _ _ _) =

145145 name

146146

147147 Nothing ->

148− Name._Main

148+ defaultModuleName

149+

150+

151+{-# NOINLINE defaultModuleName #-}

152+defaultModuleName :: Name

153+defaultModuleName =

154+ "Main"

149155

150156

151157getImportName :: Import -> Name

@@ -180,13 +186,18 @@ data Manager

180186 | Fx (A.Located Name) (A.Located Name)

181187

182188

183−data Docs

184− = NoDocs A.Region

185− | YesDocs Comment [(Name, Comment)]

189+data Docs =

190+ Docs

191+ { _overview :: Comment

192+ , _comments :: [(Name, Comment)]

193+ }

186194

187195

188−newtype Comment =

189− Comment P.Snippet

196+data Comment =

197+ Comment

198+ { _start :: Ptr Word8

199+ , _end :: Ptr Word8

200+ }

190201

191202

192203

@@ -195,15 +206,15 @@ newtype Comment =

195206

196207data Exposing

197208 = Open

198− | Explicit [Exposed]

209+ | Explicit [A.Located Exposed]

199210

200211

201212data Exposed

202− = Lower (A.Located Name)

203− | Upper (A.Located Name) Privacy

204− | Operator A.Region Name

213+ = Lower Name

214+ | Upper Name Privacy

215+ | Operator Name

205216

206217

207218data Privacy

208− = Public A.Region

219+ = Public

209220 | Private

compiler/src/AST/Utils/Binop.hs+6−5

@@ -41,11 +41,12 @@ instance Binary Precedence where

4141instance Binary Associativity where

4242 get =

4343 do n <- getWord8

44− case n of

45− 0 -> return Left

46− 1 -> return Non

47− 2 -> return Right

48− _ -> fail "Error reading valid associativity from serialized string"

44+ return $

45+ case n of

46+ 0 -> Left

47+ 1 -> Non

48+ 2 -> Right

49+ _ -> error "Error reading valid associativity from serialized string"

4950

5051 put assoc =

5152 putWord8 $

compiler/src/AST/Utils/Shader.hs+4−51

@@ -4,27 +4,22 @@ module AST.Utils.Shader

44 ( Source

55 , Types(..)

66 , Type(..)

7− , fromChars

8− , toJsStringBuilder

97 )

108 where

119

1210

13−import Control.Monad (liftM)

14−import Data.Binary (Binary, get, put)

15−import qualified Data.ByteString as BS

16−import qualified Data.ByteString.Builder as B

17−import qualified Data.ByteString.UTF8 as BS_UTF8

1811import qualified Data.Map as Map

1912import qualified Data.Name as Name

13+import qualified Data.Utf8 as Utf8

2014

2115

2216

2317-- SOURCE

2418

2519

26−newtype Source =

27− Source BS.ByteString

20+type Source = Utf8.VeryLong SOURCE

21+

22+data SOURCE

2823

2924

3025

@@ -47,45 +42,3 @@ data Type

4742 | V4

4843 | M4

4944 | Texture

50−

51−

52−

53−-- TO BUILDER

54−

55−

56−toJsStringBuilder :: Source -> B.Builder

57−toJsStringBuilder (Source src) =

58− B.byteString src

59−

60−

61−

62−-- FROM CHARS

63−

64−

65−fromChars :: [Char] -> Source

66−fromChars chars =

67− Source (BS_UTF8.fromString (escape chars))

68−

69−

70−escape :: [Char] -> [Char]

71−escape chars =

72− case chars of

73− [] ->

74− []

75−

76− c:cs

77− | c == '\r' -> escape cs

78− | c == '\n' -> '\\' : 'n' : escape cs

79− | c == '\"' -> '\\' : '"' : escape cs

80− | c == '\'' -> '\\' : '\'' : escape cs

81− | c == '\\' -> '\\' : '\\' : escape cs

82− | otherwise -> c : escape cs

83−

84−

85−

86−-- BINARY

87−

88−

89−instance Binary Source where

90− get = liftM Source get

91− put (Source a) = put a

compiler/src/AST/Utils/Type.hs+1

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

11{-# OPTIONS_GHC -Wall #-}

2+{-# LANGUAGE OverloadedStrings #-}

23module AST.Utils.Type

34 ( delambda

45 , dealias

compiler/src/Canonicalize/Environment.hs+20−50

@@ -4,8 +4,6 @@ module Canonicalize.Environment

44 ( Env(..)

55 , Exposed

66 , Qualified

7− , Info(..)

8− , mergeInfo

97 , Var(..)

108 , Type(..)

119 , Ctor(..)

@@ -22,8 +20,8 @@ module Canonicalize.Environment

2220

2321import qualified Data.Map.Merge.Strict as Map

2422import qualified Data.Map.Strict as Map

23+import qualified Data.Map.Strict.Internal as I

2524import qualified Data.Name as Name

26−import qualified Data.OneOrMore as OneOrMore

2725

2826import qualified AST.Utils.Binop as Binop

2927import qualified AST.Canonical as Can

@@ -60,34 +58,11 @@ data Env =

6058

6159

6260type Exposed a =

63− Map.Map Name.Name (Info a)

61+ Map.Map Name.Name (Map.Map ModuleName.Canonical a)

6462

6563

6664type Qualified a =

67− Map.Map Name.Name (Map.Map Name.Name (Info a))

68−

69−

70−

71−-- INFO

72−

73−

74−data Info a

75− = Specific ModuleName.Canonical a

76− | Ambiguous ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

77−

78−

79−mergeInfo :: Info a -> Info a -> Info a

80−mergeInfo info1 info2 =

81− case info1 of

82− Specific h1 _ ->

83− case info2 of

84− Specific h2 _ -> if h1 == h2 then info1 else Ambiguous h1 (OneOrMore.one h2)

85− Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more (OneOrMore.one h2) hs2)

86−

87− Ambiguous h1 hs1 ->

88− case info2 of

89− Specific h2 _ -> Ambiguous h1 (OneOrMore.more hs1 (OneOrMore.one h2))

90− Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more hs1 (OneOrMore.more (OneOrMore.one h2) hs2))

65+ Map.Map Name.Name (Map.Map Name.Name (Map.Map ModuleName.Canonical a))

9166

9267

9368

@@ -97,8 +72,7 @@ mergeInfo info1 info2 =

9772data Var

9873 = Local A.Region

9974 | TopLevel A.Region

100− | Foreign ModuleName.Canonical Can.Annotation

101− | Foreigns ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

75+ | Foreign (Map.Map ModuleName.Canonical Can.Annotation)

10276

10377

10478

@@ -165,10 +139,7 @@ addLocalLeft _ region =

165139addLocalBoth :: Name.Name -> A.Region -> Var -> Result i w Var

166140addLocalBoth name region var =

167141 case var of

168− Foreign _ _ ->

169− Result.ok (Local region)

170−

171− Foreigns _ _ ->

142+ Foreign _ ->

172143 Result.ok (Local region)

173144

174145 Local parentRegion ->

@@ -179,18 +150,17 @@ addLocalBoth name region var =

179150

180151

181152

182−

183153-- FIND TYPE

184154

185155

186156findType :: A.Region -> Env -> Name.Name -> Result i w Type

187157findType region (Env _ _ ts _ _ _ qts _) name =

188158 case Map.lookup name ts of

189− Just (Specific _ tipe) ->

159+ Just (I.Bin 1 _ tipe _ _) ->

190160 Result.ok tipe

191161

192− Just (Ambiguous h hs) ->

193− Result.throw (Error.AmbiguousType region Nothing name h hs)

162+ Just homes ->

163+ Result.throw (Error.AmbiguousType region Nothing name (Map.keys homes))

194164

195165 Nothing ->

196166 Result.throw (Error.NotFoundType region Nothing name (toPossibleNames ts qts))

@@ -201,11 +171,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =

201171 case Map.lookup prefix qts of

202172 Just qualified ->

203173 case Map.lookup name qualified of

204− Just (Specific _ tipe) ->

174+ Just (I.Bin 1 _ tipe _ _) ->

205175 Result.ok tipe

206176

207− Just (Ambiguous h hs) ->

208− Result.throw (Error.AmbiguousType region (Just prefix) name h hs)

177+ Just homes ->

178+ Result.throw (Error.AmbiguousType region (Just prefix) name (Map.keys homes))

209179

210180 Nothing ->

211181 Result.throw (Error.NotFoundType region (Just prefix) name (toPossibleNames ts qts))

@@ -221,11 +191,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =

221191findCtor :: A.Region -> Env -> Name.Name -> Result i w Ctor

222192findCtor region (Env _ _ _ cs _ _ _ qcs) name =

223193 case Map.lookup name cs of

224− Just (Specific _ ctor) ->

194+ Just (I.Bin 1 _ ctor _ _) ->

225195 Result.ok ctor

226196

227− Just (Ambiguous h hs) ->

228− Result.throw (Error.AmbiguousVariant region Nothing name h hs)

197+ Just homes ->

198+ Result.throw (Error.AmbiguousVariant region Nothing name (Map.keys homes))

229199

230200 Nothing ->

231201 Result.throw (Error.NotFoundVariant region Nothing name (toPossibleNames cs qcs))

@@ -236,11 +206,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =

236206 case Map.lookup prefix qcs of

237207 Just qualified ->

238208 case Map.lookup name qualified of

239− Just (Specific _ pattern) ->

209+ Just (I.Bin 1 _ pattern _ _) ->

240210 Result.ok pattern

241211

242− Just (Ambiguous h hs) ->

243− Result.throw (Error.AmbiguousVariant region (Just prefix) name h hs)

212+ Just homes ->

213+ Result.throw (Error.AmbiguousVariant region (Just prefix) name (Map.keys homes))

244214

245215 Nothing ->

246216 Result.throw (Error.NotFoundVariant region (Just prefix) name (toPossibleNames cs qcs))

@@ -256,11 +226,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =

256226findBinop :: A.Region -> Env -> Name.Name -> Result i w Binop

257227findBinop region (Env _ _ _ _ binops _ _ _) name =

258228 case Map.lookup name binops of

259− Just (Specific _ binop) ->

229+ Just (I.Bin 1 _ binop _ _) ->

260230 Result.ok binop

261231

262− Just (Ambiguous h hs) ->

263− Result.throw (Error.AmbiguousBinop region name h hs)

232+ Just homes ->

233+ Result.throw (Error.AmbiguousBinop region name (Map.keys homes))

264234

265235 Nothing ->

266236 Result.throw (Error.NotFoundBinop region name (Map.keysSet binops))

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

@@ -105,7 +105,7 @@ one name region value =

105105

106106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a

107107insert name region value dict =

108− Map.insertWith (\new old -> OneOrMore.more old new) name (OneOrMore.one (Info region value)) dict

108+ Map.insertWith OneOrMore.more name (OneOrMore.one (Info region value)) dict

109109

110110

111111union :: Dict a -> Dict a -> Dict a

compiler/src/Canonicalize/Environment/Foreign.hs+37−49

@@ -35,14 +35,7 @@ type Result i w a =

3535createInitialEnv :: ModuleName.Canonical -> Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Result i w Env.Env

3636createInitialEnv home ifaces imports =

3737 do (State vs ts cs bs qvs qts qcs) <- foldM (addImport ifaces) emptyState (toSafeImports home imports)

38− Result.ok (Env.Env home (Map.map infoToVar vs) ts cs bs qvs qts qcs)

39−

40−

41−infoToVar :: Env.Info Can.Annotation -> Env.Var

42−infoToVar info =

43− case info of

44− Env.Specific home tipe -> Env.Foreign home tipe

45− Env.Ambiguous h hs -> Env.Foreigns h hs

38+ Result.ok (Env.Env home (Map.map Env.Foreign vs) ts cs bs qvs qts qcs)

4639

4740

4841

@@ -68,7 +61,7 @@ emptyState =

6861

6962emptyTypes :: Env.Exposed Env.Type

7063emptyTypes =

71− Map.singleton "List" (Env.Specific ModuleName.list (Env.Union 1 ModuleName.list))

64+ Map.singleton "List" (Map.singleton ModuleName.list (Env.Union 1 ModuleName.list))

7265

7366

7467

@@ -109,8 +102,8 @@ addImport ifaces (State vs ts cs bs qvs qts qcs) (Src.Import (A.At _ name) maybe

109102 (Map.mapMaybeWithKey (unionToType home) unions)

110103 (Map.mapMaybeWithKey (aliasToType home) aliases)

111104

112− !vars = Map.map (Env.Specific home) defs

113− !types = Map.map (Env.Specific home . fst) rawTypeInfo

105+ !vars = Map.map (Map.singleton home) defs

106+ !types = Map.map (Map.singleton home . fst) rawTypeInfo

114107 !ctors = Map.foldr (addExposed . snd) Map.empty rawTypeInfo

115108

116109 !qvs2 = addQualified prefix vars qvs

@@ -136,7 +129,7 @@ addImport ifaces (State vs ts cs bs qvs qts qcs) (Src.Import (A.At _ name) maybe

136129

137130addExposed :: Env.Exposed a -> Env.Exposed a -> Env.Exposed a

138131addExposed =

139− Map.unionWith Env.mergeInfo

132+ Map.unionWith Map.union

140133

141134

142135addQualified :: Name.Name -> Env.Exposed a -> Env.Qualified a -> Env.Qualified a

@@ -157,7 +150,7 @@ unionToTypeHelp :: ModuleName.Canonical -> Name.Name -> Can.Union -> (Env.Type,

157150unionToTypeHelp home name union@(Can.Union vars ctors _ _) =

158151 let

159152 addCtor dict (Can.Ctor ctor index _ args) =

160− Map.insert ctor (Env.Specific home (Env.Ctor home name union index args)) dict

153+ Map.insert ctor (Map.singleton home (Env.Ctor home name union index args)) dict

161154 in

162155 ( Env.Union (length vars) home

163156 , List.foldl' addCtor Map.empty ctors

@@ -188,7 +181,7 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =

188181 (Can.TAlias home name avars (Can.Filled tipe))

189182 (Can.fieldsToList fields)

190183 in

191− Map.singleton name (Env.Specific home (Env.RecordCtor home vars alias))

184+ Map.singleton name (Map.singleton home (Env.RecordCtor home vars alias))

192185

193186 _ ->

194187 Map.empty

@@ -199,9 +192,9 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =

199192-- BINOP

200193

201194

202−binopToBinop :: ModuleName.Canonical -> Name.Name -> I.Binop -> Env.Info Env.Binop

195+binopToBinop :: ModuleName.Canonical -> Name.Name -> I.Binop -> Map.Map ModuleName.Canonical Env.Binop

203196binopToBinop home op (I.Binop name annotation associativity precedence) =

204− Env.Specific home (Env.Binop op home name annotation associativity precedence)

197+ Map.singleton home (Env.Binop op home name annotation associativity precedence)

205198

206199

207200

@@ -214,19 +207,19 @@ addExposedValue

214207 -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor)

215208 -> Map.Map Name.Name I.Binop

216209 -> State

217− -> Src.Exposed

210+ -> A.Located Src.Exposed

218211 -> Result i w State

219−addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =

212+addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) (A.At region exposed) =

220213 case exposed of

221− Src.Lower (A.At region name) ->

214+ Src.Lower name ->

222215 case Map.lookup name vars of

223216 Just info ->

224− Result.ok (State (Map.insertWith Env.mergeInfo name info vs) ts cs bs qvs qts qcs)

217+ Result.ok (State (Map.insert name info vs) ts cs bs qvs qts qcs)

225218

226219 Nothing ->

227220 Result.throw (Error.ImportExposingNotFound region home name (Map.keys vars))

228221

229− Src.Upper (A.At region name) privacy ->

222+ Src.Upper name privacy ->

230223 case privacy of

231224 Src.Private ->

232225 case Map.lookup name types of

@@ -234,43 +227,43 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =

234227 case tipe of

235228 Env.Union _ _ ->

236229 let

237− !ts2 = Map.insert name (Env.Specific home tipe) ts

230+ !ts2 = Map.insert name (Map.singleton home tipe) ts

238231 in

239232 Result.ok (State vs ts2 cs bs qvs qts qcs)

240233

241234 Env.Alias _ _ _ _ ->

242235 let

243− !ts2 = Map.insert name (Env.Specific home tipe) ts

236+ !ts2 = Map.insert name (Map.singleton home tipe) ts

244237 !cs2 = addExposed cs ctors

245238 in

246239 Result.ok (State vs ts2 cs2 bs qvs qts qcs)

247240

248241 Nothing ->

249− case checkForCtorMistake name types of

250− tipe:_ ->

242+ case Map.lookup name (toCtors types) of

243+ Just tipe ->

251244 Result.throw $ Error.ImportCtorByName region name tipe

252245

253− [] ->

246+ Nothing ->

254247 Result.throw $ Error.ImportExposingNotFound region home name (Map.keys types)

255248

256− Src.Public dotDotRegion ->

249+ Src.Public ->

257250 case Map.lookup name types of

258251 Just (tipe, ctors) ->

259252 case tipe of

260253 Env.Union _ _ ->

261254 let

262− !ts2 = Map.insert name (Env.Specific home tipe) ts

255+ !ts2 = Map.insert name (Map.singleton home tipe) ts

263256 !cs2 = addExposed cs ctors

264257 in

265258 Result.ok (State vs ts2 cs2 bs qvs qts qcs)

266259

267260 Env.Alias _ _ _ _ ->

268− Result.throw (Error.ImportOpenAlias dotDotRegion name)

261+ Result.throw (Error.ImportOpenAlias region name)

269262

270263 Nothing ->

271264 Result.throw (Error.ImportExposingNotFound region home name (Map.keys types))

272265

273− Src.Operator region op ->

266+ Src.Operator op ->

274267 case Map.lookup op binops of

275268 Just binop ->

276269 let

@@ -282,23 +275,18 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =

282275 Result.throw (Error.ImportExposingNotFound region home op (Map.keys binops))

283276

284277

285−checkForCtorMistake :: Name.Name -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> [Name.Name]

286−checkForCtorMistake givenName types =

287− Map.foldr addMatches [] types

278+

279+toCtors :: Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> Map.Map Name.Name Name.Name

280+toCtors types =

281+ Map.foldr addCtors Map.empty types

288282 where

289− addMatches (_, exposedCtors) matches =

290− Map.foldrWithKey addMatch matches exposedCtors

291−

292− addMatch ctorName info matches =

293− if ctorName /= givenName

294− then matches

295− else

296− case info of

297− Env.Specific _ (Env.Ctor _ tipeName _ _ _) ->

298− tipeName : matches

299−

300− Env.Specific _ (Env.RecordCtor _ _ _) ->

301− matches

302−

303− Env.Ambiguous _ _ ->

304− matches

283+ addCtors (_, exposedCtors) dict =

284+ Map.foldrWithKey addCtor dict exposedCtors

285+

286+ addCtor ctorName homes dict =

287+ case Map.elems homes of

288+ [Env.Ctor _ tipeName _ _ _] ->

289+ Map.insert ctorName tipeName dict

290+

291+ _ ->

292+ dict

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

@@ -110,7 +110,7 @@ addTypes (Src.Module _ _ _ _ _ unions aliases _ _) (Env.Env home vs ts cs bs qvs

110110addUnion :: ModuleName.Canonical -> Env.Exposed Env.Type -> A.Located Src.Union -> Result i w (Env.Exposed Env.Type)

111111addUnion home types union@(A.At _ (Src.Union (A.At _ name) _ _)) =

112112 do arity <- checkUnionFreeVars union

113− let one = Env.Specific home (Env.Union arity home)

113+ let one = Map.singleton home (Env.Union arity home)

114114 Result.ok $ Map.insert name one types

115115

116116

@@ -133,7 +133,7 @@ addAlias env@(Env.Env home vs ts cs bs qvs qts qcs) scc =

133133 Graph.AcyclicSCC alias@(A.At _ (Src.Alias (A.At _ name) _ tipe)) ->

134134 do args <- checkAliasFreeVars alias

135135 ctype <- Type.canonicalize env tipe

136− let one = Env.Specific home (Env.Alias (length args) home args ctype)

136+ let one = Map.singleton home (Env.Alias (length args) home args ctype)

137137 let ts1 = Map.insert name one ts

138138 Result.ok $ Env.Env home vs ts1 cs bs qvs qts qcs

139139

@@ -281,7 +281,7 @@ addCtors (Src.Module _ _ _ _ _ unions aliases _ _) env@(Env.Env home vs ts cs bs

281281 )

282282

283283

284−type CtorDups = Dups.Dict (Env.Info Env.Ctor)

284+type CtorDups = Dups.Dict (Map.Map ModuleName.Canonical Env.Ctor)

285285

286286

287287

@@ -297,7 +297,7 @@ canonicalizeAlias env@(Env.Env home _ _ _ _ _ _ _) (A.At _ (Src.Alias (A.At regi

297297 ,

298298 case ctipe of

299299 Can.TRecord fields Nothing ->

300− Dups.one name region (Env.Specific home (toRecordCtor home name vars fields))

300+ Dups.one name region (Map.singleton home (toRecordCtor home name vars fields))

301301

302302 _ ->

303303 Dups.none

@@ -351,5 +351,5 @@ toOpts ctors =

351351

352352toCtor :: ModuleName.Canonical -> Name.Name -> Can.Union -> A.Located Can.Ctor -> CtorDups

353353toCtor home typeName union (A.At region (Can.Ctor name index _ args)) =

354− Dups.one name region $ Env.Specific home $

354+ Dups.one name region $ Map.singleton home $

355355 Env.Ctor home typeName union index args

compiler/src/Canonicalize/Expression.hs+7−6

@@ -14,6 +14,7 @@ import Control.Monad (foldM)

1414import qualified Data.Graph as Graph

1515import qualified Data.List as List

1616import qualified Data.Map.Strict as Map

17+import qualified Data.Map.Strict.Internal as I

1718import qualified Data.Name as Name

1819

1920import qualified AST.Canonical as Can

@@ -695,15 +696,15 @@ findVar region (Env.Env localHome vs _ _ _ qvs _ _) name =

695696 Env.TopLevel _ ->

696697 logVar name (Can.VarTopLevel localHome name)

697698

698− Env.Foreign home annotation ->

699+ Env.Foreign (I.Bin 1 home annotation _ _) ->

699700 Result.ok $

700701 if home == ModuleName.debug then

701702 Can.VarDebug localHome name annotation

702703 else

703704 Can.VarForeign home name annotation

704705

705− Env.Foreigns h hs ->

706− Result.throw (Error.AmbiguousVar region Nothing name h hs)

706+ Env.Foreign homes ->

707+ Result.throw (Error.AmbiguousVar region Nothing name (Map.keys homes))

707708

708709 Nothing ->

709710 Result.throw (Error.NotFoundVar region Nothing name (toPossibleNames vs qvs))

@@ -714,15 +715,15 @@ findVarQual region (Env.Env localHome vs _ _ _ qvs _ _) prefix name =

714715 case Map.lookup prefix qvs of

715716 Just qualified ->

716717 case Map.lookup name qualified of

717− Just (Env.Specific home annotation) ->

718+ Just (I.Bin 1 home annotation _ _) ->

718719 Result.ok $

719720 if home == ModuleName.debug then

720721 Can.VarDebug localHome name annotation

721722 else

722723 Can.VarForeign home name annotation

723724

724− Just (Env.Ambiguous h hs) ->

725− Result.throw (Error.AmbiguousVar region (Just prefix) name h hs)

725+ Just homes ->

726+ Result.throw (Error.AmbiguousVar region (Just prefix) name (Map.keys homes))

726727

727728 Nothing ->

728729 Result.throw (Error.NotFoundVar region (Just prefix) name (toPossibleNames vs qvs))

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

@@ -236,11 +236,11 @@ checkExposed

236236 -> Map.Map Name.Name alias

237237 -> Map.Map Name.Name binop

238238 -> Can.Effects

239− -> Src.Exposed

239+ -> A.Located Src.Exposed

240240 -> Result i w (Dups.Dict (A.Located Can.Export))

241−checkExposed values unions aliases binops effects exposed =

241+checkExposed values unions aliases binops effects (A.At region exposed) =

242242 case exposed of

243− Src.Lower (A.At region name) ->

243+ Src.Lower name ->

244244 if Map.member name values then

245245 ok name region Can.ExportValue

246246 else

@@ -252,23 +252,23 @@ checkExposed values unions aliases binops effects exposed =

252252 Result.throw $ Error.ExportNotFound region Error.BadVar name $

253253 ports ++ Map.keys values

254254

255− Src.Operator region name ->

255+ Src.Operator name ->

256256 if Map.member name binops then

257257 ok name region Can.ExportBinop

258258 else

259259 Result.throw $ Error.ExportNotFound region Error.BadOp name $

260260 Map.keys binops

261261

262− Src.Upper (A.At region name) (Src.Public dotDotRegion) ->

262+ Src.Upper name Src.Public ->

263263 if Map.member name unions then

264264 ok name region Can.ExportUnionOpen

265265 else if Map.member name aliases then

266− Result.throw $ Error.ExportOpenAlias dotDotRegion name

266+ Result.throw $ Error.ExportOpenAlias region name

267267 else

268268 Result.throw $ Error.ExportNotFound region Error.BadType name $

269269 Map.keys unions ++ Map.keys aliases

270270

271− Src.Upper (A.At region name) Src.Private ->

271+ Src.Upper name Src.Private ->

272272 if Map.member name unions then

273273 ok name region Can.ExportUnionClosed

274274 else if Map.member name aliases then

compiler/src/Canonicalize/Pattern.hs+2−3

@@ -8,7 +8,6 @@ module Canonicalize.Pattern

88 where

99

1010

11−import qualified Data.List as List

1211import qualified Data.Map.Strict as Map

1312import qualified Data.Name as Name

1413

@@ -174,8 +173,8 @@ logVar name region value =

174173logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a

175174logFields fields value =

176175 let

177− addField dict (A.At region name) =

176+ addField (A.At region name) dict =

178177 Dups.insert name region region dict

179178 in

180179 Result.Result $ \bindings warnings _ ok ->

181− ok (List.foldl' addField bindings fields) warnings value

180+ ok (foldr addField bindings fields) warnings value

compiler/src/Data/Map/Utils.hs−6

@@ -1,7 +1,6 @@

11module Data.Map.Utils

22 ( fromKeys

33 , fromKeysA

4− , fromValues

54 , any

65 )

76 where

@@ -26,11 +25,6 @@ fromKeysA toValue keys =

2625 Map.fromList <$> traverse (\k -> (,) k <$> toValue k) keys

2726

2827

29−fromValues :: (Ord k) => (v -> k) -> [v] -> Map.Map k v

30−fromValues toKey values =

31− Map.fromList $ map (\v -> (toKey v, v)) values

32−

33−

3428

3529-- ANY

3630

compiler/src/Data/Name.hs+177−166

@@ -1,119 +1,130 @@

11{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

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

2+{-# LANGUAGE BangPatterns, EmptyDataDecls, MagicHash, OverloadedStrings, UnboxedTuples #-}

33module Data.Name

44 ( Name

5− --

6− , toChars

7− , toElmString

8− , toBuilder

9− --

10− , fromPtr

11− , fromChars

12− --

5+ , toUtf8

6+ , fromUtf8

7+ , toEscapedBuilder

8+ , Utf8.toBuilder

9+ , Utf8.fromPtr

10+ , Utf8.fromChars

11+ , Utf8.toChars

12+ -- misc

1313 , getKernel

1414 , hasDot

15− , splitDots

1615 , isKernel

1716 , isNumberType

1817 , isComparableType

1918 , isAppendableType

2019 , isCompappendType

2120 , fromVarIndex

21+ , fromReplCount

2222 , fromWords

2323 , fromManyNames

2424 , fromTypeVariable

2525 , fromTypeVariableScheme

2626 , sepBy

27− --

27+ -- interned

2828 , int, float, bool, char, string

2929 , maybe, result, list, array, dict, tuple, jsArray

3030 , task, router, cmd, sub, platform, virtualDom

3131 , shader, debug, debugger, bitwise, basics

3232 , utils, negate, true, false, value

33− , node, program, _main, _Main, dollar, identity

34− , replModule, replValueToPrint

33+ , node, program, main, dollar, identity

34+ , replModule

3535 )

3636 where

3737

3838

3939import Prelude hiding (length, maybe, negate)

4040import Control.Exception (assert)

41−import qualified Data.Binary as Binary

4241import qualified Data.ByteString.Builder.Internal as B

43−import qualified Data.Coerce as Coerce

42+import Data.Coerce (coerce)

4443import qualified Data.List as List

45−import qualified Data.String as Chars

4644import qualified Data.Utf8 as Utf8

45+import Foreign.Ptr (plusPtr, minusPtr)

4746import GHC.Exts

48− ( Int(I#), Ptr

47+ ( Int(I#), Ptr(Ptr)

48+ , RealWorld

4949 , MutableByteArray#

5050 , isTrue#

5151 , newByteArray#

5252 , sizeofByteArray#

53+ , writeWord8OffAddr#

54+ , copyByteArrayToAddr#

5355 , unsafeFreezeByteArray#

5456 )

57+import GHC.IO

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

5659import GHC.Prim

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

5861

59−import qualified Elm.String as ES

60−

6162

6263

6364-- NAME

6465

6566

66−type Name =

67− Utf8.Utf8 ELM_NAME

68−

69−

70−data ELM_NAME

71−

72−

73−

74−-- INSTANCES

75−

67+type Name = Utf8.Under256 NAME

7668

77−instance Chars.IsString (Utf8.Utf8 ELM_NAME) where

78− fromString = Utf8.fromChars

7969

80−instance Binary.Binary (Utf8.Utf8 ELM_NAME) where

81− get = Utf8.getUnder256

82− put = Utf8.putUnder256

70+data NAME

8371

8472

73+toUtf8 :: Name -> Utf8.String

74+toUtf8 =

75+ coerce

8576

86−-- TO

8777

78+fromUtf8 :: Utf8.String -> Name

79+fromUtf8 =

80+ coerce

8881

89−toChars :: Name -> [Char]

90−toChars =

91− Utf8.toChars

9282

9383

94−toElmString :: Name -> ES.String

95−toElmString =

96− Coerce.coerce

84+-- TO ESCAPED BUILDER

9785

9886

99−{-# INLINE toBuilder #-}

100−toBuilder :: Name -> B.Builder

101−toBuilder =

102− Utf8.toBuilder

87+{-# INLINE toEscapedBuilder #-}

88+toEscapedBuilder :: Word8 -> Word8 -> Name -> B.Builder

89+toEscapedBuilder before after =

90+ \name -> B.builder (toEscapedBuilderHelp before after name)

10391

10492

93+{-# INLINE toEscapedBuilderHelp #-}

94+toEscapedBuilderHelp :: Word8 -> Word8 -> Name -> B.BuildStep a -> B.BuildStep a

95+toEscapedBuilderHelp before after !name@(Utf8.Utf8 ba#) k =

96+ go 0 (I# (sizeofByteArray# ba#))

97+ where

98+ go !offset !len !(B.BufferRange bOffset bEnd) =

99+ let

100+ !bLen = minusPtr bEnd bOffset

101+ in

102+ if len <= bLen then

103+ do -- TODO test if writing word-by-word is faster

104+ stToIO (copyToPtr name offset bOffset len)

105+ stToIO (escape before after bOffset name offset len 0)

106+ let !newBufferRange = B.BufferRange (plusPtr bOffset len) bEnd

107+ k newBufferRange

108+ else

109+ do stToIO (copyToPtr name offset bOffset bLen)

110+ stToIO (escape before after bOffset name offset bLen 0)

111+ let !newOffset = offset + bLen

112+ let !newLength = len - bLen

113+ return $ B.bufferFull 1 bEnd (go newOffset newLength)

114+

115+

116+escape :: Word8 -> Word8 -> Ptr a -> Name -> Int -> Int -> Int -> ST RealWorld ()

117+escape before@(W8# before#) after ptr name@(Utf8.Utf8 ba#) offset@(I# offset#) len@(I# len#) i@(I# i#) =

118+ if isTrue# (i# <# len#) then

119+ if isTrue# (eqWord# before# (indexWord8Array# ba# (offset# +# i#)))

120+ then

121+ do writeWordToPtr ptr i after

122+ escape before after ptr name offset len (i + 1)

123+ else

124+ do escape before after ptr name offset len (i + 1)

105125

106−-- FROM

107−

108−

109−fromPtr :: Ptr Word8 -> Ptr Word8 -> Name

110−fromPtr =

111− Utf8.fromPtr

112−

113−

114−fromChars :: [Char] -> Name

115−fromChars =

116− Utf8.fromChars

126+ else

127+ return ()

117128

118129

119130

@@ -122,12 +133,7 @@ fromChars =

122133

123134hasDot :: Name -> Bool

124135hasDot name =

125− Utf8.contains 0x2E {- . -} name

126−

127−

128−splitDots :: Name -> [Name]

129−splitDots name =

130− Utf8.split 0x2E {- . -} name

136+ Utf8.contains 0x2E {- . -} (coerce name)

131137

132138

133139

@@ -175,23 +181,23 @@ isCompappendType = Utf8.startsWith prefix_compappend

175181

176182{-# NOINLINE prefix_kernel #-}

177183prefix_kernel :: Name

178−prefix_kernel = fromChars "Elm.Kernel."

184+prefix_kernel = "Elm.Kernel."

179185

180186{-# NOINLINE prefix_number #-}

181187prefix_number :: Name

182−prefix_number = fromChars "number"

188+prefix_number = "number"

183189

184190{-# NOINLINE prefix_comparable #-}

185191prefix_comparable :: Name

186−prefix_comparable = fromChars "comparable"

192+prefix_comparable = "comparable"

187193

188194{-# NOINLINE prefix_appendable #-}

189195prefix_appendable :: Name

190−prefix_appendable = fromChars "appendable"

196+prefix_appendable = "appendable"

191197

192198{-# NOINLINE prefix_compappend #-}

193199prefix_compappend :: Name

194−prefix_compappend = fromChars "compappend"

200+prefix_compappend = "compappend"

195201

196202

197203

@@ -202,11 +208,11 @@ fromVarIndex :: Int -> Name

202208fromVarIndex n =

203209 runST

204210 (

205− do let !size = 2 + getIndexSize n

211+ do let !size = getIndexSize n

206212 mba <- newByteArray size

207213 writeWord8 mba 0 0x5F {- _ -}

208214 writeWord8 mba 1 0x76 {- v -}

209− writeDigitsAtEnd mba size n

215+ writeDigits mba (size - 1) n

210216 freeze mba

211217 )

212218

@@ -214,20 +220,19 @@ fromVarIndex n =

214220{-# INLINE getIndexSize #-}

215221getIndexSize :: Int -> Int

216222getIndexSize n

217− | n < 10 = 1

218− | n < 100 = 2

219− | True = ceiling (logBase 10 (fromIntegral n + 1) :: Float)

223+ | n < 10 = 3

224+ | n < 100 = 4

225+ | True = 2 + ceiling (logBase 10 (fromIntegral n + 1) :: Float)

220226

221227

222228

223−writeDigitsAtEnd :: MBA s -> Int -> Int -> ST s ()

224−writeDigitsAtEnd !mba !oldOffset !n =

229+writeDigits :: MBA s -> Int -> Int -> ST s ()

230+writeDigits !mba !offset !n =

225231 do let (q,r) = quotRem n 10

226− let !newOffset = oldOffset - 1

227− writeWord8 mba newOffset (0x30 + fromIntegral r)

232+ writeWord8 mba offset (0x30 + fromIntegral r)

228233 if q <= 0

229234 then return ()

230− else writeDigitsAtEnd mba newOffset q

235+ else writeDigits mba (offset-1) q

231236

232237

233238

@@ -250,7 +255,7 @@ fromTypeVariable name@(Utf8.Utf8 ba#) index =

250255 mba <- newByteArray size

251256 copyToMBA name mba

252257 writeWord8 mba (I# len#) 0x5F {- _ -}

253− writeDigitsAtEnd mba size index

258+ writeDigits mba (size - 1) index

254259 freeze mba

255260 )

256261 else

@@ -259,7 +264,7 @@ fromTypeVariable name@(Utf8.Utf8 ba#) index =

259264 do let !size = I# len# + getIndexSize index

260265 mba <- newByteArray size

261266 copyToMBA name mba

262− writeDigitsAtEnd mba size index

267+ writeDigits mba (size - 1) index

263268 freeze mba

264269 )

265270

@@ -278,61 +283,61 @@ fromTypeVariableScheme scheme =

278283 freeze mba

279284 else

280285 do let (extra, letter) = quotRem scheme 26

281− let !size = 1 + getIndexSize extra

286+ let !size = getIndexSize extra

282287 mba <- newByteArray size

283288 writeWord8 mba 0 (0x61 + fromIntegral letter)

284− writeDigitsAtEnd mba size extra

289+ writeDigits mba (size - 1) extra

285290 freeze mba

286291 )

287292

288293

289294

295+-- FROM REPL COUNT

296+

297+

298+fromReplCount :: Int -> Name

299+fromReplCount n =

300+ Utf8.fromChars ("repl_value_" ++ show n)

301+

302+

303+

290304-- FROM MANY NAMES

291−--

292−-- Creating a unique name by combining all the subnames can create names

293−-- longer than 256 bytes relatively easily. So instead, the first given name

294−-- (e.g. foo) is prefixed chars that are valid in JS but not Elm (e.g. _M$foo)

295−--

296−-- This should be a unique name since 0.19 disallows shadowing. It would not

297−-- be possible for multiple top-level cycles to include values with the same

298−-- name, so the important thing is to make the cycle name distinct from the

299−-- normal name. Same logic for destructuring patterns like (x,y)

300305

301306

302307fromManyNames :: [Name] -> Name

303308fromManyNames names =

304− case names of

305− [] ->

306− blank

307− -- NOTE: this case is needed for (let _ = Debug.log "x" x in ...)

308− -- but maybe unused patterns should be stripped out instead

309−

310− Utf8.Utf8 ba# : _ ->

311− let

312− len# = sizeofByteArray# ba#

313− in

314− runST

315− (

316− ST $ \s ->

317− case newByteArray# (len# +# 3#) s of

318− (# s, mba# #) ->

319− case writeWord8Array# mba# 0# 0x5F## {-_-} s of

320− s ->

321− case writeWord8Array# mba# 1# 0x4D## {-M-} s of

322− s ->

323− case writeWord8Array# mba# 2# 0x24## {-$-} s of

324− s ->

325− case copyByteArray# ba# 0# mba# 3# len# s of

326− s ->

327− case unsafeFreezeByteArray# mba# s of

328− (# s, ba# #) -> (# s, Utf8.Utf8 ba# #)

329− )

309+ let

310+ !(I# size#) = sum (map (\(Utf8.Utf8 ba#) -> I# (sizeofByteArray# ba# +# 1#)) names)

311+ in

312+ runST

313+ (

314+ ST $ \s ->

315+ case newByteArray# size# s of

316+ (# s, mba# #) ->

317+ case writeNames mba# 0# names s of

318+ s ->

319+ case unsafeFreezeByteArray# mba# s of

320+ (# s, ba# #) -> (# s, Utf8.Utf8 ba# #)

321+ )

330322

331323

332−{-# NOINLINE blank #-}

333−blank :: Name

334−blank =

335− fromWords [0x5F,0x4D,0x24] {-_M$-}

324+writeNames :: MutableByteArray# s -> Int# -> [Name] -> State# s -> State# s

325+writeNames mba# !offset# names s =

326+ case names of

327+ [] ->

328+ s

329+

330+ (Utf8.Utf8 ba#) : names ->

331+ case writeWord8Array# mba# offset# 0x24## {- $ -} s of

332+ s ->

333+ let

334+ !offset1# = offset# +# 1#

335+ !len# = sizeofByteArray# ba#

336+ !newOffset# = offset1# +# len#

337+ in

338+ case copyByteArray# ba# 0# mba# offset1# len# s of

339+ s ->

340+ writeNames mba# newOffset# names s

336341

337342

338343

@@ -418,6 +423,22 @@ writeWord8 (MBA# mba#) (I# offset#) (W8# w#) =

418423 s -> (# s, () #)

419424

420425

426+{-# INLINE writeWordToPtr #-}

427+writeWordToPtr :: Ptr a -> Int -> Word8 -> ST s ()

428+writeWordToPtr (Ptr addr#) (I# offset#) (W8# word#) =

429+ ST $ \s ->

430+ case writeWord8OffAddr# addr# offset# word# s of

431+ s -> (# s, () #)

432+

433+

434+{-# INLINE copyToPtr #-}

435+copyToPtr :: Name -> Int -> Ptr a -> Int -> ST RealWorld ()

436+copyToPtr (Utf8.Utf8 ba#) (I# offset#) (Ptr addr#) (I# len#) =

437+ ST $ \s ->

438+ case copyByteArrayToAddr# ba# offset# addr# len# s of

439+ s -> (# s, () #)

440+

441+

421442{-# INLINE copyToMBA #-}

422443copyToMBA :: Name -> MBA s -> ST s ()

423444copyToMBA (Utf8.Utf8 ba#) (MBA# mba#) =

@@ -432,179 +453,169 @@ copyToMBA (Utf8.Utf8 ba#) (MBA# mba#) =

432453

433454{-# NOINLINE int #-}

434455int :: Name

435−int = fromChars "Int"

456+int = "Int"

436457

437458

438459{-# NOINLINE float #-}

439460float :: Name

440−float = fromChars "Float"

461+float = "Float"

441462

442463

443464{-# NOINLINE bool #-}

444465bool :: Name

445−bool = fromChars "Bool"

466+bool = "Bool"

446467

447468

448469{-# NOINLINE char #-}

449470char :: Name

450−char = fromChars "Char"

471+char = "Char"

451472

452473

453474{-# NOINLINE string #-}

454475string :: Name

455−string = fromChars "String"

476+string = "String"

456477

457478

458479{-# NOINLINE maybe #-}

459480maybe :: Name

460−maybe = fromChars "Maybe"

481+maybe = "Maybe"

461482

462483

463484{-# NOINLINE result #-}

464485result :: Name

465−result = fromChars "Result"

486+result = "Result"

466487

467488

468489{-# NOINLINE list #-}

469490list :: Name

470−list = fromChars "List"

491+list = "List"

471492

472493

473494{-# NOINLINE array #-}

474495array :: Name

475−array = fromChars "Array"

496+array = "Array"

476497

477498

478499{-# NOINLINE dict #-}

479500dict :: Name

480−dict = fromChars "Dict"

501+dict = "Dict"

481502

482503

483504{-# NOINLINE tuple #-}

484505tuple :: Name

485−tuple = fromChars "Tuple"

506+tuple = "Tuple"

486507

487508

488509{-# NOINLINE jsArray #-}

489510jsArray :: Name

490−jsArray = fromChars "JsArray"

511+jsArray = "JsArray"

491512

492513

493514{-# NOINLINE task #-}

494515task :: Name

495−task = fromChars "Task"

516+task = "Task"

496517

497518

498519{-# NOINLINE router #-}

499520router :: Name

500−router = fromChars "Router"

521+router = "Router"

501522

502523

503524{-# NOINLINE cmd #-}

504525cmd :: Name

505−cmd = fromChars "Cmd"

526+cmd = "Cmd"

506527

507528

508529{-# NOINLINE sub #-}

509530sub :: Name

510−sub = fromChars "Sub"

531+sub = "Sub"

511532

512533

513534{-# NOINLINE platform #-}

514535platform :: Name

515−platform = fromChars "Platform"

536+platform = "Platform"

516537

517538

518539{-# NOINLINE virtualDom #-}

519540virtualDom :: Name

520−virtualDom = fromChars "VirtualDom"

541+virtualDom = "VirtualDom"

521542

522543

523544{-# NOINLINE shader #-}

524545shader :: Name

525−shader = fromChars "Shader"

546+shader = "Shader"

526547

527548

528549{-# NOINLINE debug #-}

529550debug :: Name

530−debug = fromChars "Debug"

551+debug = "Debug"

531552

532553

533554{-# NOINLINE debugger #-}

534555debugger :: Name

535−debugger = fromChars "Debugger"

556+debugger = "Debugger"

536557

537558

538559{-# NOINLINE bitwise #-}

539560bitwise :: Name

540−bitwise = fromChars "Bitwise"

561+bitwise = "Bitwise"

541562

542563

543564{-# NOINLINE basics #-}

544565basics :: Name

545−basics = fromChars "Basics"

566+basics = "Basics"

546567

547568

548569{-# NOINLINE utils #-}

549570utils :: Name

550−utils = fromChars "Utils"

571+utils = "Utils"

551572

552573

553574{-# NOINLINE negate #-}

554575negate :: Name

555−negate = fromChars "negate"

576+negate = "negate"

556577

557578

558579{-# NOINLINE true #-}

559580true :: Name

560−true = fromChars "True"

581+true = "True"

561582

562583

563584{-# NOINLINE false #-}

564585false :: Name

565−false = fromChars "False"

586+false = "False"

566587

567588

568589{-# NOINLINE value #-}

569590value :: Name

570−value = fromChars "Value"

591+value = "Value"

571592

572593

573594{-# NOINLINE node #-}

574595node :: Name

575−node = fromChars "Node"

596+node = "Node"

576597

577598

578599{-# NOINLINE program #-}

579600program :: Name

580−program = fromChars "Program"

581−

601+program = "Program"

582602

583−{-# NOINLINE _main #-}

584−_main :: Name

585−_main = fromChars "main"

586603

587−

588−{-# NOINLINE _Main #-}

589−_Main :: Name

590−_Main = fromChars "Main"

604+{-# NOINLINE main #-}

605+main :: Name

606+main = "main"

591607

592608

593609{-# NOINLINE dollar #-}

594610dollar :: Name

595−dollar = fromChars "$"

611+dollar = "$"

596612

597613

598614{-# NOINLINE identity #-}

599615identity :: Name

600−identity = fromChars "identity"

616+identity = "identity"

601617

602618

603619{-# NOINLINE replModule #-}

604620replModule :: Name

605−replModule = fromChars "Elm_Repl"

606−

607−

608−{-# NOINLINE replValueToPrint #-}

609−replValueToPrint :: Name

610−replValueToPrint = fromChars "repl_input_value_"

621+replModule = "Elm_Repl"

compiler/src/Data/NonEmptyList.hs+2−12

@@ -1,6 +1,5 @@

11module Data.NonEmptyList

22 ( List(..)

3− , singleton

43 , toList

54 , sortBy

65 )

@@ -20,11 +19,6 @@ data List a =

2019 List a [a]

2120

2221

23−singleton :: a -> List a

24−singleton a =

25− List a []

26−

27−

2822toList :: List a -> [a]

2923toList (List x xs) =

3024 x:xs

@@ -52,12 +46,8 @@ instance Foldable List where

5246-- SORT BY

5347

5448

55−sortBy :: (Ord b) => (a -> b) -> List a -> List a

56−sortBy toRank (List x xs) =

57− let

58− comparison a b =

59− compare (toRank a) (toRank b)

60− in

49+sortBy :: (a -> a -> Ordering) -> List a -> List a

50+sortBy comparison (List x xs) =

6151 case List.sortBy comparison xs of

6252 [] ->

6353 List x []

compiler/src/Data/Utf8.hs+300−157

@@ -1,42 +1,37 @@

11{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

2−{-# LANGUAGE BangPatterns, FlexibleInstances, MagicHash, UnboxedTuples #-}

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

33module Data.Utf8

4− ( Utf8(..)

4+ ( String

5+ , Utf8(..)

6+ , VeryLong

7+ , Under256

58 , isEmpty

69 , empty

710 , size

811 , contains

12+ , containsDouble

913 , startsWith

1014 , startsWithChar

11− , endsWithWord8

15+ , endsWithWord

1216 , split

1317 , join

14− --

15− , getUnder256

16− , putUnder256

17− --

18− , getVeryLong

19− , putVeryLong

20− --

18+ , all

19+ , any

20+ , toWord16

21+ , fromWord16

22+ -- conversions

23+ , fromChars

2124 , toChars

2225 , toBuilder

23− , toEscapedBuilder

24− --

2526 , fromPtr

26− , fromSnippet

27− , fromChars

28− --

29− , MBA

30− , newByteArray

31− , copyFromPtr

32− , writeWord8

33− , freeze

27+ , fromChunks

28+ , Chunk(..)

3429 )

3530 where

3631

3732

3833import Prelude hiding (String, all, any, concat)

39−import Data.Binary (Get, get, getWord8, Put, put, putWord8)

34+import Data.Binary (Binary(..), Get, getWord8, putWord8)

4035import Data.Binary.Put (putBuilder)

4136import Data.Binary.Get.Internal (readN)

4237import Data.Bits ((.&.), shiftR)

@@ -44,6 +39,7 @@ import qualified Data.ByteString.Internal as B

4439import qualified Data.ByteString.Builder.Internal as B

4540import qualified Data.Char as Char

4641import qualified Data.List as List

42+import Data.String (IsString(..))

4743import Foreign.ForeignPtr (touchForeignPtr)

4844import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

4945import Foreign.Ptr (minusPtr, plusPtr)

@@ -58,35 +54,36 @@ import GHC.Exts

5854 , copyByteArray#

5955 , copyAddrToByteArray#

6056 , copyByteArrayToAddr#

61− , writeWord8Array#

57+ , writeWord8Array#,

6258 )

6359import GHC.IO

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

6561import GHC.Prim

66−import GHC.Word (Word8(W8#))

67−

68−import qualified Parse.Primitives as P

62+import GHC.Word (Word8(W8#), Word16(W16#))

6963

7064

7165

7266-- UTF-8

7367

7468

75−data Utf8 tipe =

69+data Utf8 size tipe =

7670 Utf8 ByteArray#

7771

7872

73+type String = Utf8 VERY_LONG STRING

74+type VeryLong t = Utf8 VERY_LONG t

75+type Under256 t = Utf8 UNDER_256 t

7976

80−-- EMPTY

77+data STRING

78+data VERY_LONG

79+data UNDER_256

8180

8281

83−{-# NOINLINE empty #-}

84−empty :: Utf8 t

85−empty =

86− runST (freeze =<< newByteArray 0)

8782

83+-- IS EMPTY

8884

89−isEmpty :: Utf8 t -> Bool

85+

86+isEmpty :: Utf8 l t -> Bool

9087isEmpty (Utf8 ba#) =

9188 isTrue# (sizeofByteArray# ba# ==# 0#)

9289

@@ -95,7 +92,7 @@ isEmpty (Utf8 ba#) =

9592-- SIZE

9693

9794

98−size :: Utf8 t -> Int

95+size :: Utf8 l t -> Int

9996size (Utf8 ba#) =

10097 I# (sizeofByteArray# ba#)

10198

@@ -104,7 +101,7 @@ size (Utf8 ba#) =

104101-- CONTAINS

105102

106103

107−contains :: Word8 -> Utf8 t -> Bool

104+contains :: Word8 -> Utf8 l t -> Bool

108105contains (W8# word#) (Utf8 ba#) =

109106 containsHelp word# ba# 0# (sizeofByteArray# ba#)

110107

@@ -120,11 +117,32 @@ containsHelp word# ba# !offset# len# =

120117

121118

122119

120+-- CONTAINS DOUBLE

121+

122+

123+containsDouble :: Word8 -> Utf8 l t -> Bool

124+containsDouble (W8# word#) (Utf8 ba#) =

125+ containsDoubleHelp word# ba# 0# (sizeofByteArray# ba#)

126+

127+

128+containsDoubleHelp :: Word# -> ByteArray# -> Int# -> Int# -> Bool

129+containsDoubleHelp word# ba# !offset# len# =

130+ let !offset1# = offset# +# 1# in

131+ if isTrue# (offset1# <# len#) then

132+ if isTrue# (eqWord# word# (indexWord8Array# ba# offset# ))

133+ && isTrue# (eqWord# word# (indexWord8Array# ba# offset1#))

134+ then True

135+ else containsDoubleHelp word# ba# (offset# +# 1#) len#

136+ else

137+ False

138+

139+

140+

123141-- STARTS WITH

124142

125143

126144{-# INLINE startsWith #-}

127−startsWith :: Utf8 t -> Utf8 t -> Bool

145+startsWith :: Utf8 l t -> Utf8 l t -> Bool

128146startsWith (Utf8 ba1#) (Utf8 ba2#) =

129147 let

130148 !len1# = sizeofByteArray# ba1#

@@ -139,9 +157,9 @@ startsWith (Utf8 ba1#) (Utf8 ba2#) =

139157-- STARTS WITH CHAR

140158

141159

142−startsWithChar :: (Char -> Bool) -> Utf8 t -> Bool

143−startsWithChar isGood bytes@(Utf8 ba#) =

144− if isEmpty bytes then

160+startsWithChar :: (Char -> Bool) -> Utf8 l t -> Bool

161+startsWithChar isGood str@(Utf8 ba#) =

162+ if isEmpty str then

145163 False

146164 else

147165 let

@@ -159,8 +177,8 @@ startsWithChar isGood bytes@(Utf8 ba#) =

159177-- ENDS WITH WORD

160178

161179

162−endsWithWord8 :: Word8 -> Utf8 t -> Bool

163−endsWithWord8 (W8# w#) (Utf8 ba#) =

180+endsWithWord :: Word8 -> Utf8 l t -> Bool

181+endsWithWord (W8# w#) (Utf8 ba#) =

164182 let len# = sizeofByteArray# ba# in

165183 isTrue# (len# ># 0#)

166184 &&

@@ -171,12 +189,12 @@ endsWithWord8 (W8# w#) (Utf8 ba#) =

171189-- SPLIT

172190

173191

174−split :: Word8 -> Utf8 t -> [Utf8 t]

192+split :: Word8 -> String -> [String]

175193split (W8# divider#) str@(Utf8 ba#) =

176194 splitHelp str 0 (findDividers divider# ba# 0# (sizeofByteArray# ba#) [])

177195

178196

179−splitHelp :: Utf8 t -> Int -> [Int] -> [Utf8 t]

197+splitHelp :: String -> Int -> [Int] -> [String]

180198splitHelp str start offsets =

181199 case offsets of

182200 [] ->

@@ -197,7 +215,7 @@ findDividers divider# ba# !offset# len# revOffsets =

197215 reverse revOffsets

198216

199217

200−unsafeSlice :: Utf8 t -> Int -> Int -> Utf8 t

218+unsafeSlice :: String -> Int -> Int -> String

201219unsafeSlice str start end =

202220 let !len = end - start in

203221 if len == 0 then

@@ -213,7 +231,7 @@ unsafeSlice str start end =

213231-- JOIN

214232

215233

216−join :: Word8 -> [Utf8 t] -> Utf8 t

234+join :: Word8 -> [String] -> String

217235join sep strings =

218236 case strings of

219237 [] ->

@@ -227,7 +245,7 @@ join sep strings =

227245 freeze mba

228246

229247

230−joinHelp :: Word8 -> MBA s -> Int -> Utf8 t -> [Utf8 t] -> ST s ()

248+joinHelp :: Word8 -> MBA s -> Int -> String -> [String] -> ST s ()

231249joinHelp sep mba offset str strings =

232250 let

233251 !len = size str

@@ -245,10 +263,46 @@ joinHelp sep mba offset str strings =

245263

246264

247265

266+-- ALL

267+

268+

269+all :: (Char -> Bool) -> Utf8 l t -> Bool

270+all isGood utf8 =

271+ not (any (not . isGood) utf8)

272+

273+

274+

275+-- ANY

276+

277+

278+any :: (Char -> Bool) -> Utf8 l t -> Bool

279+any isGood (Utf8 ba#) =

280+ anyHelp isGood ba# 0# (sizeofByteArray# ba#)

281+

282+

283+anyHelp :: (Char -> Bool) -> ByteArray# -> Int# -> Int# -> Bool

284+anyHelp isGood ba# offset# len# =

285+ if isTrue# (offset# >=# len#) then

286+ False

287+ else

288+ let

289+ !w# = indexWord8Array# ba# offset#

290+ !(# char, width# #)

291+ | isTrue# (ltWord# w# 0xC0##) = (# C# (chr# (word2Int# w#)), 1# #)

292+ | isTrue# (ltWord# w# 0xE0##) = (# chr2 ba# offset# w#, 2# #)

293+ | isTrue# (ltWord# w# 0xF0##) = (# chr3 ba# offset# w#, 3# #)

294+ | True = (# chr4 ba# offset# w#, 4# #)

295+ in

296+ if isGood char

297+ then True

298+ else anyHelp isGood ba# (offset# +# width#) len#

299+

300+

301+

248302-- EQUAL

249303

250304

251−instance Eq (Utf8 t) where

305+instance Eq (Utf8 l t) where

252306 (==) (Utf8 ba1#) (Utf8 ba2#) =

253307 let

254308 !len1# = sizeofByteArray# ba1#

@@ -261,11 +315,9 @@ instance Eq (Utf8 t) where

261315

262316

263317-- COMPARE

264−--

265−-- TODO: is it fine to sort by length and only compare bytes on length ties?

266−--

267318

268−instance Ord (Utf8 t) where

319+

320+instance Ord (Utf8 l t) where

269321 compare (Utf8 ba1#) (Utf8 ba2#) =

270322 let

271323 !len1# = sizeofByteArray# ba1#

@@ -282,20 +334,84 @@ instance Ord (Utf8 t) where

282334

283335

284336

337+-- TO WORD16

338+

339+

340+toWord16 :: String -> Maybe Word16

341+toWord16 (Utf8 ba#) =

342+ let !len# = sizeofByteArray# ba# in

343+ if isTrue# (len# ==# 0#) then

344+ Nothing

345+ else

346+ let !w# = indexWord8Array# ba# 0# in

347+ if isTrue# (eqWord# w# 0x30##) then

348+ if isTrue# (len# ==# 1#) then Just 0 else Nothing

349+ else

350+ toWordHelp ba# 0# len# 0##

351+

352+

353+toWordHelp :: ByteArray# -> Int# -> Int# -> Word# -> Maybe Word16

354+toWordHelp ba# offset# len# number# =

355+ if isTrue# (offset# <# len#) then

356+ let !w# = indexWord8Array# ba# offset# in

357+ if isTrue# (leWord# w# 0x39##) && isTrue# (geWord# w# 0x30##) then

358+ let !newNumber# = plusWord# (timesWord# 10## number#) (minusWord# w# 0x30##) in

359+ toWordHelp ba# (offset# +# 1#) len# newNumber#

360+ else

361+ Nothing

362+ else

363+ Just (W16# number#)

364+

365+

366+

367+-- FROM WORD16

368+

369+

370+fromWord16 :: Word16 -> String

371+fromWord16 n =

372+ runST $

373+ do let !size = getWordSize n

374+ mba <- newByteArray size

375+ writeDigits mba (size - 1) n

376+ freeze mba

377+

378+

379+getWordSize :: Word16 -> Int

380+getWordSize n

381+ | n < 10 = 1

382+ | n < 100 = 2

383+ | True = ceiling (logBase 10 (fromIntegral n + 1) :: Float)

384+

385+

386+writeDigits :: MBA s -> Int -> Word16 -> ST s ()

387+writeDigits !mba !offset !n =

388+ do let (q,r) = quotRem n 10

389+ writeWord8 mba offset (0x30 + fromIntegral r)

390+ if q <= 0

391+ then return ()

392+ else writeDigits mba (offset-1) q

393+

394+

395+

285396-- FROM STRING

286397

287398

288−fromChars :: [Char] -> Utf8 t

289−fromChars chars =

290− runST

291− (

292− do mba <- newByteArray (sum (map getWidth chars))

293− writeChars mba 0 chars

294− )

399+fromChars :: [Char] -> Utf8 l t

400+fromChars =

401+ fromString

402+

295403

404+instance IsString (Utf8 l t) where

405+ fromString str =

406+ runST

407+ (

408+ do mba <- newByteArray (sum (map getWidth str))

409+ writeString mba 0 str

410+ )

296411

297−writeChars :: MBA s -> Int -> [Char] -> ST s (Utf8 t)

298−writeChars !mba !offset chars =

412+

413+writeString :: MBA s -> Int -> [Char] -> ST s (Utf8 l t)

414+writeString !mba !offset chars =

299415 case chars of

300416 [] ->

301417 freeze mba

@@ -303,25 +419,25 @@ writeChars !mba !offset chars =

303419 char : chars

304420 | n < 0x80 ->

305421 do writeWord8 mba (offset ) (fromIntegral n)

306− writeChars mba (offset + 1) chars

422+ writeString mba (offset + 1) chars

307423

308424 | n < 0x800 ->

309425 do writeWord8 mba (offset ) (fromIntegral ((shiftR n 6 ) + 0xC0))

310426 writeWord8 mba (offset + 1) (fromIntegral (( n .&. 0x3F) + 0x80))

311− writeChars mba (offset + 2) chars

427+ writeString mba (offset + 2) chars

312428

313429 | n < 0x10000 ->

314430 do writeWord8 mba (offset ) (fromIntegral ((shiftR n 12 ) + 0xE0))

315431 writeWord8 mba (offset + 1) (fromIntegral ((shiftR n 6 .&. 0x3F) + 0x80))

316432 writeWord8 mba (offset + 2) (fromIntegral (( n .&. 0x3F) + 0x80))

317− writeChars mba (offset + 3) chars

433+ writeString mba (offset + 3) chars

318434

319435 | otherwise ->

320436 do writeWord8 mba (offset ) (fromIntegral ((shiftR n 18 ) + 0xF0))

321437 writeWord8 mba (offset + 1) (fromIntegral ((shiftR n 12 .&. 0x3F) + 0x80))

322438 writeWord8 mba (offset + 2) (fromIntegral ((shiftR n 6 .&. 0x3F) + 0x80))

323439 writeWord8 mba (offset + 3) (fromIntegral (( n .&. 0x3F) + 0x80))

324− writeChars mba (offset + 4) chars

440+ writeString mba (offset + 4) chars

325441

326442 where

327443 n = Char.ord char

@@ -339,10 +455,10 @@ getWidth char

339455

340456

341457

342−-- TO CHARS

458+-- TO STRING

343459

344460

345−toChars :: Utf8 t -> [Char]

461+toChars :: Utf8 l t -> [Char]

346462toChars (Utf8 ba#) =

347463 toCharsHelp ba# 0# (sizeofByteArray# ba#)

348464

@@ -412,13 +528,13 @@ chr4 ba# offset# firstWord# =

412528

413529

414530{-# INLINE toBuilder #-}

415−toBuilder :: Utf8 t -> B.Builder

531+toBuilder :: Utf8 l t -> B.Builder

416532toBuilder =

417533 \bytes -> B.builder (toBuilderHelp bytes)

418534

419535

420536{-# INLINE toBuilderHelp #-}

421−toBuilderHelp :: Utf8 t -> B.BuildStep a -> B.BuildStep a

537+toBuilderHelp :: Utf8 l t -> B.BuildStep a -> B.BuildStep a

422538toBuilderHelp !bytes@(Utf8 ba#) k =

423539 go 0 (I# (sizeofByteArray# ba#))

424540 where

@@ -438,57 +554,10 @@ toBuilderHelp !bytes@(Utf8 ba#) k =

438554

439555

440556

441−-- TO ESCAPED BUILDER

442−

443−

444−{-# INLINE toEscapedBuilder #-}

445−toEscapedBuilder :: Word8 -> Word8 -> Utf8 t -> B.Builder

446−toEscapedBuilder before after =

447− \name -> B.builder (toEscapedBuilderHelp before after name)

448−

449−

450−{-# INLINE toEscapedBuilderHelp #-}

451−toEscapedBuilderHelp :: Word8 -> Word8 -> Utf8 t -> B.BuildStep a -> B.BuildStep a

452−toEscapedBuilderHelp before after !name@(Utf8 ba#) k =

453− go 0 (I# (sizeofByteArray# ba#))

454− where

455− go !offset !len !(B.BufferRange bOffset bEnd) =

456− let

457− !bLen = minusPtr bEnd bOffset

458− in

459− if len <= bLen then

460− do -- PERF test if writing word-by-word is faster

461− copyToPtr name offset bOffset len

462− escape before after bOffset name offset len 0

463− let !newBufferRange = B.BufferRange (plusPtr bOffset len) bEnd

464− k newBufferRange

465− else

466− do copyToPtr name offset bOffset bLen

467− escape before after bOffset name offset bLen 0

468− let !newOffset = offset + bLen

469− let !newLength = len - bLen

470− return $ B.bufferFull 1 bEnd (go newOffset newLength)

471−

472−

473−escape :: Word8 -> Word8 -> Ptr a -> Utf8 t -> Int -> Int -> Int -> IO ()

474−escape before@(W8# before#) after ptr name@(Utf8 ba#) offset@(I# offset#) len@(I# len#) i@(I# i#) =

475− if isTrue# (i# <# len#) then

476− if isTrue# (eqWord# before# (indexWord8Array# ba# (offset# +# i#)))

477− then

478− do writeWordToPtr ptr i after

479− escape before after ptr name offset len (i + 1)

480− else

481− do escape before after ptr name offset len (i + 1)

482−

483− else

484− return ()

485−

486−

487−

488557-- FROM PTR

489558

490559

491−fromPtr :: Ptr Word8 -> Ptr Word8 -> Utf8 t

560+fromPtr :: Ptr Word8 -> Ptr Word8 -> Utf8 l t

492561fromPtr pos end =

493562 unsafeDupablePerformIO (stToIO (

494563 do let !len = minusPtr end pos

@@ -499,48 +568,130 @@ fromPtr pos end =

499568

500569

501570

502−-- FROM SNIPPET

571+-- FROM CHUNKS

503572

504573

505−fromSnippet :: P.Snippet -> Utf8 t

506−fromSnippet (P.Snippet fptr off len _ _) =

574+data Chunk

575+ = Slice (Ptr Word8) Int

576+ | Escape Word8

577+ | CodePoint Int

578+

579+

580+fromChunks :: [Chunk] -> Utf8 l t

581+fromChunks chunks =

507582 unsafeDupablePerformIO (stToIO (

508− do mba <- newByteArray len

509− let !pos = plusPtr (unsafeForeignPtrToPtr fptr) off

510− copyFromPtr pos mba 0 len

583+ do let !len = sum (map chunkToWidth chunks)

584+ mba <- newByteArray len

585+ writeChunks mba 0 chunks

511586 freeze mba

512587 ))

513588

514589

590+chunkToWidth :: Chunk -> Int

591+chunkToWidth chunk =

592+ case chunk of

593+ Slice _ len ->

594+ len

595+

596+ Escape _ ->

597+ 2

598+

599+ CodePoint code ->

600+ if code < 0xFFFF then 6 else 12

601+

602+

603+writeChunks :: MBA RealWorld -> Int -> [Chunk] -> ST RealWorld ()

604+writeChunks mba offset chunks =

605+ case chunks of

606+ [] ->

607+ return ()

608+

609+ chunk : chunks ->

610+ case chunk of

611+ Slice ptr len ->

612+ do copyFromPtr ptr mba offset len

613+ let !newOffset = offset + len

614+ writeChunks mba newOffset chunks

615+

616+ Escape word ->

617+ do writeWord8 mba offset 0x5C {- \ -}

618+ writeWord8 mba (offset + 1) word

619+ let !newOffset = offset + 2

620+ writeChunks mba newOffset chunks

621+

622+ CodePoint code ->

623+ if code < 0xFFFF then

624+ do writeCode mba offset code

625+ let !newOffset = offset + 6

626+ writeChunks mba newOffset chunks

627+ else

628+ do let (hi,lo) = divMod (code - 0x10000) 0x400

629+ writeCode mba (offset ) (hi + 0xD800)

630+ writeCode mba (offset + 6) (lo + 0xDC00)

631+ let !newOffset = offset + 12

632+ writeChunks mba newOffset chunks

633+

634+

635+-- TODO see if it is faster to writeWord32 a block of hex-as-ascii

636+writeCode :: MBA RealWorld -> Int -> Int -> ST RealWorld ()

637+writeCode mba offset code =

638+ do writeWord8 mba offset 0x5C {- \ -}

639+ writeWord8 mba offset 0x75 {- u -}

640+ writeHex mba (offset + 2) (shiftR code 12)

641+ writeHex mba (offset + 3) (shiftR code 8)

642+ writeHex mba (offset + 4) (shiftR code 4)

643+ writeHex mba (offset + 5) code

644+

645+

646+writeHex :: MBA RealWorld -> Int -> Int -> ST RealWorld ()

647+writeHex mba !offset !bits =

648+ do let !n = fromIntegral bits .&. 0x0F

649+ writeWord8 mba offset (if n < 10 then 0x30 + n else 0x37 + n)

515650

516−-- BINARY

517651

518652

519−putUnder256 :: Utf8 t -> Put

520−putUnder256 bytes =

521− do putWord8 (fromIntegral (size bytes))

522− putBuilder (toBuilder bytes)

653+-- UNDER 256 BINARY

523654

524655

525−getUnder256 :: Get (Utf8 t)

526−getUnder256 =

527− do word <- getWord8

528− let !n = fromIntegral word

529− readN n (copyFromByteString n)

656+instance Binary (Utf8 UNDER_256 t) where

657+ put bytes@(Utf8 ba#) =

658+ do putWord8 (W8# (int2Word# (sizeofByteArray# ba#)))

659+ putBuilder (toBuilder bytes)

660+ get =

661+ getUnder256 =<< getWord8

530662

531663

532−putVeryLong :: Utf8 t -> Put

533−putVeryLong bytes =

534− do put (size bytes)

535− putBuilder (toBuilder bytes)

664+{-# INLINE getUnder256 #-}

665+getUnder256 :: Word8 -> Get (Utf8 UNDER_256 t)

666+getUnder256 w =

667+ let !n = fromIntegral w in

668+ readN n (copyFromByteString n)

536669

537670

538−getVeryLong :: Get (Utf8 t)

539−getVeryLong =

540− do n <- get

541− if n > 0

542− then readN n (copyFromByteString n)

543− else return empty

671+

672+-- VERY LONG BINARY

673+

674+

675+instance Binary (Utf8 VERY_LONG t) where

676+ put str =

677+ do put (size str)

678+ putBuilder (toBuilder str)

679+ get =

680+ getVeryLong =<< get

681+

682+

683+{-# INLINE getVeryLong #-}

684+getVeryLong :: Int -> Get (Utf8 VERY_LONG t)

685+getVeryLong n =

686+ if n > 0

687+ then readN n (copyFromByteString n)

688+ else return empty

689+

690+

691+{-# NOINLINE empty #-}

692+empty :: Utf8 l t

693+empty =

694+ runST (freeze =<< newByteArray 0)

544695

545696

546697

@@ -548,7 +699,7 @@ getVeryLong =

548699

549700

550701{-# INLINE copyFromByteString #-}

551−copyFromByteString :: Int -> B.ByteString -> Utf8 t

702+copyFromByteString :: Int -> B.ByteString -> Utf8 l t

552703copyFromByteString len (B.PS fptr offset _) =

553704 unsafeDupablePerformIO

554705 (

@@ -567,21 +718,21 @@ data MBA s =

567718 MBA# (MutableByteArray# s)

568719

569720

570−newByteArray :: Int -> ST s (MBA s) -- PERF see if newPinnedByteArray for len > 256 is positive

721+newByteArray :: Int -> ST s (MBA s) -- TODO see if newPinnedByteArray for len > 256 is positive

571722newByteArray (I# len#) =

572723 ST $ \s ->

573724 case newByteArray# len# s of

574725 (# s, mba# #) -> (# s, MBA# mba# #)

575726

576727

577−freeze :: MBA s -> ST s (Utf8 t)

728+freeze :: MBA s -> ST s (Utf8 l t)

578729freeze (MBA# mba#) =

579730 ST $ \s ->

580731 case unsafeFreezeByteArray# mba# s of

581732 (# s, ba# #) -> (# s, Utf8 ba# #)

582733

583734

584−copy :: Utf8 t -> Int -> MBA s -> Int -> Int -> ST s ()

735+copy :: Utf8 l t -> Int -> MBA s -> Int -> Int -> ST s ()

585736copy (Utf8 ba#) (I# offset#) (MBA# mba#) (I# i#) (I# len#) =

586737 ST $ \s ->

587738 case copyByteArray# ba# offset# mba# i# len# s of

@@ -595,11 +746,11 @@ copyFromPtr (Ptr src#) (MBA# mba#) (I# offset#) (I# len#) =

595746 s -> (# s, () #)

596747

597748

598−copyToPtr :: Utf8 t -> Int -> Ptr a -> Int -> IO ()

749+copyToPtr :: Utf8 l t -> Int -> Ptr a -> Int -> IO ()

599750copyToPtr (Utf8 ba#) (I# offset#) (Ptr mba#) (I# len#) =

600− IO $ \s ->

601− case copyByteArrayToAddr# ba# offset# mba# len# s of

602− s -> (# s, () #)

751+ IO $ \s ->

752+ case copyByteArrayToAddr# ba# offset# mba# len# s of

753+ s -> (# s, () #)

603754

604755

605756{-# INLINE writeWord8 #-}

@@ -608,11 +759,3 @@ writeWord8 (MBA# mba#) (I# offset#) (W8# w#) =

608759 ST $ \s ->

609760 case writeWord8Array# mba# offset# w# s of

610761 s -> (# s, () #)

611−

612−

613−{-# INLINE writeWordToPtr #-}

614−writeWordToPtr :: Ptr a -> Int -> Word8 -> IO ()

615−writeWordToPtr (Ptr addr#) (I# offset#) (W8# word#) =

616− IO $ \s ->

617− case writeWord8OffAddr# addr# offset# word# s of

618− s -> (# s, () #)

compiler/src/Elm/Compiler/Imports.hs+13−4

@@ -1,7 +1,7 @@

11{-# OPTIONS_GHC -Wall #-}

22{-# LANGUAGE OverloadedStrings #-}

33module Elm.Compiler.Imports

4− ( defaults

4+ ( addDefaults

55 )

66 where

77

@@ -14,6 +14,15 @@ import qualified Reporting.Annotation as A

1414

1515

1616

17+-- ADD DEFAULTS

18+

19+

20+addDefaults :: [Src.Import] -> [Src.Import]

21+addDefaults imports =

22+ defaults ++ imports

23+

24+

25+

1726-- DEFAULTS

1827

1928

@@ -49,14 +58,14 @@ closed =

4958

5059typeOpen :: Name.Name -> Src.Exposing

5160typeOpen name =

52− Src.Explicit [ Src.Upper (A.At A.zero name) (Src.Public A.zero) ]

61+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Public) ]

5362

5463

5564typeClosed :: Name.Name -> Src.Exposing

5665typeClosed name =

57− Src.Explicit [ Src.Upper (A.At A.zero name) Src.Private ]

66+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Private) ]

5867

5968

6069operator :: Name.Name -> Src.Exposing

6170operator op =

62− Src.Explicit [ Src.Operator A.zero op ]

71+ Src.Explicit [ A.At A.zero (Src.Operator op) ]

compiler/src/Elm/Compiler/Type.hs+27−26

@@ -15,12 +15,9 @@ module Elm.Compiler.Type

1515

1616

1717import qualified Data.Name as Name

18+import qualified Data.Utf8 as Utf8

1819

1920import qualified AST.Source as Src

20−import qualified Json.Decode as D

21−import qualified Json.Encode as E

22−import Json.Encode ((==>))

23−import qualified Json.String as Json

2421import qualified Parse.Primitives as P

2522import qualified Parse.Type as Type

2623import qualified Reporting.Annotation as A

@@ -28,6 +25,10 @@ import qualified Reporting.Doc as D

2825import qualified Reporting.Render.Type as RT

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

3027

28+import qualified Json.Decode as D

29+import qualified Json.Encode as E

30+import Json.Encode ((==>))

31+

3132

3233

3334-- TYPES

@@ -113,16 +114,18 @@ collectLambdas tipe =

113114

114115encode :: Type -> E.Value

115116encode tipe =

116− E.chars $ D.toLine (toDoc L.empty RT.None tipe)

117+ E.string $ Utf8.fromChars $ D.toLine (toDoc L.empty RT.None tipe)

117118

118119

119120decoder :: D.Decoder () Type

120121decoder =

121− let

122− parser =

123− P.specialize (\_ _ _ -> ()) (fromRawType . fst <$> Type.expression)

124− in

125− D.customString parser (\_ _ -> ())

122+ do str <- D.string

123+ case P.fromByteString Type.expression (error "TODO turn Utf8 to something that can be parsed" str) of

124+ P.Ok (tipe, _, _) _ ->

125+ return (fromRawType tipe)

126+

127+ P.Err _ _ _ _ ->

128+ D.failure ()

126129

127130

128131fromRawType :: Src.Type -> Type

@@ -164,31 +167,29 @@ encodeMetadata :: DebugMetadata -> E.Value

164167encodeMetadata (DebugMetadata msg aliases unions) =

165168 E.object

166169 [ "message" ==> encode msg

167− , "aliases" ==> E.object (map toTypeAliasField aliases)

168− , "unions" ==> E.object (map toCustomTypeField unions)

170+ , "aliases" ==> E.object (map toAliasField aliases)

171+ , "unions" ==> E.object (map toUnionField unions)

169172 ]

170173

171174

172−toTypeAliasField :: Alias -> ( Json.String, E.Value )

173−toTypeAliasField (Alias name args tipe) =

174− ( Json.fromName name

175− , E.object

175+toAliasField :: Alias -> ( Utf8.String, E.Value )

176+toAliasField (Alias name args tipe) =

177+ Name.toUtf8 name ==>

178+ E.object

176179 [ "args" ==> E.list E.name args

177180 , "type" ==> encode tipe

178181 ]

179− )

180182

181183

182−toCustomTypeField :: Union -> ( Json.String, E.Value )

183−toCustomTypeField (Union name args constructors) =

184− ( Json.fromName name

185− , E.object

184+toUnionField :: Union -> ( Utf8.String, E.Value )

185+toUnionField (Union name args constructors) =

186+ Name.toUtf8 name ==>

187+ E.object

186188 [ "args" ==> E.list E.name args

187− , "tags" ==> E.object (map toVariantObject constructors)

189+ , "tags" ==> E.object (map toCtorObject constructors)

188190 ]

189− )

190191

191192

192−toVariantObject :: (Name.Name, [Type]) -> ( Json.String, E.Value )

193−toVariantObject (name, args) =

194− ( Json.fromName name, E.list encode args )

193+toCtorObject :: (Name.Name, [Type]) -> ( Utf8.String, E.Value )

194+toCtorObject (name, args) =

195+ Name.toUtf8 name ==> E.list encode args

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

@@ -87,7 +87,7 @@ toPublicName (ModuleName.Canonical _ home) name =

8787

8888newtype Types =

8989 Types (Map.Map ModuleName.Canonical Types_)

90− -- PERF profile Opt.Global representation

90+ -- TODO profile Opt.Global representation

9191 -- current representation needs less allocation

9292 -- but maybe the lookup is much worse

9393

compiler/src/Elm/Constraint.hs+77−55

@@ -5,6 +5,9 @@ module Elm.Constraint

55 , exactly

66 , anything

77 , toChars

8+ , toString

9+ , Error(..)

10+ , fromString

811 , satisfies

912 , check

1013 , intersect

@@ -13,8 +16,6 @@ module Elm.Constraint

1316 , untilNextMajor

1417 , untilNextMinor

1518 , expand

16− --

17− , Error(..)

1819 , decoder

1920 , encode

2021 )

@@ -23,12 +24,11 @@ module Elm.Constraint

2324

2425import Control.Monad (liftM4)

2526import Data.Binary (Binary, get, put, getWord8, putWord8)

27+import qualified Data.Utf8 as Utf8

2628

2729import qualified Elm.Version as V

2830import qualified Json.Decode as D

2931import qualified Json.Encode as E

30−import qualified Parse.Primitives as P

31−import Parse.Primitives (Row, Col)

3232

3333

3434

@@ -61,21 +61,78 @@ anything =

6161

6262

6363

64−-- TO CHARS

64+-- TO STRING

6565

6666

67−toChars :: Constraint -> [Char]

67+toChars :: Constraint -> String

6868toChars constraint =

69+ Utf8.toChars (toString constraint)

70+

71+

72+toString :: Constraint -> Utf8.String

73+toString constraint =

6974 case constraint of

7075 Range lower lowerOp upperOp upper ->

71− V.toChars lower ++ opToChars lowerOp ++ "v" ++ opToChars upperOp ++ V.toChars upper

76+ Utf8.join 0x20 {- -}

77+ [ V.toString lower

78+ , toStringHelp lowerOp

79+ , "v"

80+ , toStringHelp upperOp

81+ , V.toString upper

82+ ]

7283

7384

74−opToChars :: Op -> [Char]

75−opToChars op =

85+toStringHelp :: Op -> Utf8.String

86+toStringHelp op =

7687 case op of

77− Less -> " < "

78− LessOrEqual -> " <= "

88+ Less -> "<"

89+ LessOrEqual -> "<="

90+

91+

92+

93+-- FROM STRING

94+

95+

96+data Error

97+ = BadLower Utf8.String

98+ | BadUpper Utf8.String

99+ | BadFormat

100+ | InvalidOp

101+ | InvalidRange V.Version V.Version

102+

103+

104+fromString :: Utf8.String -> Either Error Constraint

105+fromString string =

106+ case Utf8.split 0x20 {- -} string of

107+ [lower, lowerOp, "v", upperOp, upper] ->

108+ do lo <- versionFromString lower BadLower

109+ lop <- opFromString lowerOp

110+ hop <- opFromString upperOp

111+ hi <- versionFromString upper BadUpper

112+ if lo < hi

113+ then Right (Range lo lop hop hi)

114+ else Left (InvalidRange lo hi)

115+

116+ _ ->

117+ Left BadFormat

118+

119+

120+versionFromString :: Utf8.String -> (Utf8.String -> Error) -> Either Error V.Version

121+versionFromString string toError =

122+ case V.fromString string of

123+ Just vsn ->

124+ Right vsn

125+

126+ Nothing ->

127+ Left (toError string)

128+

129+

130+opFromString :: Utf8.String -> Either Error Op

131+opFromString text =

132+ case text of

133+ "<=" -> Right LessOrEqual

134+ "<" -> Right Less

135+ _ -> Left InvalidOp

79136

80137

81138

@@ -188,12 +245,18 @@ expand constraint@(Range lower lowerOp upperOp upper) version

188245

189246encode :: Constraint -> E.Value

190247encode constraint =

191− E.chars (toChars constraint)

248+ E.string (toString constraint)

192249

193250

194251decoder :: D.Decoder Error Constraint

195252decoder =

196− D.customString parser BadFormat

253+ do str <- D.string

254+ case fromString str of

255+ Right constraint ->

256+ return constraint

257+

258+ Left err ->

259+ D.failure err

197260

198261

199262

@@ -216,45 +279,4 @@ instance Binary Op where

216279 case n of

217280 0 -> return Less

218281 1 -> return LessOrEqual

219− _ -> fail "binary encoding of Op was corrupted"

220−

221−

222−

223−-- PARSER

224−

225−

226−data Error

227− = BadFormat Row Col

228− | InvalidRange V.Version V.Version

229−

230−

231−parser :: P.Parser Error Constraint

232−parser =

233− do lower <- parseVersion

234− P.word1 0x20 {- -} BadFormat

235− loOp <- parseOp

236− P.word1 0x20 {- -} BadFormat

237− P.word1 0x76 {-v-} BadFormat

238− P.word1 0x20 {- -} BadFormat

239− hiOp <- parseOp

240− P.word1 0x20 {- -} BadFormat

241− higher <- parseVersion

242− P.Parser $ \state@(P.State _ _ _ _ row col) _ eok _ eerr ->

243− if lower < higher

244− then eok (Range lower loOp hiOp higher) state

245− else eerr row col (\_ _ -> InvalidRange lower higher)

246−

247−

248−parseVersion :: P.Parser Error V.Version

249−parseVersion =

250− P.specialize (\(r,c) _ _ -> BadFormat r c) V.parser

251−

252−

253−parseOp :: P.Parser Error Op

254−parseOp =

255− do P.word1 0x3C {-<-} BadFormat

256− P.oneOfWithFallback

257− [ do P.word1 0x3D {-=-} BadFormat

258− return LessOrEqual

259− ]

260− Less

282+ _ -> error "binary encoding of Op was corrupted"

compiler/src/Elm/Docs.hs+158−218

@@ -1,7 +1,8 @@

11{-# OPTIONS_GHC -Wall #-}

2−{-# LANGUAGE BangPatterns, MultiWayIf, OverloadedStrings, UnboxedTuples #-}

2+{-# LANGUAGE OverloadedStrings #-}

33module Elm.Docs

44 ( Documentation

5+ , toDict

56 , Module(..)

67 , fromModule

78 , Union(..)

@@ -17,35 +18,33 @@ module Elm.Docs

1718 where

1819

1920

20−import qualified Data.Coerce as Coerce

21+import qualified Data.ByteString as B

2122import qualified Data.List as List

2223import Data.Map ((!))

2324import qualified Data.Map as Map

24−import qualified Data.Map.Merge.Strict as Map

2525import qualified Data.Name as Name

26−import qualified Data.NonEmptyList as NE

27−import qualified Data.OneOrMore as OneOrMore

28−import Data.Word (Word8)

29−import Foreign.Ptr (Ptr, plusPtr)

26+import qualified Data.Text as Text

27+import qualified Data.Text.Encoding as Text

3028

3129import qualified AST.Canonical as Can

32−import qualified AST.Source as Src

3330import qualified AST.Utils.Binop as Binop

31+import qualified Data.OneOrMore as OneOrMore

3432import qualified Elm.Compiler.Type as Type

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

3634import qualified Elm.ModuleName as ModuleName

3735import qualified Json.Decode as D

3836import qualified Json.Encode as E

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

40−import qualified Json.String as Json

41−import Parse.Primitives (Row, Col, word1)

42−import qualified Parse.Primitives as P

43−import qualified Parse.Space as Space

44−import qualified Parse.Symbol as Symbol

45−import qualified Parse.Variable as Var

4638import qualified Reporting.Annotation as A

39+import qualified Reporting.Error as Error

4740import qualified Reporting.Error.Docs as E

41+import qualified Reporting.Region as R

4842import qualified Reporting.Result as Result

43+import Parse.Primitives (Parser)

44+import qualified Parse.Primitives as P

45+import qualified Parse.Primitives.Symbol as Symbol

46+import qualified Parse.Primitives.Variable as Var

47+import qualified Parse.Primitives.Whitespace as W

4948

5049

5150

@@ -56,6 +55,21 @@ type Documentation =

5655 Map.Map Name.Name Module

5756

5857

58+toDict :: [Module] -> Documentation

59+toDict modules =

60+ Map.fromList (map toPair modules)

61+

62+

63+

64+toPair :: Module -> (Name.Name, Module)

65+toPair modul@(Module name _ _ _ _ _) =

66+ (name, modul)

67+

68+

69+

70+-- MODULES

71+

72+

5973data Module =

6074 Module

6175 { _name :: Name.Name

@@ -66,7 +80,9 @@ data Module =

6680 , _binops :: Map.Map Name.Name Binop

6781 }

6882

69−type Comment = Json.String

83+

84+type Comment = Text.Text

85+

7086

7187data Alias = Alias Comment [Name.Name] Type.Type

7288data Union = Union Comment [Name.Name] [(Name.Name, [Type.Type])]

@@ -75,19 +91,14 @@ data Binop = Binop Comment Type.Type Binop.Associativity Binop.Precedence

7591

7692

7793

78−-- JSON

79−

80−

81−encode :: Documentation -> E.Value

82−encode docs =

83− E.list encodeModule (Map.elems docs)

94+-- JSON ENCODE / DECODE

8495

8596

86−encodeModule :: Module -> E.Value

87−encodeModule (Module name comment unions aliases values binops) =

97+encode :: Module -> E.Value

98+encode (Module name comment unions aliases values binops) =

8899 E.object $

89100 [ "name" ==> ModuleName.encode name

90− , "comment" ==> E.string comment

101+ , "comment" ==> E.text comment

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

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

93104 , "values" ==> E.list encodeValue (Map.toList values)

@@ -96,31 +107,16 @@ encodeModule (Module name comment unions aliases values binops) =

96107

97108

98109data Error

99− = BadAssociativity

100− | BadModuleName

110+ = BadAssociativity Text.Text

111+ | BadName

101112 | BadType

102113

103114

104−decoder :: D.Decoder Error Documentation

115+decoder :: D.Decoder Error Module

105116decoder =

106− toDict <$> D.list moduleDecoder

107−

108−

109−toDict :: [Module] -> Documentation

110−toDict modules =

111− Map.fromList (map toDictHelp modules)

112−

113−

114−toDictHelp :: Module -> (Name.Name, Module)

115−toDictHelp modul@(Module name _ _ _ _ _) =

116− (name, modul)

117−

118−

119−moduleDecoder :: D.Decoder Error Module

120−moduleDecoder =

121117 Module

122− <$> D.field "name" moduleNameDecoder

123− <*> D.field "comment" D.string

118+ <$> D.field "name" nameDecoder

119+ <*> D.field "comment" D.text

124120 <*> D.field "unions" (dictDecoder union)

125121 <*> D.field "aliases" (dictDecoder alias)

126122 <*> D.field "values" (dictDecoder value)

@@ -135,18 +131,13 @@ dictDecoder entryDecoder =

135131named :: D.Decoder Error a -> D.Decoder Error (Name.Name, a)

136132named entryDecoder =

137133 (,)

138− <$> D.field "name" nameDecoder

134+ <$> D.field "name" D.name

139135 <*> entryDecoder

140136

141137

142−nameDecoder :: D.Decoder e Name.Name

138+nameDecoder :: D.Decoder Error Name.Name

143139nameDecoder =

144− fmap Coerce.coerce D.string

145−

146−

147−moduleNameDecoder :: D.Decoder Error ModuleName.Raw

148−moduleNameDecoder =

149− D.mapError (const BadModuleName) ModuleName.decoder

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

150141

151142

152143typeDecoder :: D.Decoder Error Type.Type

@@ -162,7 +153,7 @@ encodeUnion :: (Name.Name, Union) -> E.Value

162153encodeUnion (name, Union comment args cases) =

163154 E.object

164155 [ "name" ==> E.name name

165− , "comment" ==> E.string comment

156+ , "comment" ==> E.text comment

166157 , "args" ==> E.list E.name args

167158 , "cases" ==> E.list encodeCase cases

168159 ]

@@ -171,8 +162,8 @@ encodeUnion (name, Union comment args cases) =

171162union :: D.Decoder Error Union

172163union =

173164 Union

174− <$> D.field "comment" D.string

175− <*> D.field "args" (D.list nameDecoder)

165+ <$> D.field "comment" D.text

166+ <*> D.field "args" (D.list D.name)

176167 <*> D.field "cases" (D.list caseDecoder)

177168

178169

@@ -183,7 +174,7 @@ encodeCase ( tag, args ) =

183174

184175caseDecoder :: D.Decoder Error ( Name.Name, [Type.Type] )

185176caseDecoder =

186− D.pair nameDecoder (D.list typeDecoder)

177+ D.pair D.name (D.list typeDecoder)

187178

188179

189180

@@ -194,7 +185,7 @@ encodeAlias :: (Name.Name, Alias) -> E.Value

194185encodeAlias ( name, Alias comment args tipe) =

195186 E.object

196187 [ "name" ==> E.name name

197− , "comment" ==> E.string comment

188+ , "comment" ==> E.text comment

198189 , "args" ==> E.list E.name args

199190 , "type" ==> Type.encode tipe

200191 ]

@@ -203,8 +194,8 @@ encodeAlias ( name, Alias comment args tipe) =

203194alias :: D.Decoder Error Alias

204195alias =

205196 Alias

206− <$> D.field "comment" D.string

207− <*> D.field "args" (D.list nameDecoder)

197+ <$> D.field "comment" D.text

198+ <*> D.field "args" (D.list D.name)

208199 <*> D.field "type" typeDecoder

209200

210201

@@ -216,7 +207,7 @@ encodeValue :: (Name.Name, Value) -> E.Value

216207encodeValue (name, Value comment tipe) =

217208 E.object

218209 [ "name" ==> E.name name

219− , "comment" ==> E.string comment

210+ , "comment" ==> E.text comment

220211 , "type" ==> Type.encode tipe

221212 ]

222213

@@ -224,7 +215,7 @@ encodeValue (name, Value comment tipe) =

224215value :: D.Decoder Error Value

225216value =

226217 Value

227− <$> D.field "comment" D.string

218+ <$> D.field "comment" D.text

228219 <*> D.field "type" typeDecoder

229220

230221

@@ -236,7 +227,7 @@ encodeBinop :: (Name.Name, Binop) -> E.Value

236227encodeBinop (name, Binop comment tipe assoc prec) =

237228 E.object

238229 [ "name" ==> E.name name

239− , "comment" ==> E.string comment

230+ , "comment" ==> E.text comment

240231 , "type" ==> Type.encode tipe

241232 , "associativity" ==> encodeAssoc assoc

242233 , "precedence" ==> encodePrec prec

@@ -246,7 +237,7 @@ encodeBinop (name, Binop comment tipe assoc prec) =

246237binop :: D.Decoder Error Binop

247238binop =

248239 Binop

249− <$> D.field "comment" D.string

240+ <$> D.field "comment" D.text

250241 <*> D.field "type" typeDecoder

251242 <*> D.field "associativity" assocDecoder

252243 <*> D.field "precedence" precDecoder

@@ -259,23 +250,19 @@ binop =

259250encodeAssoc :: Binop.Associativity -> E.Value

260251encodeAssoc assoc =

261252 case assoc of

262− Binop.Left -> E.chars "left"

263− Binop.Non -> E.chars "non"

264− Binop.Right -> E.chars "right"

253+ Binop.Left -> E.text "left"

254+ Binop.Non -> E.text "non"

255+ Binop.Right -> E.text "right"

265256

266257

267258assocDecoder :: D.Decoder Error Binop.Associativity

268259assocDecoder =

269− let

270− left = Json.fromChars "left"

271− non = Json.fromChars "non"

272− right = Json.fromChars "right"

273− in

274− do str <- D.string

275− if | str == left -> return Binop.Left

276− | str == non -> return Binop.Non

277− | str == right -> return Binop.Right

278− | otherwise -> D.failure BadAssociativity

260+ do txt <- D.text

261+ case txt of

262+ "left" -> D.succeed Binop.Left

263+ "non" -> D.succeed Binop.Non

264+ "right" -> D.succeed Binop.Right

265+ _ -> D.fail (BadAssociativity txt)

279266

280267

281268

@@ -296,190 +283,142 @@ precDecoder =

296283-- FROM MODULE

297284

298285

299−fromModule :: Can.Module -> Either E.Error Module

300−fromModule modul@(Can.Module _ exports docs _ _ _ _ _) =

286+fromModule :: Can.Module -> Result.Result i w Error.Error Module

287+fromModule (Can.Module name docs exports decls unions aliases binops effects) =

301288 case exports of

302289 Can.ExportEverything region ->

303− Left (E.ImplicitExposing region)

290+ Result.throw $ Error.Docs $ E.ImplicitExposing region

304291

305292 Can.Export exportDict ->

306293 case docs of

307− Src.NoDocs region ->

308− Left (E.NoDocs region)

294+ Can.NoDocs region ->

295+ Result.throw $ Error.Docs $ E.NoDocs region

309296

310− Src.YesDocs overview comments ->

311− do names <- parseOverview overview

312− checkNames exportDict names

313− checkDefs exportDict overview (Map.fromList comments) modul

297+ Can.YesDocs region overview comments ->

298+ do names <- parseOverview region overview

299+ Result.mapError Error.Docs $

300+ do checkNames exportDict names

301+ let types = gatherTypes decls Map.empty

302+ let info = Info comments types unions aliases binops effects

303+ inserters <- Map.traverseWithKey (checkExport info) exportDict

304+ return $ foldr ($) (emptyModule name overview) inserters

305+

306+

307+emptyModule :: ModuleName.Canonical -> B.ByteString -> Module

308+emptyModule (ModuleName.Canonical _ name) overview =

309+ Module name (Text.decodeUtf8 overview) Map.empty Map.empty Map.empty Map.empty

314310

315311

316312

317313-- PARSE OVERVIEW

318314

319315

320−parseOverview :: Src.Comment -> Either E.Error [A.Located Name.Name]

321−parseOverview (Src.Comment snippet) =

322− case P.fromSnippet (chompOverview []) E.BadEnd snippet of

316+parseOverview :: R.Region -> B.ByteString -> Result.Result i w Error.Error [A.Located Name.Name]

317+parseOverview (R.Region (R.Position row col) _) overview =

318+ case P.runAt row (col + 3) (chompOverview []) overview of

323319 Left err ->

324− Left (E.SyntaxProblem err)

320+ Result.throw (Error.Syntax err)

325321

326322 Right names ->

327− Right names

328−

329−

330−type Parser a =

331− P.Parser E.SyntaxProblem a

323+ Result.ok names

332324

333325

334326chompOverview :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

335327chompOverview names =

336− do isDocs <- chompUntilDocs

328+ do isDocs <- W.chompUntilDocs

337329 if isDocs

338− then

339− do Space.chomp E.Space

340− chompOverview =<< chompDocs names

341− else

342− return names

330+ then chompOverviewHelp names

331+ else return names

332+

333+

334+chompOverviewHelp :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

335+chompOverviewHelp names =

336+ do pos <- P.getPosition

337+ (W.SPos spos) <- W.whitespace

338+ if pos == spos

339+ then chompOverview names

340+ else chompOverview =<< chompDocs names

343341

344342

345343chompDocs :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

346344chompDocs names =

347− do name <-

348− P.addLocation $

349− P.oneOf E.Name

350− [ Var.lower E.Name

351− , Var.upper E.Name

352− , chompOperator

353− ]

354−

355− Space.chomp E.Space

356−

357− P.oneOfWithFallback

358− [ do pos <- P.getPosition

359− Space.checkIndent pos E.Comma

360− word1 0x2C {-,-} E.Comma

361− Space.chomp E.Space

345+ do name <- P.addLocation (P.oneOf [ Var.lower, Var.upper, chompBinop ])

346+ spos <- W.whitespace

347+ P.oneOf

348+ [ do P.checkSpace spos

349+ Symbol.comma

350+ P.spaces

362351 chompDocs (name:names)

352+ , return (name:names)

363353 ]

364− (name:names)

365−

366−

367−chompOperator :: Parser Name.Name

368−chompOperator =

369− do word1 0x28 {-(-} E.Op

370− op <- Symbol.operator E.Op E.OpBad

371− word1 0x29 {-)-} E.Op

372− return op

373−

374−

375−-- TODO add rule that @docs must be after newline in 0.20

376−--

377−chompUntilDocs :: Parser Bool

378−chompUntilDocs =

379− P.Parser $ \(P.State src pos end indent row col) cok _ _ _ ->

380− let

381− (# isDocs, newPos, newRow, newCol #) = untilDocs pos end row col

382− !newState = P.State src newPos end indent newRow newCol

383− in

384− cok isDocs newState

385−

386−

387−untilDocs :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> (# Bool, Ptr Word8, Row, Col #)

388−untilDocs pos end row col =

389− if pos >= end then

390− (# False, pos, row, col #)

391− else

392− let !word = P.unsafeIndex pos in

393− if word == 0x0A {-\n-} then

394− untilDocs (plusPtr pos 1) end (row + 1) 1

395− else

396− let !pos5 = plusPtr pos 5 in

397− if pos5 <= end

398− && P.unsafeIndex ( pos ) == 0x40 {-@-}

399− && P.unsafeIndex (plusPtr pos 1) == 0x64 {-d-}

400− && P.unsafeIndex (plusPtr pos 2) == 0x6F {-o-}

401− && P.unsafeIndex (plusPtr pos 3) == 0x63 {-c-}

402− && P.unsafeIndex (plusPtr pos 4) == 0x73 {-s-}

403− && Var.getInnerWidth pos5 end == 0

404− then

405− (# True, pos5, row, col + 5 #)

406− else

407− let !newPos = plusPtr pos (P.getCharWidth word) in

408− untilDocs newPos end row (col + 1)

354+

355+

356+chompBinop :: Parser Name.Name

357+chompBinop =

358+ do Symbol.leftParen

359+ name <- Symbol.binop

360+ Symbol.rightParen

361+ return name

409362

410363

411364

412365-- CHECK NAMES

413366

414367

415−checkNames :: Map.Map Name.Name (A.Located Can.Export) -> [A.Located Name.Name] -> Either E.Error ()

416−checkNames exports names =

417− let

418− docs = List.foldl' addName Map.empty names

419− loneDoc = Map.traverseMissing onlyInDocs

420− loneExport = Map.traverseMissing onlyInExports

421− checkBoth = Map.zipWithAMatched (\n _ r -> isUnique n r)

422− in

423− case Result.run (Map.mergeA loneExport loneDoc checkBoth exports docs) of

424− (_, Right _) -> Right ()

425− (_, Left es) -> Left (E.NameProblems (OneOrMore.destruct NE.List es))

368+type Result i w a =

369+ Result.Result i w E.Error a

370+

371+

372+type Dups =

373+ Map.Map Name.Name (OneOrMore.OneOrMore R.Region)

426374

427375

428−type DocNameRegions =

429− Map.Map Name.Name (OneOrMore.OneOrMore A.Region)

376+checkNames :: Map.Map Name.Name (A.Located Can.Export) -> [A.Located Name.Name] -> Result i w ()

377+checkNames exports names =

378+ do docs <- Map.traverseWithKey isUnique (List.foldl' addName Map.empty names)

379+ let overlap = Map.size (Map.intersection docs exports)

380+ if Map.size exports == overlap && overlap == Map.size docs

381+ then Result.ok ()

382+ else

383+ do _ <- Map.traverseWithKey onlyInDocs (Map.difference docs exports)

384+ _ <- Map.traverseWithKey onlyInExports (Map.difference exports docs)

385+ Result.ok ()

430386

431387

432−addName :: DocNameRegions -> A.Located Name.Name -> DocNameRegions

388+addName :: Dups -> A.Located Name.Name -> Dups

433389addName dict (A.At region name) =

434390 Map.insertWith OneOrMore.more name (OneOrMore.one region) dict

435391

436392

437−isUnique :: Name.Name -> OneOrMore.OneOrMore A.Region -> Result.Result i w E.NameProblem A.Region

393+isUnique :: Name.Name -> OneOrMore.OneOrMore R.Region -> Result i w R.Region

438394isUnique name regions =

439395 case regions of

440396 OneOrMore.One region ->

441397 Result.ok region

442398

443− OneOrMore.More left right ->

444− let (r1, r2) = OneOrMore.getFirstTwo left right in

445− Result.throw (E.NameDuplicate name r1 r2)

399+ OneOrMore.More _ _ ->

400+ let (r1:r2:_) = OneOrMore.toList regions in

401+ Result.throw (E.Duplicate name r1 r2)

446402

447403

448−onlyInDocs :: Name.Name -> OneOrMore.OneOrMore A.Region -> Result.Result i w E.NameProblem a

449−onlyInDocs name regions =

450− do region <- isUnique name regions

451− Result.throw $ E.NameOnlyInDocs name region

404+onlyInDocs :: Name.Name -> R.Region -> Result i w a

405+onlyInDocs name region =

406+ Result.throw $ E.OnlyInDocs name region

452407

453408

454−onlyInExports :: Name.Name -> A.Located Can.Export -> Result.Result i w E.NameProblem a

409+onlyInExports :: Name.Name -> A.Located Can.Export -> Result i w a

455410onlyInExports name (A.At region _) =

456− Result.throw $ E.NameOnlyInExports name region

457−

458−

459−

460−-- CHECK DEFS

461−

411+ Result.throw $ E.OnlyInExports name region

462412

463−checkDefs :: Map.Map Name.Name (A.Located Can.Export) -> Src.Comment -> Map.Map Name.Name Src.Comment -> Can.Module -> Either E.Error Module

464−checkDefs exportDict overview comments (Can.Module name _ _ decls unions aliases infixes effects) =

465− let

466− types = gatherTypes decls Map.empty

467− info = Info comments types unions aliases infixes effects

468− in

469− case Result.run (Map.traverseWithKey (checkExport info) exportDict) of

470− (_, Left problems ) -> Left $ E.DefProblems (OneOrMore.destruct NE.List problems)

471− (_, Right inserters) -> Right $ foldr ($) (emptyModule name overview) inserters

472413

473414

474−emptyModule :: ModuleName.Canonical -> Src.Comment -> Module

475−emptyModule (ModuleName.Canonical _ name) (Src.Comment overview) =

476− Module name (Json.fromComment overview) Map.empty Map.empty Map.empty Map.empty

415+-- CHECK EXPORTS

477416

478417

479418data Info =

480419 Info

481− { _iComments :: Map.Map Name.Name Src.Comment

482− , _iValues :: Map.Map Name.Name (Either A.Region Can.Type)

420+ { _iComments :: Map.Map Name.Name Comment

421+ , _iValues :: Types

483422 , _iUnions :: Map.Map Name.Name Can.Union

484423 , _iAliases :: Map.Map Name.Name Can.Alias

485424 , _iBinops :: Map.Map Name.Name Can.Binop

@@ -487,7 +426,7 @@ data Info =

487426 }

488427

489428

490−checkExport :: Info -> Name.Name -> A.Located Can.Export -> Result.Result i w E.DefProblem (Module -> Module)

429+checkExport :: Info -> Name.Name -> A.Located Can.Export -> Result i w (Module -> Module)

491430checkExport info name (A.At region export) =

492431 case export of

493432 Can.ExportValue ->

@@ -528,23 +467,23 @@ checkExport info name (A.At region export) =

528467 m { _values = Map.insert name (Value comment tipe) (_values m) }

529468

530469

531−getComment :: A.Region -> Name.Name -> Info -> Result.Result i w E.DefProblem Comment

470+getComment :: R.Region -> Name.Name -> Info -> Result i w Comment

532471getComment region name info =

533472 case Map.lookup name (_iComments info) of

534473 Nothing ->

535474 Result.throw (E.NoComment name region)

536475

537− Just (Src.Comment snippet) ->

538− Result.ok (Json.fromComment snippet)

476+ Just comment ->

477+ Result.ok comment

539478

540479

541−getType :: Name.Name -> Info -> Result.Result i w E.DefProblem Type.Type

480+getType :: Name.Name -> Info -> Result i w Type.Type

542481getType name info =

543482 case _iValues info ! name of

544− Left region ->

545− Result.throw (E.NoAnnotation name region)

483+ A.At defRegion Nothing ->

484+ Result.throw (E.NoAnnotation name defRegion)

546485

547− Right tipe ->

486+ A.At _ (Just tipe) ->

548487 Result.ok (Extract.fromType tipe)

549488

550489

@@ -558,7 +497,7 @@ dector (Can.Ctor name _ _ args) =

558497

559498

560499type Types =

561− Map.Map Name.Name (Either A.Region Can.Type)

500+ Map.Map Name.Name (A.Located (Maybe Can.Type))

562501

563502

564503gatherTypes :: Can.Decls -> Types -> Types

@@ -567,8 +506,8 @@ gatherTypes decls types =

567506 Can.Declare def subDecls ->

568507 gatherTypes subDecls (addDef types def)

569508

570− Can.DeclareRec def defs subDecls ->

571− gatherTypes subDecls (List.foldl' addDef (addDef types def) defs)

509+ Can.DeclareRec defs subDecls ->

510+ gatherTypes subDecls (List.foldl' addDef types defs)

572511

573512 Can.SaveTheEnvironment ->

574513 types

@@ -578,10 +517,11 @@ addDef :: Types -> Can.Def -> Types

578517addDef types def =

579518 case def of

580519 Can.Def (A.At region name) _ _ ->

581− Map.insert name (Left region) types

520+ Map.insert name (A.At region Nothing) types

582521

583− Can.TypedDef (A.At _ name) _ typedArgs _ resultType ->

522+ Can.TypedDef (A.At region name) _ typedArgs _ resultType ->

584523 let

585− tipe = foldr Can.TLambda resultType (map snd typedArgs)

524+ tipe =

525+ foldr Can.TLambda resultType (map snd typedArgs)

586526 in

587− Map.insert name (Right tipe) types

527+ Map.insert name (A.At region (Just tipe)) types

compiler/src/Elm/Float.hsdeleted−51

@@ -1,51 +0,0 @@

1−{-# OPTIONS_GHC -Wall #-}

2−{-# LANGUAGE EmptyDataDecls, FlexibleInstances #-}

3−module Elm.Float

4− ( Float

5− , fromPtr

6− , toBuilder

7− )

8− where

9−

10−

11−import Prelude hiding (Float)

12−import Data.Binary (Binary, get, put)

13−import qualified Data.ByteString.Builder as B

14−import qualified Data.Utf8 as Utf8

15−import Data.Word (Word8)

16−import Foreign.Ptr (Ptr)

17−

18−

19−

20−-- FLOATS

21−

22−

23−type Float =

24− Utf8.Utf8 ELM_FLOAT

25−

26−

27−data ELM_FLOAT

28−

29−

30−

31−-- HELPERS

32−

33−

34−fromPtr :: Ptr Word8 -> Ptr Word8 -> Float

35−fromPtr =

36− Utf8.fromPtr

37−

38−

39−{-# INLINE toBuilder #-}

40−toBuilder :: Float -> B.Builder

41−toBuilder =

42− Utf8.toBuilder

43−

44−

45−

46−-- BINARY

47−

48−

49−instance Binary (Utf8.Utf8 ELM_FLOAT) where

50− get = Utf8.getUnder256

51− put = Utf8.putUnder256

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

@@ -215,7 +215,7 @@ instance Binary Union where

215215 0 -> liftM OpenUnion get

216216 1 -> liftM ClosedUnion get

217217 2 -> liftM PrivateUnion get

218− _ -> fail "binary encoding of Union was corrupted"

218+ _ -> error "binary encoding of Union was corrupted"

219219

220220

221221instance Binary Alias where

@@ -229,7 +229,7 @@ instance Binary Alias where

229229 case n of

230230 0 -> liftM PublicAlias get

231231 1 -> liftM PrivateAlias get

232− _ -> fail "binary encoding of Alias was corrupted"

232+ _ -> error "binary encoding of Alias was corrupted"

233233

234234

235235instance Binary Binop where

@@ -251,4 +251,4 @@ instance Binary DependencyInterface where

251251 case n of

252252 0 -> liftM Public get

253253 1 -> liftM3 Private get get get

254− _ -> fail "binary encoding of DependencyInterface was corrupted"

254+ _ -> error "binary encoding of DependencyInterface was corrupted"

compiler/src/Elm/Kernel.hs+46−48

@@ -11,14 +11,14 @@ module Elm.Kernel

1111

1212import Control.Monad (liftM, liftM2)

1313import Data.Binary (Binary, get, put, getWord8, putWord8)

14−import qualified Data.ByteString.Internal as B

14+import qualified Data.ByteString as BS

15+import Data.Coerce (coerce)

1516import qualified Data.List as List

1617import qualified Data.Map as Map

1718import qualified Data.Name as Name

18−import Data.Word (Word8)

19−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

20−import Foreign.ForeignPtr (ForeignPtr)

21−import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

19+import qualified Data.Utf8 as Utf8

20+import Data.Word (Word8, Word16)

21+import Foreign.Ptr (Ptr, plusPtr)

2222

2323import qualified AST.Source as Src

2424import qualified Elm.ModuleName as ModuleName

@@ -36,7 +36,7 @@ import qualified Reporting.Annotation as A

3636

3737

3838data Chunk

39− = JS B.ByteString

39+ = JS (Utf8.VeryLong UNCHECKED)

4040 | ElmVar ModuleName.Canonical Name.Name

4141 | JsVar Name.Name Name.Name

4242 | ElmField Name.Name

@@ -46,6 +46,9 @@ data Chunk

4646 | Prod

4747

4848

49+data UNCHECKED

50+

51+

4952

5053-- COUNT FIELDS

5154

@@ -80,13 +83,13 @@ type Foreigns =

8083 Map.Map ModuleName.Raw Pkg.Name

8184

8285

83−fromByteString :: Pkg.Name -> Foreigns -> B.ByteString -> Maybe Content

86+fromByteString :: Pkg.Name -> Foreigns -> BS.ByteString -> Maybe Content

8487fromByteString pkg foreigns bytes =

85− case P.fromByteString (parser pkg foreigns) toError bytes of

86− Right content ->

88+ case P.fromByteString (parser pkg foreigns) bytes of

89+ P.Ok content _ ->

8790 Just content

8891

89− Left () ->

92+ P.Err () ->

9093 Nothing

9194

9295

@@ -117,21 +120,21 @@ ignoreError _ _ _ =

117120

118121parseChunks :: VarTable -> Enums -> Fields -> Parser () [Chunk]

119122parseChunks vtable enums fields =

120− P.Parser $ \(P.State src pos end indent row col) cok _ cerr _ ->

123+ P.Parser $ \(P.State pos end indent row col) cok _ cerr _ ->

121124 let

122125 (# chunks, newPos, newRow, newCol #) =

123− chompChunks vtable enums fields src pos end row col pos []

126+ chompChunks vtable enums fields pos end row col pos []

124127 in

125128 if newPos == end then

126− cok chunks (P.State src newPos end indent newRow newCol)

129+ cok chunks (P.State newPos end indent newRow newCol)

127130 else

128131 cerr row col toError

129132

130133

131−chompChunks :: VarTable -> Enums -> Fields -> ForeignPtr Word8 -> Ptr Word8 -> Ptr Word8 -> Row -> Col -> Ptr Word8 -> [Chunk] -> (# [Chunk], Ptr Word8, Row, Col #)

132−chompChunks vs es fs src pos end row col lastPos revChunks =

134+chompChunks :: VarTable -> Enums -> Fields -> Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> Ptr Word8 -> [Chunk] -> (# [Chunk], Ptr Word8, Word16, Word16 #)

135+chompChunks vs es fs pos end row col lastPos revChunks =

133136 if pos >= end then

134− let !js = toByteString src lastPos end in

137+ let !js = Utf8.fromPtr lastPos end in

135138 (# reverse (JS js : revChunks), pos, row, col #)

136139

137140 else

@@ -142,34 +145,24 @@ chompChunks vs es fs src pos end row col lastPos revChunks =

142145 !pos3 = plusPtr pos 3

143146 in

144147 if pos3 <= end && unsafeIndex pos1 == 0x5F {-_-} then

145− let !js = toByteString src lastPos pos in

146− chompTag vs es fs src pos3 end row (col + 3) (JS js : revChunks)

148+ let !js = Utf8.fromPtr lastPos pos in

149+ chompTag vs es fs pos3 end row (col + 3) (JS js : revChunks)

147150 else

148− chompChunks vs es fs src pos1 end row (col + 1) lastPos revChunks

151+ chompChunks vs es fs pos1 end row (col + 1) lastPos revChunks

149152

150153 else if word == 0x0A {-\n-} then

151− chompChunks vs es fs src (plusPtr pos 1) end (row + 1) 1 lastPos revChunks

154+ chompChunks vs es fs (plusPtr pos 1) end (row + 1) 1 lastPos revChunks

152155

153156 else

154157 let

155− !newPos = plusPtr pos (getCharWidth word)

158+ !newPos = plusPtr pos (getCharWidth pos end word)

156159 in

157− chompChunks vs es fs src newPos end row (col + 1) lastPos revChunks

158−

159−

160−toByteString :: ForeignPtr Word8 -> Ptr Word8 -> Ptr Word8 -> B.ByteString

161−toByteString src pos end =

162− let

163− !off = minusPtr pos (unsafeForeignPtrToPtr src)

164− !len = minusPtr end pos

165− in

166− B.PS src off len

167−

160+ chompChunks vs es fs newPos end row (col + 1) lastPos revChunks

168161

169162

170163-- relies on external checks in chompChunks

171−chompTag :: VarTable -> Enums -> Fields -> ForeignPtr Word8 -> Ptr Word8 -> Ptr Word8 -> Row -> Col -> [Chunk] -> (# [Chunk], Ptr Word8, Row, Col #)

172−chompTag vs es fs src pos end row col revChunks =

164+chompTag :: VarTable -> Enums -> Fields -> Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> [Chunk] -> (# [Chunk], Ptr Word8, Word16, Word16 #)

165+chompTag vs es fs pos end row col revChunks =

173166 let

174167 (# newPos, newCol #) = Var.chompInnerChars pos end col

175168 !tagPos = plusPtr pos (-1)

@@ -179,7 +172,7 @@ chompTag vs es fs src pos end row col revChunks =

179172 let

180173 !name = Name.fromPtr pos newPos

181174 in

182− chompChunks vs es fs src newPos end row newCol newPos $

175+ chompChunks vs es fs newPos end row newCol newPos $

183176 ElmField name : revChunks

184177 else

185178 let

@@ -190,7 +183,7 @@ chompTag vs es fs src pos end row col revChunks =

190183 (enum, newEnums) =

191184 lookupEnum (word - 0x30) name es

192185 in

193− chompChunks vs newEnums fs src newPos end row newCol newPos $

186+ chompChunks vs newEnums fs newPos end row newCol newPos $

194187 JsEnum enum : revChunks

195188

196189 else if 0x61 {-a-} <= word && word <= 0x7A {-z-} then

@@ -198,19 +191,19 @@ chompTag vs es fs src pos end row col revChunks =

198191 (field, newFields) =

199192 lookupField name fs

200193 in

201− chompChunks vs es newFields src newPos end row newCol newPos $

194+ chompChunks vs es newFields newPos end row newCol newPos $

202195 JsField field : revChunks

203196

204197 else if name == "DEBUG" then

205− chompChunks vs es fs src newPos end row newCol newPos (Debug : revChunks)

198+ chompChunks vs es fs newPos end row newCol newPos (Debug : revChunks)

206199

207200 else if name == "PROD" then

208− chompChunks vs es fs src newPos end row newCol newPos (Prod : revChunks)

201+ chompChunks vs es fs newPos end row newCol newPos (Prod : revChunks)

209202

210203 else

211204 case Map.lookup name vs of

212205 Just chunk ->

213− chompChunks vs es fs src newPos end row newCol newPos (chunk : revChunks)

206+ chompChunks vs es fs newPos end row newCol newPos (chunk : revChunks)

214207

215208 Nothing ->

216209 (# revChunks, pos, row, col #)

@@ -319,19 +312,19 @@ toNames exposing =

319312 map toName exposedList

320313

321314

322−toName :: Src.Exposed -> Name.Name

323−toName exposed =

315+toName :: A.Located Src.Exposed -> Name.Name

316+toName (A.At _ exposed) =

324317 case exposed of

325− Src.Lower (A.At _ name) ->

318+ Src.Lower name ->

326319 name

327320

328− Src.Upper (A.At _ name) Src.Private ->

321+ Src.Upper name Src.Private ->

329322 name

330323

331− Src.Upper _ (Src.Public _) ->

324+ Src.Upper _ Src.Public ->

332325 error "cannot have Maybe(..) syntax in kernel code header"

333326

334− Src.Operator _ _ ->

327+ Src.Operator _ ->

335328 error "cannot use binops in kernel code"

336329

337330

@@ -342,7 +335,7 @@ toName exposed =

342335instance Binary Chunk where

343336 put chunk =

344337 case chunk of

345− JS a -> putWord8 0 >> put a

338+ JS a -> putWord8 0 >> put (coerce a :: Utf8.String)

346339 ElmVar a b -> putWord8 1 >> put a >> put b

347340 JsVar a b -> putWord8 2 >> put a >> put b

348341 ElmField a -> putWord8 3 >> put a

@@ -354,7 +347,7 @@ instance Binary Chunk where

354347 get =

355348 do word <- getWord8

356349 case word of

357− 0 -> liftM JS get

350+ 0 -> liftM toJS get

358351 1 -> liftM2 ElmVar get get

359352 2 -> liftM2 JsVar get get

360353 3 -> liftM ElmField get

@@ -363,3 +356,8 @@ instance Binary Chunk where

363356 6 -> return Debug

364357 7 -> return Prod

365358 _ -> error "problem deserializing Elm.Kernel.Chunk"

359+

360+

361+toJS :: Utf8.String -> Chunk

362+toJS str =

363+ JS (coerce str)

compiler/src/Elm/Licenses.hs+65−48

@@ -9,12 +9,14 @@ module Elm.Licenses

99 where

1010

1111

12+import Control.Monad (liftM2)

13+import Data.Binary (Binary, get, put)

14+import Data.Map ((!))

1215import qualified Data.Map as Map

1316import qualified Data.Utf8 as Utf8

1417

1518import qualified Json.Decode as D

1619import qualified Json.Encode as E

17−import qualified Json.String as Json

1820import qualified Reporting.Suggest as Suggest

1921

2022

@@ -22,21 +24,25 @@ import qualified Reporting.Suggest as Suggest

2224-- LICENCES

2325

2426

25−newtype License =

26− License Json.String

27+data License =

28+ License

29+ { _name :: Utf8.String

30+ , _code :: Utf8.String

31+ }

32+ deriving (Eq, Ord)

2733

2834

2935bsd3 :: License

3036bsd3 =

31− License (Json.fromChars "BSD-3-Clause")

37+ osiApprovedSpdxLicenses ! "BSD-3-Clause"

3238

3339

3440encode :: License -> E.Value

35−encode (License code) =

41+encode (License _ code) =

3642 E.string code

3743

3844

39−decoder :: (Json.String -> [Json.String] -> e) -> D.Decoder e License

45+decoder :: (Utf8.String -> [Utf8.String] -> e) -> D.Decoder e License

4046decoder toError =

4147 do str <- D.string

4248 case check str of

@@ -51,93 +57,97 @@ decoder toError =

5157-- CHECK

5258

5359

54−check :: Json.String -> Either [Json.String] License

55−check givenCode =

56− if Map.member givenCode osiApprovedSpdxLicenses then

57− Right (License givenCode)

60+check :: Utf8.String -> Either [Utf8.String] License

61+check rawName =

62+ case Map.lookup rawName osiApprovedSpdxLicenses of

63+ Just license ->

64+ Right license

5865

59− else

60− let

61− pairs =

62− map (\code -> (code, Json.toChars code)) (Map.keys osiApprovedSpdxLicenses)

63− ++

64− Map.toList osiApprovedSpdxLicenses

65− in

66− Left $ map fst $ take 4 $

67− Suggest.sort (Utf8.toChars givenCode) snd pairs

66+ Nothing ->

67+ let

68+ toPairs (License name code) =

69+ [ (Utf8.toChars code, code), (Utf8.toChars name, code) ]

70+

71+ pairs =

72+ concatMap toPairs (Map.elems osiApprovedSpdxLicenses)

73+ in

74+ Left $ map snd $

75+ Suggest.sort (Utf8.toChars rawName) fst pairs

6876

6977

7078

7179-- LIST OF LICENCES

7280

7381

74−(==>) :: [Char] -> [Char] -> (Json.String, [Char])

75−(==>) code fullName =

76− ( Json.fromChars code, fullName )

82+(==>) :: Utf8.String -> Utf8.String -> (Utf8.String, License)

83+(==>) code name =

84+ ( code, License name code )

7785

7886

7987--

8088-- OSI approved licenses in SPDX format.

8189-- <https://spdx.org/licenses/>

8290--

83−osiApprovedSpdxLicenses :: Map.Map Json.String [Char]

91+osiApprovedSpdxLicenses :: Map.Map Utf8.String License

8492osiApprovedSpdxLicenses =

8593 Map.fromList

86− [ "0BSD" ==> "BSD Zero Clause License"

87− , "AAL" ==> "Attribution Assurance License"

88− , "AFL-1.1" ==> "Academic Free License v1.1"

94+ [ "AFL-1.1" ==> "Academic Free License v1.1"

8995 , "AFL-1.2" ==> "Academic Free License v1.2"

9096 , "AFL-2.0" ==> "Academic Free License v2.0"

9197 , "AFL-2.1" ==> "Academic Free License v2.1"

9298 , "AFL-3.0" ==> "Academic Free License v3.0"

93− , "AGPL-3.0" ==> "GNU Affero General Public License v3.0"

99+ , "APL-1.0" ==> "Adaptive Public License 1.0"

94100 , "Apache-1.1" ==> "Apache License 1.1"

95101 , "Apache-2.0" ==> "Apache License 2.0"

96− , "APL-1.0" ==> "Adaptive Public License 1.0"

97102 , "APSL-1.0" ==> "Apple Public Source License 1.0"

98103 , "APSL-1.1" ==> "Apple Public Source License 1.1"

99104 , "APSL-1.2" ==> "Apple Public Source License 1.2"

100105 , "APSL-2.0" ==> "Apple Public Source License 2.0"

101106 , "Artistic-1.0" ==> "Artistic License 1.0"

102− , "Artistic-1.0-cl8" ==> "Artistic License 1.0 w/clause 8"

103107 , "Artistic-1.0-Perl" ==> "Artistic License 1.0 (Perl)"

108+ , "Artistic-1.0-cl8" ==> "Artistic License 1.0 w/clause 8"

104109 , "Artistic-2.0" ==> "Artistic License 2.0"

110+ , "AAL" ==> "Attribution Assurance License"

111+ , "BSL-1.0" ==> "Boost Software License 1.0"

105112 , "BSD-2-Clause" ==> "BSD 2-clause \"Simplified\" License"

106113 , "BSD-3-Clause" ==> "BSD 3-clause \"New\" or \"Revised\" License"

107− , "BSL-1.0" ==> "Boost Software License 1.0"

108− , "CATOSL-1.1" ==> "Computer Associates Trusted Open Source License 1.1"

109− , "CDDL-1.0" ==> "Common Development and Distribution License 1.0"

114+ , "0BSD" ==> "BSD Zero Clause License"

110115 , "CECILL-2.1" ==> "CeCILL Free Software License Agreement v2.1"

111116 , "CNRI-Python" ==> "CNRI Python License"

117+ , "CDDL-1.0" ==> "Common Development and Distribution License 1.0"

112118 , "CPAL-1.0" ==> "Common Public Attribution License 1.0"

113119 , "CPL-1.0" ==> "Common Public License 1.0"

120+ , "CATOSL-1.1" ==> "Computer Associates Trusted Open Source License 1.1"

114121 , "CUA-OPL-1.0" ==> "CUA Office Public License v1.0"

122+ , "EPL-1.0" ==> "Eclipse Public License 1.0"

115123 , "ECL-1.0" ==> "Educational Community License v1.0"

116124 , "ECL-2.0" ==> "Educational Community License v2.0"

117125 , "EFL-1.0" ==> "Eiffel Forum License v1.0"

118126 , "EFL-2.0" ==> "Eiffel Forum License v2.0"

119127 , "Entessa" ==> "Entessa Public License v1.0"

120− , "EPL-1.0" ==> "Eclipse Public License 1.0"

121128 , "EUDatagrid" ==> "EU DataGrid Software License"

122129 , "EUPL-1.1" ==> "European Union Public License 1.1"

123130 , "Fair" ==> "Fair License"

124131 , "Frameworx-1.0" ==> "Frameworx Open License 1.0"

132+ , "AGPL-3.0" ==> "GNU Affero General Public License v3.0"

125133 , "GPL-2.0" ==> "GNU General Public License v2.0 only"

126134 , "GPL-3.0" ==> "GNU General Public License v3.0 only"

135+ , "LGPL-2.1" ==> "GNU Lesser General Public License v2.1 only"

136+ , "LGPL-3.0" ==> "GNU Lesser General Public License v3.0 only"

137+ , "LGPL-2.0" ==> "GNU Library General Public License v2 only"

127138 , "HPND" ==> "Historic Permission Notice and Disclaimer"

139+ , "IPL-1.0" ==> "IBM Public License v1.0"

128140 , "Intel" ==> "Intel Open Source License"

129141 , "IPA" ==> "IPA Font License"

130− , "IPL-1.0" ==> "IBM Public License v1.0"

131142 , "ISC" ==> "ISC License"

132− , "LGPL-2.0" ==> "GNU Library General Public License v2 only"

133− , "LGPL-2.1" ==> "GNU Lesser General Public License v2.1 only"

134− , "LGPL-3.0" ==> "GNU Lesser General Public License v3.0 only"

143+ , "LPPL-1.3c" ==> "LaTeX Project Public License v1.3c"

135144 , "LiLiQ-P-1.1" ==> "Licence Libre du Québec – Permissive version 1.1"

136− , "LiLiQ-R-1.1" ==> "Licence Libre du Québec – Réciprocité version 1.1"

137145 , "LiLiQ-Rplus-1.1" ==> "Licence Libre du Québec – Réciprocité forte version 1.1"

138− , "LPL-1.0" ==> "Lucent Public License Version 1.0"

146+ , "LiLiQ-R-1.1" ==> "Licence Libre du Québec – Réciprocité version 1.1"

139147 , "LPL-1.02" ==> "Lucent Public License v1.02"

140− , "LPPL-1.3c" ==> "LaTeX Project Public License v1.3c"

148+ , "LPL-1.0" ==> "Lucent Public License Version 1.0"

149+ , "MS-PL" ==> "Microsoft Public License"

150+ , "MS-RL" ==> "Microsoft Reciprocal License"

141151 , "MirOS" ==> "MirOS Licence"

142152 , "MIT" ==> "MIT License"

143153 , "Motosoto" ==> "Motosoto License"

@@ -145,41 +155,48 @@ osiApprovedSpdxLicenses =

145155 , "MPL-1.1" ==> "Mozilla Public License 1.1"

146156 , "MPL-2.0" ==> "Mozilla Public License 2.0"

147157 , "MPL-2.0-no-copyleft-exception" ==> "Mozilla Public License 2.0 (no copyleft exception)"

148− , "MS-PL" ==> "Microsoft Public License"

149− , "MS-RL" ==> "Microsoft Reciprocal License"

150158 , "Multics" ==> "Multics License"

151159 , "NASA-1.3" ==> "NASA Open Source Agreement 1.3"

152160 , "Naumen" ==> "Naumen Public License"

153− , "NCSA" ==> "University of Illinois/NCSA Open Source License"

154161 , "NGPL" ==> "Nethack General Public License"

155162 , "Nokia" ==> "Nokia Open Source License"

156163 , "NPOSL-3.0" ==> "Non-Profit Open Software License 3.0"

157164 , "NTP" ==> "NTP License"

158165 , "OCLC-2.0" ==> "OCLC Research Public License 2.0"

159− , "OFL-1.1" ==> "SIL Open Font License 1.1"

160166 , "OGTSL" ==> "Open Group Test Suite License"

161− , "OSET-PL-2.1" ==> "OSET Public License version 2.1"

162167 , "OSL-1.0" ==> "Open Software License 1.0"

163168 , "OSL-2.0" ==> "Open Software License 2.0"

164169 , "OSL-2.1" ==> "Open Software License 2.1"

165170 , "OSL-3.0" ==> "Open Software License 3.0"

171+ , "OSET-PL-2.1" ==> "OSET Public License version 2.1"

166172 , "PHP-3.0" ==> "PHP License v3.0"

167173 , "PostgreSQL" ==> "PostgreSQL License"

168174 , "Python-2.0" ==> "Python License 2.0"

169175 , "QPL-1.0" ==> "Q Public License 1.0"

176+ , "RPSL-1.0" ==> "RealNetworks Public Source License v1.0"

170177 , "RPL-1.1" ==> "Reciprocal Public License 1.1"

171178 , "RPL-1.5" ==> "Reciprocal Public License 1.5"

172− , "RPSL-1.0" ==> "RealNetworks Public Source License v1.0"

173179 , "RSCPL" ==> "Ricoh Source Code Public License"

180+ , "OFL-1.1" ==> "SIL Open Font License 1.1"

174181 , "SimPL-2.0" ==> "Simple Public License 2.0"

175− , "SISSL" ==> "Sun Industry Standards Source License v1.1"

176182 , "Sleepycat" ==> "Sleepycat License"

183+ , "SISSL" ==> "Sun Industry Standards Source License v1.1"

177184 , "SPL-1.0" ==> "Sun Public License v1.0"

185+ , "Watcom-1.0" ==> "Sybase Open Watcom Public License 1.0"

178186 , "UPL-1.0" ==> "Universal Permissive License v1.0"

187+ , "NCSA" ==> "University of Illinois/NCSA Open Source License"

179188 , "VSL-1.0" ==> "Vovida Software License v1.0"

180189 , "W3C" ==> "W3C Software Notice and License (2002-12-31)"

181− , "Watcom-1.0" ==> "Sybase Open Watcom Public License 1.0"

182190 , "Xnet" ==> "X.Net License"

183191 , "Zlib" ==> "zlib License"

184192 , "ZPL-2.0" ==> "Zope Public License 2.0"

185193 ]

194+

195+

196+

197+-- BINARY

198+

199+

200+instance Binary License where

201+ get = liftM2 License get get

202+ put (License a b) = put a >> put b

compiler/src/Elm/ModuleName.hs+39−65

@@ -1,19 +1,18 @@

1−{-# LANGUAGE BangPatterns, OverloadedStrings, UnboxedTuples #-}

1+{-# LANGUAGE OverloadedStrings #-}

22module Elm.ModuleName

33 ( Raw

44 , toChars

5+ , toString

56 , toFilePath

67 , toHyphenPath

7− --

8+ , fromHyphenPath

89 , encode

910 , decoder

10− , parser

11− --

1211 , Canonical(..)

1312 , basics, char, string

1413 , maybe, result, list, array, dict, tuple

1514 , platform, cmd, sub

16− , debug

15+ , debug, bitwise

1716 , virtualDom

1817 , jsonDecode, jsonEncode

1918 , webgl, texture, vector2, vector3, vector4, matrix4

@@ -23,19 +22,15 @@ module Elm.ModuleName

2322

2423import Control.Monad (liftM2)

2524import Data.Binary (Binary(..))

25+import qualified Data.Char as Char

2626import qualified Data.Name as Name

2727import qualified Data.Utf8 as Utf8

28−import Data.Word (Word8)

29−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

3028import Prelude hiding (maybe)

3129import qualified System.FilePath as FP

3230

3331import qualified Elm.Package as Pkg

34−import qualified Json.Decode as D

35−import qualified Json.Encode as E

36−import qualified Parse.Variable as Var

37−import qualified Parse.Primitives as P

38−import Parse.Primitives (Row, Col)

32+import qualified Json.Decode as Decode

33+import qualified Json.Encode as Encode

3934

4035

4136

@@ -50,6 +45,11 @@ toChars =

5045 Name.toChars

5146

5247

48+toString :: Raw -> Utf8.String

49+toString =

50+ Name.toUtf8

51+

52+

5353toFilePath :: Raw -> FilePath

5454toFilePath name =

5555 map (\c -> if c == '.' then FP.pathSeparator else c) (Name.toChars name)

@@ -60,68 +60,38 @@ toHyphenPath name =

6060 map (\c -> if c == '.' then '-' else c) (Name.toChars name)

6161

6262

63+fromHyphenPath :: Utf8.String -> Maybe Raw

64+fromHyphenPath str =

65+ let

66+ chunks =

67+ Utf8.split 0x2D {- - -} str

68+ in

69+ if all isGoodChunk chunks

70+ then Just (Name.fromUtf8 (Utf8.join 0x2E {- . -} chunks))

71+ else Nothing

72+

73+

6374

6475-- JSON

6576

6677

67−encode :: Raw -> E.Value

78+encode :: Raw -> Encode.Value

6879encode =

69− E.name

80+ Encode.name

7081

7182

72−decoder :: D.Decoder (Row, Col) Raw

83+decoder :: Decode.Decoder Utf8.String Raw

7384decoder =

74− D.customString parser (,)

75−

76−

77−

78−-- PARSER

85+ do str <- Decode.string

86+ if all isGoodChunk (Utf8.split 0x2E {- . -} str)

87+ then return (Name.fromUtf8 str)

88+ else Decode.failure str

7989

8090

81−parser :: P.Parser (Row, Col) Raw

82−parser =

83− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

84− let

85− (# isGood, newPos, newCol #) = chompStart pos end col

86− in

87− if isGood && minusPtr newPos pos < 256 then

88− let !newState = P.State src newPos end indent row newCol in

89− cok (Utf8.fromPtr pos newPos) newState

90−

91− else if col == newCol then

92− eerr row newCol (,)

93−

94− else

95− cerr row newCol (,)

96−

97−

98−chompStart :: Ptr Word8 -> Ptr Word8 -> Col -> (# Bool, Ptr Word8, Col #)

99−chompStart pos end col =

100− let

101− !width = Var.getUpperWidth pos end

102− in

103− if width == 0 then

104− (# False, pos, col #)

105− else

106− chompInner (plusPtr pos width) end (col + 1)

107−

108−

109−chompInner :: Ptr Word8 -> Ptr Word8 -> Col -> (# Bool, Ptr Word8, Col #)

110−chompInner pos end col =

111− if pos >= end then

112− (# True, pos, col #)

113− else

114− let

115− !word = P.unsafeIndex pos

116− !width = Var.getInnerWidthHelp pos end word

117− in

118− if width == 0 then

119− if word == 0x2E {-.-} then

120− chompStart (plusPtr pos 1) end (col + 1)

121− else

122− (# True, pos, col #)

123− else

124− chompInner (plusPtr pos width) end (col + 1)

91+isGoodChunk :: Utf8.String -> Bool

92+isGoodChunk chunk =

93+ Utf8.startsWithChar Char.isUpper chunk

94+ && Utf8.all (\c -> Char.isAlphaNum c || c == '_') chunk

12595

12696

12797

@@ -135,7 +105,6 @@ data Canonical =

135105 }

136106

137107

138−

139108-- INSTANCES

140109

141110

@@ -226,6 +195,11 @@ debug :: Canonical

226195debug = Canonical Pkg.core Name.debug

227196

228197

198+{-# NOINLINE bitwise #-}

199+bitwise :: Canonical

200+bitwise = Canonical Pkg.core Name.bitwise

201+

202+

229203

230204-- HTML

231205

compiler/src/Elm/Package.hs+93−203

@@ -1,52 +1,38 @@

11{-# OPTIONS_GHC -Wall #-}

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

2+{-# LANGUAGE OverloadedStrings #-}

33module Elm.Package

44 ( Name(..)

5− , Author

6− , Project

75 , Canonical(..)

86 , isKernel

7+ , toString

98 , toChars

109 , toUrl

1110 , toFilePath

12− , toJsonString

13− --

11+ , BadName(..)

12+ , fromString

1413 , dummyName, kernel, core

1514 , browser, virtualDom, html

1615 , json, http, url

1716 , webgl, linearAlgebra

18− --

1917 , suggestions

20− , nearbyNames

21− --

2218 , decoder

2319 , encode

24− , keyDecoder

25− --

26− , parser

2720 )

2821 where

2922

3023

3124import Control.Monad (liftM2)

3225import Data.Binary (Binary, get, put)

33−import qualified Data.Coerce as Coerce

34−import qualified Data.List as List

35−import qualified Data.Map as Map

26+import qualified Data.Char as Char

3627import qualified Data.Name as Name

28+import qualified Data.Map as Map

3729import Data.Monoid ((<>))

3830import qualified Data.Utf8 as Utf8

39−import Data.Word (Word8)

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

4131import System.FilePath ((</>))

4232

4333import qualified Elm.Version as V

44−import qualified Json.Decode as D

45−import qualified Json.Encode as E

46−import qualified Json.String as Json

47−import qualified Parse.Primitives as P

48−import Parse.Primitives (Row, Col)

49−import qualified Reporting.Suggest as Suggest

34+import qualified Json.Decode as Decode

35+import qualified Json.Encode as Encode

5036

5137

5238

@@ -55,17 +41,9 @@ import qualified Reporting.Suggest as Suggest

5541

5642data Name =

5743 Name

58− { _author :: !Author

59− , _project :: !Project

44+ { _author :: !Name.Name

45+ , _project :: !Name.Name

6046 }

61− deriving (Ord)

62−

63−

64−type Author = Utf8.Utf8 AUTHOR

65−type Project = Utf8.Utf8 PROJECT

66−

67−data AUTHOR

68−data PROJECT

6947

7048

7149data Canonical =

@@ -82,114 +60,127 @@ data Canonical =

8260

8361isKernel :: Name -> Bool

8462isKernel (Name author _) =

85− author == elm || author == elm_explorations

63+ author == "elm" || author == "elm-explorations"

64+

65+

66+toString :: Name -> Utf8.String

67+toString (Name author project) =

68+ Utf8.join 0x2F [ Name.toUtf8 author, Name.toUtf8 project ]

8669

8770

8871toChars :: Name -> String

8972toChars (Name author project) =

90− Utf8.toChars author <> "/" <> Utf8.toChars project

73+ Name.toChars author <> "/" <> Name.toChars project

9174

9275

9376toUrl :: Name -> String

9477toUrl (Name author project) =

95− Utf8.toChars author ++ "/" ++ Utf8.toChars project

78+ Name.toChars author ++ "/" ++ Name.toChars project

9679

9780

9881toFilePath :: Name -> FilePath

9982toFilePath (Name author project) =

100− Utf8.toChars author </> Utf8.toChars project

83+ Name.toChars author </> Name.toChars project

10184

10285

103−toJsonString :: Name -> Json.String

104−toJsonString (Name author project) =

105− Utf8.join 0x2F {-/-} [ Coerce.coerce author, Coerce.coerce project ]

86+fromString :: Utf8.String -> Either BadName Name

87+fromString str =

88+ case Utf8.split 0x2F {- / -} str of

89+ [author, project]

90+ | Utf8.isEmpty author -> Left BadStructure

91+ | Utf8.isEmpty project -> Left BadStructure

92+ | Utf8.size project >= 256 -> Left TooLong

93+ | Utf8.containsDouble 0x2D {- - -} project -> Left HasDoubleDash

94+ | Utf8.contains 0x5F {- _ -} project -> Left HasUnderscore

95+ | Utf8.contains 0x2E {- . -} project -> Left HasDot

96+ | Utf8.any Char.isUpper project -> Left HasUppercase

97+ | Utf8.endsWithWord 0x2D {- - -} project -> Left HasDashEnd

98+ | Utf8.startsWithChar Char.isLower project -> Right (Name (Name.fromUtf8 author) (Name.fromUtf8 project))

99+ | True -> Left HasNonLowercaseStart

106100

101+ _ ->

102+ Left BadStructure

107103

108104

109−-- COMMON PACKAGE NAMES

105+data BadName

106+ = BadStructure

107+ | TooLong

108+ | HasDoubleDash

109+ | HasUnderscore

110+ | HasDot

111+ | HasUppercase

112+ | HasDashEnd

113+ | HasNonLowercaseStart

110114

111115

112−toName :: Author -> [Char] -> Name

113−toName author project =

114− Name author (Utf8.fromChars project)

116+

117+-- COMMON PACKAGE NAMES

115118

116119

117120{-# NOINLINE dummyName #-}

118121dummyName :: Name

119122dummyName =

120− toName (Utf8.fromChars "author") "project"

123+ Name "author" "project"

121124

122125

123126{-# NOINLINE kernel #-}

124127kernel :: Name

125128kernel =

126− toName elm "kernel"

129+ Name "elm" "kernel"

127130

128131

129132{-# NOINLINE core #-}

130133core :: Name

131134core =

132− toName elm "core"

135+ Name "elm" "core"

133136

134137

135138{-# NOINLINE browser #-}

136139browser :: Name

137140browser =

138− toName elm "browser"

141+ Name "elm" "browser"

139142

140143

141144{-# NOINLINE virtualDom #-}

142145virtualDom :: Name

143146virtualDom =

144− toName elm "virtual-dom"

147+ Name "elm" "virtual-dom"

145148

146149

147150{-# NOINLINE html #-}

148151html :: Name

149152html =

150− toName elm "html"

153+ Name "elm" "html"

151154

152155

153156{-# NOINLINE json #-}

154157json :: Name

155158json =

156− toName elm "json"

159+ Name "elm" "json"

157160

158161

159162{-# NOINLINE http #-}

160163http :: Name

161164http =

162− toName elm "http"

165+ Name "elm" "http"

163166

164167

165168{-# NOINLINE url #-}

166169url :: Name

167170url =

168− toName elm "url"

171+ Name "elm" "url"

169172

170173

171174{-# NOINLINE webgl #-}

172175webgl :: Name

173176webgl =

174− toName elm_explorations "webgl"

177+ Name "elm-explorations" "webgl"

175178

176179

177180{-# NOINLINE linearAlgebra #-}

178181linearAlgebra :: Name

179182linearAlgebra =

180− toName elm_explorations "linear-algebra"

181−

182−

183−{-# NOINLINE elm #-}

184−elm :: Author

185−elm =

186− Utf8.fromChars "elm"

187−

188−

189−{-# NOINLINE elm_explorations #-}

190−elm_explorations :: Author

191−elm_explorations =

192− Utf8.fromChars "elm-explorations"

183+ Name "elm-explorations" "linear-algebra"

193184

194185

195186

@@ -199,61 +190,28 @@ elm_explorations =

199190suggestions :: Map.Map Name.Name Name

200191suggestions =

201192 let

202− random = toName elm "random"

203− time = toName elm "time"

204− file = toName elm "file"

193+ random = Name "elm" "random"

194+ time = Name "elm" "time"

195+ file = Name "elm" "file"

205196 in

206197 Map.fromList

207− [ "Browser" ==> browser

208− , "File" ==> file

209− , "File.Download" ==> file

210− , "File.Select" ==> file

211− , "Html" ==> html

212− , "Html.Attributes" ==> html

213− , "Html.Events" ==> html

214− , "Http" ==> http

215− , "Json.Decode" ==> json

216− , "Json.Encode" ==> json

217− , "Random" ==> random

218− , "Time" ==> time

219− , "Url.Parser" ==> url

220− , "Url" ==> url

198+ [ ("Browser", browser)

199+ , ("File", file)

200+ , ("File.Download", file)

201+ , ("File.Select", file)

202+ , ("Html", html)

203+ , ("Html.Attributes", html)

204+ , ("Html.Events", html)

205+ , ("Http", http)

206+ , ("Json.Decode", json)

207+ , ("Json.Encode", json)

208+ , ("Random", random)

209+ , ("Time", time)

210+ , ("Url.Parser", url)

211+ , ("Url", url)

221212 ]

222213

223214

224−(==>) :: [Char] -> Name -> (Name.Name, Name)

225−(==>) moduleName package =

226− ( Utf8.fromChars moduleName, package )

227−

228−

229−

230−-- NEARBY NAMES

231−

232−

233−nearbyNames :: Name -> [Name] -> [Name]

234−nearbyNames (Name author1 project1) possibleNames =

235− let

236− authorDist = authorDistance (Utf8.toChars author1)

237− projectDist = projectDistance (Utf8.toChars project1)

238−

239− nameDistance (Name author2 project2) =

240− authorDist author2 + projectDist project2

241− in

242− take 4 $ List.sortOn nameDistance possibleNames

243−

244−

245−authorDistance :: [Char] -> Author -> Int

246−authorDistance given possibility =

247− if possibility == elm || possibility == elm_explorations

248− then 0

249− else abs (Suggest.distance given (Utf8.toChars possibility))

250−

251−

252−projectDistance :: [Char] -> Project -> Int

253−projectDistance given possibility =

254− abs (Suggest.distance given (Utf8.toChars possibility))

255−

256−

257215

258216-- INSTANCES

259217

@@ -268,13 +226,17 @@ instance Eq Canonical where

268226 version1 == version2 && package1 == package2

269227

270228

229+instance Ord Name where

230+ compare (Name author1 project1) (Name author2 project2) =

231+ case compare project1 project2 of

232+ LT -> LT

233+ EQ -> compare author1 author2

234+ GT -> GT

271235

272−-- BINARY

273236

274−

275−instance Binary Name where -- PERF try storing as a Word16

276− get = liftM2 Name Utf8.getUnder256 Utf8.getUnder256

277− put (Name a b) = Utf8.putUnder256 a >> Utf8.putUnder256 b

237+instance Binary Name where

238+ get = liftM2 Name get get

239+ put (Name a b) = put a >> put b

278240

279241

280242instance Binary Canonical where

@@ -286,89 +248,17 @@ instance Binary Canonical where

286248-- JSON

287249

288250

289−decoder :: D.Decoder (Row, Col) Name

251+decoder :: Decode.Decoder BadName Name

290252decoder =

291− D.customString parser (,)

292−

253+ do str <- Decode.string

254+ case fromString str of

255+ Right name ->

256+ return name

293257

294−encode :: Name -> E.Value

295−encode name =

296− E.chars (toChars name)

258+ Left err ->

259+ Decode.failure err

297260

298261

299−keyDecoder :: (Row -> Col -> x) -> D.KeyDecoder x Name

300−keyDecoder toError =

301− let

302− keyParser =

303− P.specialize (\(r,c) _ _ -> toError r c) parser

304− in

305− D.KeyDecoder keyParser toError

306−

307−

308−

309−-- PARSER

310−

311−

312−parser :: P.Parser (Row, Col) Name

313−parser =

314− do author <- parseName isAlphaOrDigit isAlphaOrDigit

315− P.word1 0x2F {-/-} (,)

316− project <- parseName isLower isLowerOrDigit

317− return (Name author project)

318−

319−

320−parseName :: (Word8 -> Bool) -> (Word8 -> Bool) -> P.Parser (Row, Col) (Utf8.Utf8 t)

321−parseName isGoodStart isGoodInner =

322− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

323− if pos >= end then

324− eerr row col (,)

325− else

326− let !word = P.unsafeIndex pos in

327− if not (isGoodStart word) then

328− eerr row col (,)

329− else

330− let

331− (# isGood, newPos #) = chompName isGoodInner (plusPtr pos 1) end False

332− !len = fromIntegral (minusPtr newPos pos)

333− !newCol = col + len

334− in

335− if isGood && len < 256 then

336− let !newState = P.State src newPos end indent row newCol in

337− cok (Utf8.fromPtr pos newPos) newState

338− else

339− cerr row newCol (,)

340−

341−

342−isLower :: Word8 -> Bool

343−isLower word =

344− 0x61 {-a-} <= word && word <= 0x7A {-z-}

345−

346−

347−isLowerOrDigit :: Word8 -> Bool

348−isLowerOrDigit word =

349− 0x61 {-a-} <= word && word <= 0x7A {-z-}

350− || 0x30 {-0-} <= word && word <= 0x39 {-9-}

351−

352−

353−isAlphaOrDigit :: Word8 -> Bool

354−isAlphaOrDigit word =

355− 0x61 {-a-} <= word && word <= 0x7A {-z-}

356− || 0x41 {-A-} <= word && word <= 0x5A {-Z-}

357− || 0x30 {-0-} <= word && word <= 0x39 {-9-}

358−

359−

360−chompName :: (Word8 -> Bool) -> Ptr Word8 -> Ptr Word8 -> Bool -> (# Bool, Ptr Word8 #)

361−chompName isGoodChar pos end prevWasDash =

362− if pos >= end then

363− (# not prevWasDash, pos #)

364− else

365− let !word = P.unsafeIndex pos in

366− if isGoodChar word then

367− chompName isGoodChar (plusPtr pos 1) end False

368− else if word == 0x2D {---} then

369− if prevWasDash then

370− (# False, pos #)

371− else

372− chompName isGoodChar (plusPtr pos 1) end True

373− else

374− (# True, pos #)

262+encode :: Name -> Encode.Value

263+encode name =

264+ Encode.string (toString name)

compiler/src/Elm/String.hsdeleted−133

@@ -1,133 +0,0 @@

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

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

3−module Elm.String

4− ( String

5− , toChars

6− , toBuilder

7− , Chunk(..)

8− , fromChunks

9− )

10− where

11−

12−

13−import Prelude hiding (String)

14−import Data.Binary (Binary, get, put)

15−import Data.Bits ((.&.), shiftR)

16−import qualified Data.ByteString.Builder as B

17−import qualified Data.Utf8 as Utf8

18−import Data.Utf8 (MBA, newByteArray, copyFromPtr, freeze, writeWord8)

19−import GHC.Exts (RealWorld, Ptr)

20−import GHC.IO (stToIO, unsafeDupablePerformIO)

21−import GHC.ST (ST)

22−import GHC.Word (Word8)

23−

24−

25−

26−-- STRINGS

27−

28−

29−type String =

30− Utf8.Utf8 ELM_STRING

31−

32−

33−data ELM_STRING

34−

35−

36−

37−-- HELPERS

38−

39−

40−toChars :: String -> [Char]

41−toChars =

42− Utf8.toChars

43−

44−

45−{-# INLINE toBuilder #-}

46−toBuilder :: String -> B.Builder

47−toBuilder =

48− Utf8.toBuilder

49−

50−

51−

52−-- FROM CHUNKS

53−

54−

55−data Chunk

56− = Slice (Ptr Word8) Int

57− | Escape Word8

58− | CodePoint Int

59−

60−

61−fromChunks :: [Chunk] -> String

62−fromChunks chunks =

63− unsafeDupablePerformIO (stToIO (

64− do let !len = sum (map chunkToWidth chunks)

65− mba <- newByteArray len

66− writeChunks mba 0 chunks

67− freeze mba

68− ))

69−

70−

71−chunkToWidth :: Chunk -> Int

72−chunkToWidth chunk =

73− case chunk of

74− Slice _ len -> len

75− Escape _ -> 2

76− CodePoint c -> if c < 0xFFFF then 6 else 12

77−

78−

79−writeChunks :: MBA RealWorld -> Int -> [Chunk] -> ST RealWorld ()

80−writeChunks mba offset chunks =

81− case chunks of

82− [] ->

83− return ()

84−

85− chunk : chunks ->

86− case chunk of

87− Slice ptr len ->

88− do copyFromPtr ptr mba offset len

89− let !newOffset = offset + len

90− writeChunks mba newOffset chunks

91−

92− Escape word ->

93− do writeWord8 mba offset 0x5C {- \ -}

94− writeWord8 mba (offset + 1) word

95− let !newOffset = offset + 2

96− writeChunks mba newOffset chunks

97−

98− CodePoint code ->

99− if code < 0xFFFF then

100− do writeCode mba offset code

101− let !newOffset = offset + 6

102− writeChunks mba newOffset chunks

103− else

104− do let (hi,lo) = divMod (code - 0x10000) 0x400

105− writeCode mba (offset ) (hi + 0xD800)

106− writeCode mba (offset + 6) (lo + 0xDC00)

107− let !newOffset = offset + 12

108− writeChunks mba newOffset chunks

109−

110−

111−writeCode :: MBA RealWorld -> Int -> Int -> ST RealWorld ()

112−writeCode mba offset code =

113− do writeWord8 mba offset 0x5C {- \ -}

114− writeWord8 mba (offset + 1) 0x75 {- u -}

115− writeHex mba (offset + 2) (shiftR code 12)

116− writeHex mba (offset + 3) (shiftR code 8)

117− writeHex mba (offset + 4) (shiftR code 4)

118− writeHex mba (offset + 5) code

119−

120−

121−writeHex :: MBA RealWorld -> Int -> Int -> ST RealWorld ()

122−writeHex mba !offset !bits =

123− do let !n = fromIntegral bits .&. 0x0F

124− writeWord8 mba offset (if n < 10 then 0x30 + n else 0x37 + n)

125−

126−

127−

128−-- BINARY

129−

130−

131−instance Binary (Utf8.Utf8 ELM_STRING) where

132− get = Utf8.getVeryLong

133− put = Utf8.putVeryLong

compiler/src/Elm/Version.hs+43−73

@@ -1,5 +1,3 @@

1−{-# OPTIONS_GHC -Wall #-}

2−{-# LANGUAGE BangPatterns, UnboxedTuples #-}

31module Elm.Version

42 ( Version(..)

53 , one

@@ -9,11 +7,10 @@ module Elm.Version

97 , bumpMinor

108 , bumpMajor

119 , toChars

12− --

10+ , toString

11+ , fromString

1312 , decoder

1413 , encode

15− --

16− , parser

1714 )

1815 where

1916

@@ -21,15 +18,13 @@ module Elm.Version

2118import Prelude hiding (max)

2219import Control.Monad (liftM3)

2320import Data.Binary (Binary, get, put, getWord8, putWord8)

21+import qualified Data.Utf8 as Utf8

2422import qualified Data.Version as Version

25−import Data.Word (Word8, Word16)

26−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

23+import Data.Word (Word16)

2724import qualified Paths_elm

2825

2926import qualified Json.Decode as D

3027import qualified Json.Encode as E

31−import qualified Parse.Primitives as P

32−import Parse.Primitives (Row, Col)

3328

3429

3530

@@ -91,26 +86,58 @@ bumpMajor (Version major _minor _patch) =

9186

9287

9388

94−-- TO CHARS

89+-- TO STRING

9590

9691

97−toChars :: Version -> [Char]

98−toChars (Version major minor patch) =

99− show major ++ '.' : show minor ++ '.' : show patch

92+toChars :: Version -> String

93+toChars vsn =

94+ Utf8.toChars (toString vsn)

95+

96+

97+toString :: Version -> Utf8.String

98+toString (Version major minor patch) =

99+ Utf8.join 0x2E {- . -}

100+ [ Utf8.fromWord16 major

101+ , Utf8.fromWord16 minor

102+ , Utf8.fromWord16 patch

103+ ]

104+

105+

106+

107+-- FROM STRING

108+

109+

110+fromString :: Utf8.String -> Maybe Version

111+fromString str =

112+ case Utf8.split 0x2E {- . -} str of

113+ [major, minor, patch] ->

114+ Version

115+ <$> Utf8.toWord16 major

116+ <*> Utf8.toWord16 minor

117+ <*> Utf8.toWord16 patch

118+

119+ _ ->

120+ Nothing

100121

101122

102123

103124-- JSON

104125

105126

106−decoder :: D.Decoder (Row, Col) Version

127+decoder :: D.Decoder Utf8.String Version

107128decoder =

108− D.customString parser (,)

129+ do str <- D.string

130+ case fromString str of

131+ Just version ->

132+ return version

133+

134+ Nothing ->

135+ D.failure str

109136

110137

111138encode :: Version -> E.Value

112139encode version =

113− E.chars (toChars version)

140+ E.string (toString version)

114141

115142

116143

@@ -137,60 +164,3 @@ instance Binary Version where

137164 put major

138165 put minor

139166 put patch

140−

141−

142−

143−-- PARSER

144−

145−

146−parser :: P.Parser (Row, Col) Version

147−parser =

148− do major <- numberParser

149− P.word1 0x2E {-.-} (,)

150− minor <- numberParser

151− P.word1 0x2E {-.-} (,)

152− patch <- numberParser

153− return (Version major minor patch)

154−

155−

156−numberParser :: P.Parser (Row, Col) Word16

157−numberParser =

158− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

159− if pos >= end then

160− eerr row col (,)

161− else

162− let !word = P.unsafeIndex pos in

163− if word == 0x30 {-0-} then

164−

165− let

166− !newState = P.State src (plusPtr pos 1) end indent row (col + 1)

167− in

168− cok 0 newState

169−

170− else if isDigit word then

171−

172− let

173− (# total, newPos #) = chompWord16 (plusPtr pos 1) end (fromIntegral (word - 0x30))

174− !newState = P.State src newPos end indent row (col + fromIntegral (minusPtr newPos pos))

175− in

176− cok total newState

177−

178− else

179− eerr row col (,)

180−

181−

182−chompWord16 :: Ptr Word8 -> Ptr Word8 -> Word16 -> (# Word16, Ptr Word8 #)

183−chompWord16 pos end total =

184− if pos >= end then

185− (# total, pos #)

186− else

187− let !word = P.unsafeIndex pos in

188− if isDigit word then

189− chompWord16 (plusPtr pos 1) end (10 * total + fromIntegral (word - 0x30))

190− else

191− (# total, pos #)

192−

193−

194−isDigit :: Word8 -> Bool

195−isDigit word =

196− 0x30 {-0-} <= word && word <= 0x39 {-9-}

compiler/src/Generate/Html.hs+10−11

@@ -29,23 +29,22 @@ sandwich moduleName javascript =

2929

3030<body>

3131

32−<pre id="elm"></pre>

32+<pre id="elm">

33+This is a headless program, meaning there is nothing to show here.

34+

35+I started the program anyway though!

36+

37+You can access it as `app` in the developer console.

38+</pre>

3339

3440<script>

35−try {

3641|] <> javascript <> [r|

3742

43+try {

3844 var app = Elm.|] <> name <> [r|.init({ node: document.getElementById("elm") });

39−}

40−catch (e)

41−{

45+} catch (e) {

4246 // display initialization errors (e.g. bad flags, infinite recursion)

43− var header = document.createElement("h1");

44− header.style.fontFamily = "monospace";

45− header.innerText = "Initialization Error";

46− var pre = document.getElementById("elm");

47− document.body.insertBefore(header, pre);

48− pre.innerText = e;

47+ document.getElementById("elm").innerText = e;

4948 throw e;

5049}

5150</script>

compiler/src/Generate/JavaScript.hs+55−76

@@ -2,7 +2,6 @@

22module Generate.JavaScript

33 ( generate

44 , generateForRepl

5− , generateForReplEndpoint

65 )

76 where

87

@@ -86,9 +85,7 @@ generateForRepl ansi localizer (Opt.GlobalGraph graph _) home name (Can.Forall _

8685 debugState = addGlobal mode graph emptyState (Opt.Global ModuleName.debug "toString")

8786 evalState = addGlobal mode graph debugState (Opt.Global home name)

8887 in

89− "process.on('uncaughtException', function(err) { process.stderr.write(err.toString() + '\\n'); process.exit(1); });"

90− <> Functions.functions

91− <> stateToBuilder evalState

88+ stateToBuilder evalState

9289 <> print ansi localizer home name tipe

9390

9491

@@ -100,47 +97,14 @@ print ansi localizer home name tipe =

10097 tipeDoc = RT.canToDoc localizer RT.None tipe

10198 bool = if ansi then "true" else "false"

10299 in

103− "var _value = " <> toString <> "(" <> bool <> ", " <> value <> ");\n\

104− \var _type = " <> B.stringUtf8 (show (D.toString tipeDoc)) <> ";\n\

105− \function _print(t) { console.log(_value + (" <> bool <> " ? '\x1b[90m' + t + '\x1b[0m' : t)); }\n\

106− \if (_value.length + 3 + _type.length >= 80 || _type.indexOf('\\n') >= 0) {\n\

107− \ _print('\\n : ' + _type.split('\\n').join('\\n '));\n\

108− \} else {\n\

109− \ _print(' : ' + _type);\n\

110− \}\n"

111−

112−

113−

114−-- GENERATE FOR REPL ENDPOINT

115−

116−

117−generateForReplEndpoint :: L.Localizer -> Opt.GlobalGraph -> ModuleName.Canonical -> Maybe Name.Name -> Can.Annotation -> B.Builder

118−generateForReplEndpoint localizer (Opt.GlobalGraph graph _) home maybeName (Can.Forall _ tipe) =

119− let

120− name = maybe Name.replValueToPrint id maybeName

121− mode = Mode.Dev Nothing

122− debugState = addGlobal mode graph emptyState (Opt.Global ModuleName.debug "toString")

123− evalState = addGlobal mode graph debugState (Opt.Global home name)

124− in

125− Functions.functions

126− <> stateToBuilder evalState

127− <> postMessage localizer home maybeName tipe

128−

129−

130−postMessage :: L.Localizer -> ModuleName.Canonical -> Maybe Name.Name -> Can.Type -> B.Builder

131−postMessage localizer home maybeName tipe =

132− let

133− name = maybe Name.replValueToPrint id maybeName

134− value = JsName.toBuilder (JsName.fromGlobal home name)

135− toString = JsName.toBuilder (JsName.fromKernel Name.debug "toAnsiString")

136− tipeDoc = RT.canToDoc localizer RT.None tipe

137− toName n = "\"" <> Name.toBuilder n <> "\""

138− in

139− "self.postMessage({\n\

140− \ name: " <> maybe "null" toName maybeName <> ",\n\

141− \ value: " <> toString <> "(true, " <> value <> "),\n\

142− \ type: " <> B.stringUtf8 (show (D.toString tipeDoc)) <> "\n\

143− \});\n"

100+ "var _value = " <> toString <> "(" <> bool <> ", " <> value <> ");\n\

101+ \var _type = " <> B.stringUtf8 (show (D.toString tipeDoc)) <> ";\n\

102+ \function _print(t) { console.log(_value + (" <> bool <> " ? '\x1b[90m' + t + '\x1b[0m' : t)); }\n\

103+ \if (_value.length + 3 + _type.length >= 80 || _type.indexOf('\\n') >= 0) {\n\

104+ \ _print('\\n : ' + _type.split('\\n').join('\\n '));\n\

105+ \} else {\n\

106+ \ _print(' : ' + _type);\n\

107+ \}\n"

144108

145109

146110

@@ -261,7 +225,7 @@ addKernel (State revKernels revBuilders seen) kernel =

261225

262226var :: Opt.Global -> Expr.Code -> JS.Stmt

263227var (Opt.Global home name) code =

264− JS.Var (JsName.fromGlobal home name) (Expr.codeToExpr code)

228+ JS.Var [ (JsName.fromGlobal home name, Just (Expr.codeToExpr code)) ]

265229

266230

267231isDebugger :: Opt.Global -> Bool

@@ -292,7 +256,7 @@ generateCycle mode (Opt.Global home _) names values functions =

292256 "Some top-level definitions from `" <> Name.toBuilder (ModuleName._module home) <> "` are causing infinite recursion:\\n"

293257 <> drawCycle names

294258 <> "\\n\\nThese errors are very tricky, so read "

295− <> B.stringUtf8 (D.makeNakedLink "bad-recursion")

259+ <> B.stringUtf8 (D.makeNakedLink "halting-problem")

296260 <> " to learn how to fix it!"

297261 ]

298262

@@ -301,10 +265,10 @@ generateCycleFunc :: Mode.Mode -> ModuleName.Canonical -> Opt.Def -> JS.Stmt

301265generateCycleFunc mode home def =

302266 case def of

303267 Opt.Def name expr ->

304− JS.Var (JsName.fromGlobal home name) (Expr.codeToExpr (Expr.generate mode expr))

268+ JS.Var [ (JsName.fromGlobal home name, Just (Expr.codeToExpr (Expr.generate mode expr))) ]

305269

306270 Opt.TailDef name args expr ->

307− JS.Var (JsName.fromGlobal home name) (Expr.codeToExpr (Expr.generateTailDef mode name args expr))

271+ JS.Var [ (JsName.fromGlobal home name, Just (Expr.codeToExpr (Expr.generateTailDef mode name args expr))) ]

308272

309273

310274generateSafeCycle :: Mode.Mode -> ModuleName.Canonical -> (Name.Name, Opt.Expr) -> JS.Stmt

@@ -320,9 +284,9 @@ generateRealCycle home (name, _) =

320284 realName = JsName.fromGlobal home name

321285 in

322286 JS.Block

323− [ JS.Var realName (JS.Call (JS.Ref safeName) [])

287+ [ JS.Var [ ( realName, Just (JS.Call (JS.Ref safeName) []) ) ]

324288 , JS.ExprStmt $ JS.Assign (JS.LRef safeName) $

325− JS.Function Nothing [] [ JS.Return (JS.Ref realName) ]

289+ JS.Function Nothing [] [ JS.Return (Just (JS.Ref realName)) ]

326290 ]

327291

328292

@@ -350,7 +314,7 @@ addChunk :: Mode.Mode -> K.Chunk -> B.Builder -> B.Builder

350314addChunk mode chunk builder =

351315 case chunk of

352316 K.JS javascript ->

353− B.byteString javascript <> builder

317+ Utf8.toBuilder javascript <> builder

354318

355319 K.ElmVar home name ->

356320 JsName.toBuilder (JsName.fromGlobal home name) <> builder

@@ -390,13 +354,16 @@ addChunk mode chunk builder =

390354

391355generateEnum :: Mode.Mode -> Opt.Global -> Index.ZeroBased -> JS.Stmt

392356generateEnum mode global@(Opt.Global home name) index =

393− JS.Var (JsName.fromGlobal home name) $

394− case mode of

395− Mode.Dev _ ->

396− Expr.codeToExpr (Expr.generateCtor mode global index 0)

357+ let

358+ definition =

359+ case mode of

360+ Mode.Dev _ ->

361+ Expr.codeToExpr (Expr.generateCtor mode global index 0)

397362

398− Mode.Prod _ ->

399− JS.Int (Index.toMachine index)

363+ Mode.Prod _ ->

364+ JS.Int (Index.toMachine index)

365+ in

366+ JS.Var [ (JsName.fromGlobal home name, Just definition) ]

400367

401368

402369

@@ -405,13 +372,16 @@ generateEnum mode global@(Opt.Global home name) index =

405372

406373generateBox :: Mode.Mode -> Opt.Global -> JS.Stmt

407374generateBox mode global@(Opt.Global home name) =

408− JS.Var (JsName.fromGlobal home name) $

409− case mode of

410− Mode.Dev _ ->

411− Expr.codeToExpr (Expr.generateCtor mode global Index.first 1)

375+ let

376+ definition =

377+ case mode of

378+ Mode.Dev _ ->

379+ Expr.codeToExpr (Expr.generateCtor mode global Index.first 1)

412380

413− Mode.Prod _ ->

414− JS.Ref (JsName.fromGlobal ModuleName.basics Name.identity)

381+ Mode.Prod _ ->

382+ JS.Ref (JsName.fromGlobal ModuleName.basics Name.identity)

383+ in

384+ JS.Var [ (JsName.fromGlobal home name, Just definition) ]

415385

416386

417387{-# NOINLINE identity #-}

@@ -426,11 +396,14 @@ identity =

426396

427397generatePort :: Mode.Mode -> Opt.Global -> Name.Name -> Opt.Expr -> JS.Stmt

428398generatePort mode (Opt.Global home name) makePort converter =

429− JS.Var (JsName.fromGlobal home name) $

430− JS.Call (JS.Ref (JsName.fromKernel Name.platform makePort))

431− [ JS.String (Name.toBuilder name)

432− , Expr.codeToExpr (Expr.generate mode converter)

433− ]

399+ let

400+ definition =

401+ JS.Call (JS.Ref (JsName.fromKernel Name.platform makePort))

402+ [ JS.String (Name.toBuilder name)

403+ , Expr.codeToExpr (Expr.generate mode converter)

404+ ]

405+ in

406+ JS.Var [ (JsName.fromGlobal home name, Just definition) ]

434407

435408

436409

@@ -458,9 +431,11 @@ generateManager mode graph (Opt.Global home@(ModuleName.Canonical _ moduleName)

458431

459432generateLeaf :: ModuleName.Canonical -> Name.Name -> JS.Stmt

460433generateLeaf home@(ModuleName.Canonical _ moduleName) name =

461− JS.Var (JsName.fromGlobal home name) $

462− JS.Call leaf [ JS.String (Name.toBuilder moduleName) ]

463−

434+ let

435+ definition =

436+ JS.Call leaf [ JS.String (Name.toBuilder moduleName) ]

437+ in

438+ JS.Var [ (JsName.fromGlobal home name, Just definition) ]

464439

465440

466441{-# NOINLINE leaf #-}

@@ -534,7 +509,7 @@ generateExports mode (Trie maybeMain subs) =

534509 <> List.foldl' (addSubTrie mode) "}" otherSubTries

535510

536511

537−addSubTrie :: Mode.Mode -> B.Builder -> (Name.Name, Trie) -> B.Builder

512+addSubTrie :: Mode.Mode -> B.Builder -> (Utf8.String, Trie) -> B.Builder

538513addSubTrie mode end (name, trie) =

539514 ",'" <> Utf8.toBuilder name <> "':" <> generateExports mode trie <> end

540515

@@ -546,7 +521,7 @@ addSubTrie mode end (name, trie) =

546521data Trie =

547522 Trie

548523 { _main :: Maybe (ModuleName.Canonical, Opt.Main)

549− , _subs :: Map.Map Name.Name Trie

524+ , _subs :: Map.Map Utf8.String Trie

550525 }

551526

552527

@@ -557,10 +532,14 @@ emptyTrie =

557532

558533addToTrie :: ModuleName.Canonical -> Opt.Main -> Trie -> Trie

559534addToTrie home@(ModuleName.Canonical _ moduleName) main trie =

560− merge trie $ segmentsToTrie home (Name.splitDots moduleName) main

535+ let

536+ segments =

537+ Utf8.split 0x2E {-.-} (Name.toUtf8 moduleName)

538+ in

539+ merge trie $ segmentsToTrie home segments main

561540

562541

563−segmentsToTrie :: ModuleName.Canonical -> [Name.Name] -> Opt.Main -> Trie

542+segmentsToTrie :: ModuleName.Canonical -> [Utf8.String] -> Opt.Main -> Trie

564543segmentsToTrie home segments main =

565544 case segments of

566545 [] ->

compiler/src/Generate/JavaScript/Builder.hs+217−207

@@ -16,7 +16,6 @@ module Generate.JavaScript.Builder

1616

1717import Prelude hiding (lines)

1818import qualified Data.List as List

19−import qualified Data.ByteString as BS

2019import Data.ByteString.Builder as B

2120import Data.Monoid ((<>))

2221import qualified Generate.JavaScript.Name as Name

@@ -28,19 +27,6 @@ import qualified Json.Encode as Json

2827-- EXPRESSIONS

2928

3029

31−-- NOTE: I tried making this create a B.Builder directly.

32−--

33−-- The hope was that it'd allocate less and speed things up, but it seemed

34−-- to be neutral for perf.

35−--

36−-- The downside is that Generate.JavaScript.Expression inspects the

37−-- structure of Expr and Stmt on some occassions to try to strip out

38−-- unnecessary closures. I think these closures are already avoided

39−-- by other logic in code gen these days, but I am not 100% certain.

40−--

41−-- For this to be worth it, I think it would be necessary to avoid

42−-- returning tuples when generating expressions.

43−--

4430data Expr

4531 = String Builder

4632 | Float Builder

@@ -51,13 +37,13 @@ data Expr

5137 | Array [Expr]

5238 | Object [(Name, Expr)]

5339 | Ref Name

54− | Access Expr Name -- foo.bar

55− | Index Expr Expr -- foo[bar]

40+ | Access Expr Name -- ^ @foo.bar@, spec 11.2.1

41+ | Index Expr Expr -- ^ @foo[bar]@, spec 11.2.1

5642 | Prefix PrefixOp Expr

5743 | Infix InfixOp Expr Expr

5844 | If Expr Expr Expr

5945 | Assign LValue Expr

60− | Call Expr [Expr]

46+ | Call Expr [Expr] -- ^ @f(x,y,z)@, spec 11.2.3

6147 | Function (Maybe Name) [Name] [Stmt]

6248

6349

@@ -72,21 +58,20 @@ data LValue

7258

7359

7460data Stmt

75− = Block [Stmt]

76− | EmptyStmt

77− | ExprStmt Expr

78− | IfStmt Expr Stmt Stmt

79− | Switch Expr [Case]

80− | While Expr Stmt

81− | Break (Maybe Name)

82− | Continue (Maybe Name)

83− | Labelled Name Stmt

84− | Try Stmt Name Stmt

85− | Throw Expr

86− | Return Expr

87− | Var Name Expr

88− | Vars [(Name, Expr)]

89− | FunctionStmt Name [Name] [Stmt]

61+ = Block [Stmt] -- {stmts}

62+ | EmptyStmt -- ;

63+ | ExprStmt Expr -- expr;

64+ | IfStmt Expr Stmt Stmt -- if (e) stmt1 else stmt2

65+ | Switch Expr [Case] -- switch (e) clauses

66+ | While Expr Stmt -- while (e) do stmt

67+ | Break (Maybe Name) -- break lab;

68+ | Continue (Maybe Name) -- continue lab;

69+ | Labelled Name Stmt -- lab: stmt

70+ | Try Stmt Name Stmt -- try stmt catch (x) stmt

71+ | Throw Expr -- throw expr;

72+ | Return (Maybe Expr) -- return expr;

73+ | Var [(Name, Maybe Expr)] -- var x, y=42;

74+ | FunctionStmt Name [Name] [Stmt] -- function f(x, y, z) {...}

9075

9176

9277data Case

@@ -99,31 +84,37 @@ data Case

9984

10085

10186data InfixOp

102− = OpAdd -- +

103− | OpSub -- -

87+ = OpLT -- <

88+ | OpLEq -- <=

89+ | OpGT -- >

90+ | OpGEq -- >=

91+ | OpIn -- in

92+ | OpInstanceof -- instanceof

93+ | OpEq -- ==

94+ | OpNEq -- !=

95+ | OpStrictEq -- ===

96+ | OpStrictNEq -- !==

97+ | OpLAnd -- &&

98+ | OpLOr -- ||

10499 | OpMul -- *

105100 | OpDiv -- /

106101 | OpMod -- %

107− | OpEq -- ===

108− | OpNe -- !==

109− | OpLt -- <

110− | OpLe -- <=

111− | OpGt -- >

112− | OpGe -- >=

113− | OpAnd -- &&

114− | OpOr -- ||

115− | OpBitwiseAnd -- &

116− | OpBitwiseXor -- ^

117− | OpBitwiseOr -- |

118− | OpLShift -- <<

119− | OpSpRShift -- >>

120− | OpZfRShift -- >>>

102+ | OpSub -- -

103+ | OpLShift -- <<

104+ | OpSpRShift -- >>

105+ | OpZfRShift -- >>>

106+ | OpBAnd -- &

107+ | OpBXor -- ^

108+ | OpBOr -- |

109+ | OpAdd -- +

121110

122111

123112data PrefixOp

124− = PrefixNot -- !

125− | PrefixNegate -- -

126− | PrefixComplement -- ~

113+ = PrefixLNot -- !

114+ | PrefixBNot -- ~

115+ | PrefixPlus -- +

116+ | PrefixMinus -- -

117+ | PrefixTypeof -- typeof

127118

128119

129120

@@ -132,40 +123,21 @@ data PrefixOp

132123

133124stmtToBuilder :: Stmt -> Builder

134125stmtToBuilder stmts =

135− fromStmt levelZero stmts

126+ fromStmt "" stmts

136127

137128

138129exprToBuilder :: Expr -> Builder

139130exprToBuilder expr =

140− snd $ fromExpr levelZero Whatever expr

141−

142−

143−

144−-- INDENT LEVEL

145−

146−

147−data Level =

148− Level Builder Level

149−

131+ snd $ fromExpr "" Whatever expr

150132

151−levelZero :: Level

152−levelZero =

153− Level mempty (makeLevel 1 (BS.replicate 16 0x09 {-\t-}))

154133

155134

156−makeLevel :: Int -> BS.ByteString -> Level

157−makeLevel level oldTabs =

158− let

159− tabs =

160− if level <= BS.length oldTabs

161− then oldTabs

162− else BS.replicate (BS.length oldTabs * 2) 0x09 {-\t-}

163− in

164− Level (B.byteString (BS.take level tabs)) (makeLevel (level + 1) tabs)

165−

135+-- HELPERS

166136

167137

168−-- HELPERS

138+deeper :: Builder -> Builder

139+deeper indent =

140+ "\t" <> indent

169141

170142

171143commaSep :: [Builder] -> Builder

@@ -173,52 +145,52 @@ commaSep builders =

173145 mconcat (List.intersperse ", " builders)

174146

175147

176−commaNewlineSep :: Level -> [Builder] -> Builder

177−commaNewlineSep (Level _ (Level deeperIndent _)) builders =

178− mconcat (List.intersperse (",\n" <> deeperIndent) builders)

148+commaNewlineSep :: Builder -> [Builder] -> Builder

149+commaNewlineSep indent builders =

150+ mconcat (List.intersperse (",\n" <> deeper indent) builders)

179151

180152

181153

182154-- STATEMENTS

183155

184156

185−fromStmtBlock :: Level -> [Stmt] -> Builder

186−fromStmtBlock level stmts =

187− mconcat (map (fromStmt level) stmts)

157+fromStmtBlock :: Builder -> [Stmt] -> Builder

158+fromStmtBlock indent stmts =

159+ mconcat (map (fromStmt indent) stmts)

188160

189161

190−fromStmt :: Level -> Stmt -> Builder

191−fromStmt level@(Level indent nextLevel) statement =

162+fromStmt :: Builder -> Stmt -> Builder

163+fromStmt indent statement =

192164 case statement of

193165 Block stmts ->

194− fromStmtBlock level stmts

166+ fromStmtBlock indent stmts

195167

196168 EmptyStmt ->

197169 mempty

198170

199171 ExprStmt expr ->

200− indent <> snd (fromExpr level Whatever expr) <> ";\n"

172+ indent <> snd (fromExpr indent Whatever expr) <> ";\n"

201173

202174 IfStmt condition thenStmt elseStmt ->

203175 mconcat

204− [ indent, "if (", snd (fromExpr level Whatever condition), ") {\n"

205− , fromStmt nextLevel thenStmt

176+ [ indent, "if (", snd (fromExpr indent Whatever condition), ") {\n"

177+ , fromStmt (deeper indent) thenStmt

206178 , indent, "} else {\n"

207− , fromStmt nextLevel elseStmt

179+ , fromStmt (deeper indent) elseStmt

208180 , indent, "}\n"

209181 ]

210182

211183 Switch expr clauses ->

212184 mconcat

213− [ indent, "switch (", snd (fromExpr level Whatever expr), ") {\n"

214− , mconcat (map (fromClause nextLevel) clauses)

185+ [ indent, "switch (", snd (fromExpr indent Whatever expr), ") {\n"

186+ , mconcat (map (fromClause (deeper indent)) clauses)

215187 , indent, "}\n"

216188 ]

217189

218190 While expr stmt ->

219191 mconcat

220− [ indent, "while (", snd (fromExpr level Whatever expr), ") {\n"

221− , fromStmt nextLevel stmt

192+ [ indent, "while (", snd (fromExpr indent Whatever expr), ") {\n"

193+ , fromStmt (deeper indent) stmt

222194 , indent, "}\n"

223195 ]

224196

@@ -237,37 +209,37 @@ fromStmt level@(Level indent nextLevel) statement =

237209 Labelled label stmt ->

238210 mconcat

239211 [ indent, Name.toBuilder label, ":\n"

240− , fromStmt level stmt

212+ , fromStmt indent stmt

241213 ]

242214

243215 Try tryStmt errorName catchStmt ->

244216 mconcat

245217 [ indent, "try {\n"

246− , fromStmt nextLevel tryStmt

218+ , fromStmt (deeper indent) tryStmt

247219 , indent, "} catch (", Name.toBuilder errorName, ") {\n"

248− , fromStmt nextLevel catchStmt

220+ , fromStmt (deeper indent) catchStmt

249221 , indent, "}\n"

250222 ]

251223

252224 Throw expr ->

253− indent <> "throw " <> snd (fromExpr level Whatever expr) <> ";"

225+ "throw " <> snd (fromExpr indent Whatever expr) <> ";"

254226

255− Return expr ->

256− indent <> "return " <> snd (fromExpr level Whatever expr) <> ";\n"

227+ Return Nothing ->

228+ indent <> "return;\n"

257229

258− Var name expr ->

259− indent <> "var " <> Name.toBuilder name <> " = " <> snd (fromExpr level Whatever expr) <> ";\n"

230+ Return (Just expr) ->

231+ indent <> "return " <> snd (fromExpr indent Whatever expr) <> ";\n"

260232

261− Vars [] ->

233+ Var [] ->

262234 mempty

263235

264− Vars vars ->

265− indent <> "var " <> commaNewlineSep level (map (varToBuilder level) vars) <> ";\n"

236+ Var vars ->

237+ indent <> "var " <> commaNewlineSep indent (map (varToBuilder indent) vars) <> ";\n"

266238

267239 FunctionStmt name args stmts ->

268240 indent <> "function " <> Name.toBuilder name <> "(" <> commaSep (map Name.toBuilder args) <> ") {\n"

269241 <>

270− fromStmtBlock nextLevel stmts

242+ fromStmtBlock (deeper indent) stmts

271243 <>

272244 indent <> "}\n"

273245

@@ -276,25 +248,30 @@ fromStmt level@(Level indent nextLevel) statement =

276248-- SWITCH CLAUSES

277249

278250

279−fromClause :: Level -> Case -> Builder

280−fromClause level@(Level indent nextLevel) clause =

251+fromClause :: Builder -> Case -> Builder

252+fromClause indent clause =

281253 case clause of

282254 Case expr stmts ->

283− indent <> "case " <> snd (fromExpr level Whatever expr) <> ":\n"

284− <> fromStmtBlock nextLevel stmts

255+ indent <> "case " <> snd (fromExpr indent Whatever expr) <> ":\n"

256+ <> fromStmtBlock (deeper indent) stmts

285257

286258 Default stmts ->

287259 indent <> "default:\n"

288− <> fromStmtBlock nextLevel stmts

260+ <> fromStmtBlock (deeper indent) stmts

289261

290262

291263

292264-- VAR DECLS

293265

294266

295−varToBuilder :: Level -> (Name, Expr) -> Builder

296−varToBuilder level (name, expr) =

297− Name.toBuilder name <> " = " <> snd (fromExpr level Whatever expr)

267+varToBuilder :: Builder -> (Name, Maybe Expr) -> Builder

268+varToBuilder indent (name, maybeExpr) =

269+ case maybeExpr of

270+ Nothing ->

271+ Name.toBuilder name

272+

273+ Just expr ->

274+ Name.toBuilder name <> " = " <> snd (fromExpr indent Whatever expr)

298275

299276

300277

@@ -312,11 +289,12 @@ merge a b =

312289linesMap :: (a -> (Lines, b)) -> [a] -> (Bool, [b])

313290linesMap func xs =

314291 let

315− pairs = map func xs

292+ pairs =

293+ map func xs

316294 in

317− ( any ((==) Many . fst) pairs

318− , map snd pairs

319− )

295+ ( any ((==) Many . fst) pairs

296+ , map snd pairs

297+ )

320298

321299

322300data Grouping = Atomic | Whatever

@@ -332,23 +310,23 @@ parensFor grouping builder =

332310 builder

333311

334312

335−fromExpr :: Level -> Grouping -> Expr -> (Lines, Builder)

336−fromExpr level@(Level indent nextLevel@(Level deeperIndent _)) grouping expression =

313+fromExpr :: Builder -> Grouping -> Expr -> (Lines, Builder)

314+fromExpr indent grouping expression =

337315 case expression of

338316 String string ->

339− ( One, "'" <> string <> "'" )

317+ (One, "'" <> string <> "'")

340318

341319 Float float ->

342− ( One, float )

320+ (One, float)

343321

344322 Int n ->

345− ( One, B.intDec n )

323+ (One, B.intDec n)

346324

347325 Bool bool ->

348− ( One, if bool then "true" else "false" )

326+ (One, if bool then "true" else "false")

349327

350328 Null ->

351− ( One, "null" )

329+ (One, "null")

352330

353331 Json json ->

354332 ( One, Json.encodeUgly json )

@@ -356,90 +334,111 @@ fromExpr level@(Level indent nextLevel@(Level deeperIndent _)) grouping expressi

356334 Array exprs ->

357335 (,) Many $

358336 let

359− (anyMany, builders) = linesMap (fromExpr level Whatever) exprs

337+ (anyMany, builders) =

338+ linesMap (fromExpr indent Whatever) exprs

360339 in

361− if anyMany then

362− "[\n"

363− <> deeperIndent

364− <> commaNewlineSep level builders

365− <> "\n" <> indent <> "]"

366− else

367− "[" <> commaSep builders <> "]"

340+ if anyMany then

341+ "[\n"

342+ <> deeper indent

343+ <> commaNewlineSep indent builders

344+ <> "\n" <> indent <> "]"

345+

346+ else

347+ "[" <> commaSep builders <> "]"

368348

369349 Object fields ->

370350 (,) Many $

371351 let

372− (anyMany, builders) = linesMap (fromField nextLevel) fields

352+ deeperIndent =

353+ deeper indent

354+

355+ (anyMany, builders) =

356+ linesMap (fromField deeperIndent) fields

373357 in

374− if anyMany then

375− "{\n"

376− <> deeperIndent

377− <> commaNewlineSep level builders

378− <> "\n" <> indent <> "}"

379− else

380− "{" <> commaSep builders <> "}"

358+ if anyMany then

359+ "{\n"

360+ <> deeperIndent

361+ <> commaNewlineSep indent builders

362+ <> "\n" <> indent <> "}"

363+

364+ else

365+ "{" <> commaSep builders <> "}"

381366

382367 Ref name ->

383− ( One, Name.toBuilder name )

368+ (One, Name.toBuilder name)

384369

385370 Access expr field ->

386− makeDot level expr field

371+ makeDot indent expr field

387372

388373 Index expr bracketedExpr ->

389− makeBracketed level expr bracketedExpr

374+ makeBracketed indent expr bracketedExpr

390375

391376 Prefix op expr ->

392377 let

393− (lines, builder) = fromExpr level Atomic expr

378+ (lines, builder) =

379+ fromExpr indent Atomic expr

394380 in

395− ( lines

396− , parensFor grouping (fromPrefix op <> builder)

397− )

381+ ( lines

382+ , parensFor grouping (fromPrefix op <> builder)

383+ )

398384

399385 Infix op leftExpr rightExpr ->

400386 let

401− (leftLines , left ) = fromExpr level Atomic leftExpr

402− (rightLines, right) = fromExpr level Atomic rightExpr

387+ (leftLines, left) =

388+ fromExpr indent Atomic leftExpr

389+

390+ (rightLines, right) =

391+ fromExpr indent Atomic rightExpr

403392 in

404− ( merge leftLines rightLines

405− , parensFor grouping (left <> fromInfix op <> right)

406− )

393+ ( merge leftLines rightLines

394+ , parensFor grouping (left <> fromInfix op <> right)

395+ )

407396

408397 If condExpr thenExpr elseExpr ->

409398 let

410− condB = snd (fromExpr level Atomic condExpr)

411− thenB = snd (fromExpr level Atomic thenExpr)

412− elseB = snd (fromExpr level Atomic elseExpr)

399+ condB = snd (fromExpr indent Atomic condExpr)

400+ thenB = snd (fromExpr indent Atomic thenExpr)

401+ elseB = snd (fromExpr indent Atomic elseExpr)

413402 in

414− ( Many

415− , parensFor grouping (condB <> " ? " <> thenB <> " : " <> elseB)

416− )

403+ ( Many

404+ , parensFor grouping (condB <> " ? " <> thenB <> " : " <> elseB)

405+ )

417406

418407 Assign lValue expr ->

419408 let

420− (leftLines , left ) = fromLValue level lValue

421− (rightLines, right) = fromExpr level Whatever expr

409+ (leftLines, left) =

410+ fromLValue indent lValue

411+

412+ (rightLines, right) =

413+ fromExpr indent Whatever expr

422414 in

423− ( merge leftLines rightLines

424− , parensFor grouping (left <> " = " <> right)

425− )

415+ ( merge leftLines rightLines

416+ , parensFor grouping (left <> " = " <> right)

417+ )

426418

427419 Call function args ->

428420 (,) Many $

429421 let

430− (_ , funcB) = fromExpr level Atomic function

431− (anyMany, argsB) = linesMap (fromExpr nextLevel Whatever) args

422+ deeperIndent =

423+ deeper indent

424+

425+ funcB =

426+ snd (fromExpr indent Atomic function)

427+

428+ (anyMany, argsB) =

429+ linesMap (fromExpr deeperIndent Whatever) args

432430 in

433− if anyMany then

434− funcB <> "(\n" <> deeperIndent <> commaNewlineSep level argsB <> ")"

435− else

436− funcB <> "(" <> commaSep argsB <> ")"

431+ if anyMany then

432+ funcB <> "(\n" <> deeperIndent <> commaNewlineSep indent argsB <> ")"

433+

434+ else

435+ funcB <> "(" <> commaSep argsB <> ")"

437436

438437 Function maybeName args stmts ->

439438 (,) Many $

440439 "function " <> maybe mempty Name.toBuilder maybeName <> "(" <> commaSep (map Name.toBuilder args) <> ") {\n"

441440 <>

442− fromStmtBlock nextLevel stmts

441+ fromStmtBlock (deeper indent) stmts

443442 <>

444443 indent <> "}"

445444

@@ -448,50 +447,55 @@ fromExpr level@(Level indent nextLevel@(Level deeperIndent _)) grouping expressi

448447-- FIELDS

449448

450449

451−fromField :: Level -> (Name, Expr) -> (Lines, Builder)

452−fromField level (field, expr) =

450+fromField :: Builder -> (Name, Expr) -> (Lines, Builder)

451+fromField indent (field, expr) =

453452 let

454− (lines, builder) = fromExpr level Whatever expr

453+ (lines, builder) =

454+ fromExpr indent Whatever expr

455455 in

456− ( lines

457− , Name.toBuilder field <> ": " <> builder

458− )

456+ ( lines

457+ , Name.toBuilder field <> ": " <> builder

458+ )

459459

460460

461461

462462-- VALUES

463463

464464

465−fromLValue :: Level -> LValue -> (Lines, Builder)

466−fromLValue level lValue =

465+fromLValue :: Builder -> LValue -> (Lines, Builder)

466+fromLValue indent lValue =

467467 case lValue of

468468 LRef name ->

469469 (One, Name.toBuilder name)

470470

471471 LDot expr field ->

472− makeDot level expr field

472+ makeDot indent expr field

473473

474474 LBracket expr bracketedExpr ->

475− makeBracketed level expr bracketedExpr

475+ makeBracketed indent expr bracketedExpr

476476

477477

478−makeDot :: Level -> Expr -> Name -> (Lines, Builder)

479−makeDot level expr field =

478+makeDot :: Builder -> Expr -> Name -> (Lines, Builder)

479+makeDot indent expr field =

480480 let

481− (lines, builder) = fromExpr level Atomic expr

481+ (lines, builder) =

482+ fromExpr indent Atomic expr

482483 in

483− (lines, builder <> "." <> Name.toBuilder field)

484+ (lines, builder <> "." <> Name.toBuilder field)

484485

485486

486−makeBracketed :: Level -> Expr -> Expr -> (Lines, Builder)

487−makeBracketed level expr bracketedExpr =

487+makeBracketed :: Builder -> Expr -> Expr -> (Lines, Builder)

488+makeBracketed indent expr bracketedExpr =

488489 let

489− (lines , builder ) = fromExpr level Atomic expr

490− (bracketedLines, bracketedBuilder) = fromExpr level Whatever bracketedExpr

490+ (lines, builder) =

491+ fromExpr indent Atomic expr

492+

493+ (bracketedLines, bracketedBuilder) =

494+ fromExpr indent Whatever bracketedExpr

491495 in

492− ( merge lines bracketedLines

493− , builder <> "[" <> bracketedBuilder <> "]"

494− )

496+ ( merge lines bracketedLines

497+ , builder <> "[" <> bracketedBuilder <> "]"

498+ )

495499

496500

497501

@@ -501,30 +505,36 @@ makeBracketed level expr bracketedExpr =

501505fromPrefix :: PrefixOp -> Builder

502506fromPrefix op =

503507 case op of

504− PrefixNot -> "!"

505− PrefixNegate -> "-"

506− PrefixComplement -> "~"

508+ PrefixLNot -> "!"

509+ PrefixBNot -> "~"

510+ PrefixPlus -> "+"

511+ PrefixMinus -> "-"

512+ PrefixTypeof -> "typeof "

507513

508514

509515fromInfix :: InfixOp -> Builder

510516fromInfix op =

511517 case op of

512− OpAdd -> " + "

513− OpSub -> " - "

518+ OpLT -> " < "

519+ OpLEq -> " <= "

520+ OpGT -> " > "

521+ OpGEq -> " >= "

522+ OpIn -> " in "

523+ OpInstanceof -> " instanceof "

524+ OpEq -> " == "

525+ OpNEq -> " != "

526+ OpStrictEq -> " === "

527+ OpStrictNEq -> " !== "

528+ OpLAnd -> " && "

529+ OpLOr -> " || "

514530 OpMul -> " * "

515531 OpDiv -> " / "

516532 OpMod -> " % "

517− OpEq -> " === "

518− OpNe -> " !== "

519− OpLt -> " < "

520− OpLe -> " <= "

521− OpGt -> " > "

522− OpGe -> " >= "

523− OpAnd -> " && "

524− OpOr -> " || "

525− OpBitwiseAnd -> " & "

526− OpBitwiseXor -> " ^ "

527− OpBitwiseOr -> " | "

533+ OpSub -> " - "

528534 OpLShift -> " << "

529535 OpSpRShift -> " >> "

530536 OpZfRShift -> " >>> "

537+ OpBAnd -> " & "

538+ OpBXor -> " ^ "

539+ OpBOr -> " | "

540+ OpAdd -> " + "

compiler/src/Generate/JavaScript/Expression.hs+45−46

@@ -22,7 +22,6 @@ import qualified Data.Utf8 as Utf8

2222

2323import qualified AST.Canonical as Can

2424import qualified AST.Optimized as Opt

25−import qualified AST.Utils.Shader as Shader

2625import qualified Data.Index as Index

2726import qualified Elm.Compiler.Type as Type

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

@@ -33,7 +32,6 @@ import qualified Generate.JavaScript.Builder as JS

3332import qualified Generate.JavaScript.Name as JsName

3433import qualified Generate.Mode as Mode

3534import qualified Json.Encode as Encode

36−import Json.Encode ((==>))

3735import qualified Optimize.DecisionTree as DT

3836import qualified Reporting.Annotation as A

3937

@@ -130,7 +128,8 @@ generate mode expression =

130128

131129 Opt.Destruct (Opt.Destructor name path) body ->

132130 let

133− pathDef = JS.Var (JsName.fromLocal name) (generatePath mode path)

131+ pathExpr = generatePath mode path

132+ pathDef = JS.Var [ (JsName.fromLocal name, Just pathExpr) ]

134133 in

135134 JsBlock $ pathDef : codeToStmtList (generate mode body)

136135

@@ -139,7 +138,7 @@ generate mode expression =

139138

140139 Opt.Accessor field ->

141140 JsExpr $ JS.Function Nothing [JsName.dollar]

142− [ JS.Return $

141+ [ JS.Return $ Just $

143142 JS.Access (JS.Ref JsName.dollar) (generateField mode field)

144143 ]

145144

@@ -191,7 +190,7 @@ generate mode expression =

191190 JS.Object (map toTranlation (Set.toList fields))

192191 in

193192 JsExpr $ JS.Object $

194− [ ( JsName.fromLocal "src", JS.String (Shader.toJsStringBuilder src) )

193+ [ ( JsName.fromLocal "src", JS.String (Utf8.toBuilder src) )

195194 , ( JsName.fromLocal "attributes", toTranslationObject attributes )

196195 , ( JsName.fromLocal "uniforms", toTranslationObject uniforms )

197196 ]

@@ -212,7 +211,7 @@ codeToExpr code =

212211 JsExpr expr ->

213212 expr

214213

215− JsBlock [ JS.Return expr ] ->

214+ JsBlock [ JS.Return (Just expr) ] ->

216215 expr

217216

218217 JsBlock stmts ->

@@ -226,7 +225,7 @@ codeToStmtList code =

226225 stmts

227226

228227 JsExpr expr ->

229− [ JS.Return expr ]

228+ [ JS.Return (Just expr) ]

230229

231230 JsBlock stmts ->

232231 stmts

@@ -239,7 +238,7 @@ codeToStmt code =

239238 JS.Block stmts

240239

241240 JsExpr expr ->

242− JS.Return expr

241+ JS.Return (Just expr)

243242

244243 JsBlock [stmt] ->

245244 stmt

@@ -483,17 +482,17 @@ generateBitwiseCall home name args =

483482 case args of

484483 [arg] ->

485484 case name of

486− "complement" -> JS.Prefix JS.PrefixComplement arg

485+ "complement" -> JS.Prefix JS.PrefixBNot arg

487486 _ -> generateGlobalCall home name args

488487

489488 [left,right] ->

490489 case name of

491− "and" -> JS.Infix JS.OpBitwiseAnd left right

492− "or" -> JS.Infix JS.OpBitwiseOr left right

493− "xor" -> JS.Infix JS.OpBitwiseXor left right

494− "shiftLeftBy" -> JS.Infix JS.OpLShift right left

495− "shiftRightBy" -> JS.Infix JS.OpSpRShift right left

496− "shiftRightZfBy" -> JS.Infix JS.OpZfRShift right left

490+ "and" -> JS.Infix JS.OpBAnd left right

491+ "or" -> JS.Infix JS.OpBOr left right

492+ "xor" -> JS.Infix JS.OpBXor left right

493+ "shiftLeftBy" -> JS.Infix JS.OpLShift right left

494+ "shiftRightBy" -> JS.Infix JS.OpSpRShift right left

495+ "shiftRightZfBy" -> JS.Infix JS.OpZfRShift right left

497496 _ -> generateGlobalCall home name args

498497

499498 _ ->

@@ -506,10 +505,10 @@ generateBasicsCall mode home name args =

506505 [elmArg] ->

507506 let arg = generateJsExpr mode elmArg in

508507 case name of

509− "not" -> JS.Prefix JS.PrefixNot arg

510− "negate" -> JS.Prefix JS.PrefixNegate arg

508+ "not" -> JS.Prefix JS.PrefixLNot arg

509+ "negate" -> JS.Prefix JS.PrefixMinus arg

511510 "toFloat" -> arg

512− "truncate" -> JS.Infix JS.OpBitwiseOr arg (JS.Int 0)

511+ "truncate" -> JS.Infix JS.OpBOr arg (JS.Int 0)

513512 _ -> generateGlobalCall home name [arg]

514513

515514 [elmLeft, elmRight] ->

@@ -529,16 +528,16 @@ generateBasicsCall mode home name args =

529528 "sub" -> JS.Infix JS.OpSub left right

530529 "mul" -> JS.Infix JS.OpMul left right

531530 "fdiv" -> JS.Infix JS.OpDiv left right

532− "idiv" -> JS.Infix JS.OpBitwiseOr (JS.Infix JS.OpDiv left right) (JS.Int 0)

531+ "idiv" -> JS.Infix JS.OpBOr (JS.Infix JS.OpDiv left right) (JS.Int 0)

533532 "eq" -> equal left right

534533 "neq" -> notEqual left right

535− "lt" -> cmp JS.OpLt JS.OpLt 0 left right

536− "gt" -> cmp JS.OpGt JS.OpGt 0 left right

537− "le" -> cmp JS.OpLe JS.OpLt 1 left right

538− "ge" -> cmp JS.OpGe JS.OpGt (-1) left right

539− "or" -> JS.Infix JS.OpOr left right

540− "and" -> JS.Infix JS.OpAnd left right

541− "xor" -> JS.Infix JS.OpNe left right

534+ "lt" -> cmp JS.OpLT JS.OpLT 0 left right

535+ "gt" -> cmp JS.OpGT JS.OpGT 0 left right

536+ "le" -> cmp JS.OpLEq JS.OpLT 1 left right

537+ "ge" -> cmp JS.OpGEq JS.OpGT (-1) left right

538+ "or" -> JS.Infix JS.OpLOr left right

539+ "and" -> JS.Infix JS.OpLAnd left right

540+ "xor" -> JS.Infix JS.OpStrictNEq left right

542541 "remainderBy" -> JS.Infix JS.OpMod right left

543542 _ -> generateGlobalCall home name [left, right]

544543

@@ -559,7 +558,7 @@ notEqual left right =

559558 if isLiteral left || isLiteral right then

560559 strictNEq left right

561560 else

562− JS.Prefix JS.PrefixNot $

561+ JS.Prefix JS.PrefixLNot $

563562 JS.Call (JS.Ref (JsName.fromKernel Name.utils "eq")) [left, right]

564563

565564

@@ -648,42 +647,42 @@ strictEq :: JS.Expr -> JS.Expr -> JS.Expr

648647strictEq left right =

649648 case left of

650649 JS.Int 0 ->

651− JS.Prefix JS.PrefixNot right

650+ JS.Prefix JS.PrefixLNot right

652651

653652 JS.Bool bool ->

654− if bool then right else JS.Prefix JS.PrefixNot right

653+ if bool then right else JS.Prefix JS.PrefixLNot right

655654

656655 _ ->

657656 case right of

658657 JS.Int 0 ->

659− JS.Prefix JS.PrefixNot left

658+ JS.Prefix JS.PrefixLNot left

660659

661660 JS.Bool bool ->

662− if bool then left else JS.Prefix JS.PrefixNot left

661+ if bool then left else JS.Prefix JS.PrefixLNot left

663662

664663 _ ->

665− JS.Infix JS.OpEq left right

664+ JS.Infix JS.OpStrictEq left right

666665

667666

668667strictNEq :: JS.Expr -> JS.Expr -> JS.Expr

669668strictNEq left right =

670669 case left of

671670 JS.Int 0 ->

672− JS.Prefix JS.PrefixNot (JS.Prefix JS.PrefixNot right)

671+ JS.Prefix JS.PrefixLNot (JS.Prefix JS.PrefixLNot right)

673672

674673 JS.Bool bool ->

675− if bool then JS.Prefix JS.PrefixNot right else right

674+ if bool then JS.Prefix JS.PrefixLNot right else right

676675

677676 _ ->

678677 case right of

679678 JS.Int 0 ->

680− JS.Prefix JS.PrefixNot (JS.Prefix JS.PrefixNot left)

679+ JS.Prefix JS.PrefixLNot (JS.Prefix JS.PrefixLNot left)

681680

682681 JS.Bool bool ->

683− if bool then JS.Prefix JS.PrefixNot left else left

682+ if bool then JS.Prefix JS.PrefixLNot left else left

684683

685684 _ ->

686− JS.Infix JS.OpNe left right

685+ JS.Infix JS.OpStrictNEq left right

687686

688687

689688

@@ -696,13 +695,13 @@ generateTailCall :: Mode.Mode -> Name.Name -> [(Name.Name, Opt.Expr)] -> [JS.Stm

696695generateTailCall mode name args =

697696 let

698697 toTempVars (argName, arg) =

699− ( JsName.makeTemp argName, generateJsExpr mode arg )

698+ ( JsName.makeTemp argName, Just (generateJsExpr mode arg) )

700699

701700 toRealVars (argName, _) =

702701 JS.ExprStmt $

703702 JS.Assign (JS.LRef (JsName.fromLocal argName)) (JS.Ref (JsName.makeTemp argName))

704703 in

705− JS.Vars (map toTempVars args)

704+ JS.Var (map toTempVars args)

706705 : map toRealVars args

707706 ++ [ JS.Continue (Just (JsName.fromLocal name)) ]

708707

@@ -715,10 +714,10 @@ generateDef :: Mode.Mode -> Opt.Def -> JS.Stmt

715714generateDef mode def =

716715 case def of

717716 Opt.Def name body ->

718− JS.Var (JsName.fromLocal name) (generateJsExpr mode body)

717+ JS.Var [ (JsName.fromLocal name, Just (generateJsExpr mode body)) ]

719718

720719 Opt.TailDef name argNames body ->

721− JS.Var (JsName.fromLocal name) (codeToExpr (generateTailDef mode name argNames body))

720+ JS.Var [ (JsName.fromLocal name, Just (codeToExpr (generateTailDef mode name argNames body))) ]

722721

723722

724723generateTailDef :: Mode.Mode -> Name.Name -> [Name.Name] -> Opt.Expr -> Code

@@ -851,7 +850,7 @@ generateDecider mode label root decisionTree =

851850

852851 Opt.Chain testChain success failure ->

853852 [ JS.IfStmt

854− (List.foldl1' (JS.Infix JS.OpAnd) (map (generateIfTest mode root) testChain))

853+ (List.foldl1' (JS.Infix JS.OpLAnd) (map (generateIfTest mode root) testChain))

855854 (JS.Block $ generateDecider mode label root success)

856855 (JS.Block $ generateDecider mode label root failure)

857856 ]

@@ -893,7 +892,7 @@ generateIfTest mode root (path, test) =

893892 value

894893

895894 DT.IsBool False ->

896− JS.Prefix JS.PrefixNot value

895+ JS.Prefix JS.PrefixLNot value

897896

898897 DT.IsInt int ->

899898 strictEq value (JS.Int int)

@@ -911,7 +910,7 @@ generateIfTest mode root (path, test) =

911910 JS.Access value (JsName.fromLocal "b")

912911

913912 DT.IsNil ->

914− JS.Prefix JS.PrefixNot $

913+ JS.Prefix JS.PrefixLNot $

915914 JS.Access value (JsName.fromLocal "b")

916915

917916 DT.IsTuple ->

@@ -1065,6 +1064,6 @@ toDebugMetadata mode msgType =

10651064

10661065 Mode.Dev (Just interfaces) ->

10671066 JS.Json $ Encode.object $

1068− [ "versions" ==> Encode.object [ "elm" ==> V.encode V.compiler ]

1069− , "types" ==> Type.encodeMetadata (Extract.fromMsg interfaces msgType)

1067+ [ ("versions", Encode.object [ ("elm", V.encode V.compiler) ])

1068+ , ("types", Type.encodeMetadata (Extract.fromMsg interfaces msgType))

10701069 ]

compiler/src/Generate/JavaScript/Name.hs+12−22

@@ -62,13 +62,19 @@ fromLocal name =

6262

6363

6464fromGlobal :: ModuleName.Canonical -> Name.Name -> Name

65−fromGlobal home name =

66− Name $ homeToBuilder home <> usd <> Name.toBuilder name

65+fromGlobal (ModuleName.Canonical (Pkg.Name author project) home) name =

66+ Name $ Name.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} author

67+ <> "$" <> Name.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} project

68+ <> "$" <> Name.toEscapedBuilder 0x2E {- . -} 0x24 {- $ -} home

69+ <> "$" <> Name.toBuilder name

6770

6871

6972fromCycle :: ModuleName.Canonical -> Name.Name -> Name

70−fromCycle home name =

71− Name $ homeToBuilder home <> "$cyclic$" <> Name.toBuilder name

73+fromCycle (ModuleName.Canonical (Pkg.Name author project) home) name =

74+ Name $ Name.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} author

75+ <> "$" <> Name.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} project

76+ <> "$" <> Name.toEscapedBuilder 0x2E {- . -} 0x24 {- $ -} home

77+ <> "$cyclic$" <> Name.toBuilder name

7278

7379

7480fromKernel :: Name.Name -> Name.Name -> Name

@@ -76,17 +82,6 @@ fromKernel home name =

7682 Name ("_" <> Name.toBuilder home <> "_" <> Name.toBuilder name)

7783

7884

79−{-# INLINE homeToBuilder #-}

80−homeToBuilder :: ModuleName.Canonical -> B.Builder

81−homeToBuilder (ModuleName.Canonical (Pkg.Name author project) home) =

82− usd <>

83− Utf8.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} author

84− <> usd <>

85− Utf8.toEscapedBuilder 0x2D {- - -} 0x5F {- _ -} project

86− <> usd <>

87− Utf8.toEscapedBuilder 0x2E {- . -} 0x24 {- $ -} home

88−

89−

9085

9186-- TEMPORARY NAMES

9287

@@ -103,7 +98,7 @@ makeA n =

10398

10499makeLabel :: Name.Name -> Int -> Name

105100makeLabel name index =

106− Name (Name.toBuilder name <> usd <> B.intDec index)

101+ Name (Name.toBuilder name <> "$" <> B.intDec index)

107102

108103

109104makeTemp :: Name.Name -> Name

@@ -113,12 +108,7 @@ makeTemp name =

113108

114109dollar :: Name

115110dollar =

116− Name usd

117−

118−

119−usd :: B.Builder

120−usd =

121− Name.toBuilder Name.dollar

111+ Name (Name.toBuilder Name.dollar)

122112

123113

124114

compiler/src/Generate/Mode.hs+1

@@ -49,6 +49,7 @@ shortenFieldNames (Opt.GlobalGraph _ frequencies) =

4949

5050addToBuckets :: Name.Name -> Int -> Map.Map Int [Name.Name] -> Map.Map Int [Name.Name]

5151addToBuckets field frequency buckets =

52+ -- TODO try using an IntMap for buckets

5253 Map.insertWith (++) frequency [field] buckets

5354

5455

compiler/src/Json/Decode.hs+177−329

@@ -4,110 +4,68 @@ module Json.Decode

44 ( fromByteString

55 , Decoder

66 , string

7− , customString

87 , bool

98 , int

10− , list

11− , nonEmptyList

12− , pair

13− --

14− , KeyDecoder(..)

15− , dict

16− , pairs

17− , field

18− --

9+ , list, pair

10+ , dict, pairs, field

1911 , oneOf

2012 , failure

2113 , mapError

22− --

23− , Error(..)

24− , Problem(..)

25− , DecodeExpectation(..)

26− , ParseError(..)

27− , StringProblem(..)

2814 )

2915 where

3016

3117

32−import qualified Data.ByteString.Internal as B

18+import qualified Data.ByteString as B

19+import qualified Data.List as List

3320import qualified Data.Map as Map

34−import qualified Data.NonEmptyList as NE

35−import Data.Word (Word8)

21+import qualified Data.Utf8 as Utf8

22+import Data.Word (Word8, Word16)

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

37−import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

3824

39−import qualified Json.String as Json

4025import qualified Parse.Keyword as K

4126import qualified Parse.Primitives as P

42−import Parse.Primitives (Row, Col)

43−import qualified Reporting.Annotation as A

27+import qualified Reporting.Error.Json as E

4428

4529

4630

4731-- RUNNERS

4832

4933

50−fromByteString :: Decoder x a -> B.ByteString -> Either (Error x) a

51−fromByteString (Decoder decode) src =

52− case P.fromByteString pFile BadEnd src of

53− Right ast ->

54− decode ast Right (Left . DecodeProblem src)

34+fromByteString :: Decoder e a -> B.ByteString -> Either (E.Error e) a

35+fromByteString decoder src =

36+ fromAST decoder (P.fromByteString pFile src)

5537

56− Left problem ->

57− Left (ParseProblem src problem)

38+

39+fromAST :: Decoder e a -> P.Result E.ParseError AST -> Either (E.Error e) a

40+fromAST (Decoder decode) parserResult =

41+ case parserResult of

42+ P.Ok ast _ ->

43+ decode ast Right (Left . E.DecodeProblem)

44+

45+ P.Err err ->

46+ Left (E.ParseProblem err)

5847

5948

6049

6150-- DECODERS

6251

6352

64−newtype Decoder x a =

53+newtype Decoder e a =

6554 Decoder

6655 (

6756 forall b.

6857 AST

6958 -> (a -> b)

70− -> (Problem x -> b)

59+ -> (E.Problem e -> b)

7160 -> b

7261 )

7362

7463

7564

76−-- ERRORS

77−

78−

79−data Error x

80− = DecodeProblem B.ByteString (Problem x)

81− | ParseProblem B.ByteString ParseError

82−

83−

84−

85−-- DECODE PROBLEMS

86−

87−

88−data Problem x

89− = Field B.ByteString (Problem x)

90− | Index Int (Problem x)

91− | OneOf (Problem x) [Problem x]

92− | Failure A.Region x

93− | Expecting A.Region DecodeExpectation

94−

95−

96−data DecodeExpectation

97− = TObject

98− | TArray

99− | TString

100− | TBool

101− | TInt

102− | TObjectWith B.ByteString

103− | TArrayPair Int

104−

105−

106−

10765-- INSTANCES

10866

10967

110−instance Functor (Decoder x) where

68+instance Functor (Decoder e) where

11169 {-# INLINE fmap #-}

11270 fmap func (Decoder decodeA) =

11371 Decoder $ \ast ok err ->

@@ -117,7 +75,7 @@ instance Functor (Decoder x) where

11775 decodeA ast ok' err

11876

11977

120−instance Applicative (Decoder x) where

78+instance Applicative (Decoder e) where

12179 {-# INLINE pure #-}

12280 pure = return

12381

@@ -134,7 +92,7 @@ instance Applicative (Decoder x) where

13492 decodeFunc ast okF err

13593

13694

137−instance Monad (Decoder x) where

95+instance Monad (Decoder e) where

13896 {-# INLINE return #-}

13997 return a =

14098 Decoder $ \_ ok _ ->

@@ -155,37 +113,24 @@ instance Monad (Decoder x) where

155113-- STRINGS

156114

157115

158−string :: Decoder x Json.String

116+string :: Decoder e Utf8.String

159117string =

160− Decoder $ \(A.At region ast) ok err ->

161− case ast of

162− String snippet ->

163− ok (Json.fromSnippet snippet)

164−

165− _ ->

166− err (Expecting region TString)

167−

168−

169−customString :: P.Parser x a -> (Row -> Col -> x) -> Decoder x a

170−customString parser toBadEnd =

171− Decoder $ \(A.At region ast) ok err ->

118+ Decoder $ \ast ok err ->

172119 case ast of

173− String snippet ->

174− case P.fromSnippet parser toBadEnd snippet of

175− Right a -> ok a

176− Left x -> err (Failure region x)

120+ String bits ->

121+ ok bits

177122

178123 _ ->

179− err (Expecting region TString)

124+ err (E.Expecting E.TString)

180125

181126

182127

183128-- BOOL

184129

185130

186−bool :: Decoder x Bool

131+bool :: Decoder e Bool

187132bool =

188− Decoder $ \(A.At region ast) ok err ->

133+ Decoder $ \ast ok err ->

189134 case ast of

190135 TRUE ->

191136 ok True

@@ -194,40 +139,40 @@ bool =

194139 ok False

195140

196141 _ ->

197− err (Expecting region TBool)

142+ err (E.Expecting E.TBool)

198143

199144

200145

201146-- INT

202147

203148

204−int :: Decoder x Int

149+int :: Decoder e Int

205150int =

206− Decoder $ \(A.At region ast) ok err ->

151+ Decoder $ \ast ok err ->

207152 case ast of

208153 Int n ->

209154 ok n

210155

211156 _ ->

212− err (Expecting region TInt)

157+ err (E.Expecting E.TInt)

213158

214159

215160

216−-- LISTS

161+-- ARRAYS

217162

218163

219−list :: Decoder x a -> Decoder x [a]

164+list :: Decoder e a -> Decoder e [a]

220165list decoder =

221− Decoder $ \(A.At region ast) ok err ->

166+ Decoder $ \ast ok err ->

222167 case ast of

223168 Array asts ->

224169 listHelp decoder ok err 0 asts []

225170

226171 _ ->

227− err (Expecting region TArray)

172+ err (E.Expecting E.TArray)

228173

229174

230−listHelp :: Decoder x a -> ([a] -> b) -> (Problem x -> b) -> Int -> [AST] -> [a] -> b

175+listHelp :: Decoder e a -> ([a] -> b) -> (E.Problem e -> b) -> Int -> [AST] -> [a] -> b

231176listHelp decoder@(Decoder decodeA) ok err !i asts revs =

232177 case asts of

233178 [] ->

@@ -235,40 +180,24 @@ listHelp decoder@(Decoder decodeA) ok err !i asts revs =

235180

236181 ast:asts ->

237182 let

238− ok' value = listHelp decoder ok err (i+1) asts (value:revs)

239− err' prob = err (Index i prob)

183+ ok' a = listHelp decoder ok err (i+1) asts (a:revs)

184+ err' e = err (E.Index i e)

240185 in

241186 decodeA ast ok' err'

242187

243188

244−

245−-- NON-EMPTY LISTS

246−

247−

248−nonEmptyList :: Decoder x a -> x -> Decoder x (NE.List a)

249−nonEmptyList decoder x =

250− do values <- list decoder

251− case values of

252− v:vs -> return (NE.List v vs)

253− [] -> failure x

254−

255−

256−

257−-- PAIR

258−

259−

260−pair :: Decoder x a -> Decoder x b -> Decoder x (a,b)

189+pair :: Decoder e a -> Decoder e b -> Decoder e (a,b)

261190pair (Decoder decodeA) (Decoder decodeB) =

262− Decoder $ \(A.At region ast) ok err ->

191+ Decoder $ \ast ok err ->

263192 case ast of

264193 Array vs ->

265194 case vs of

266195 [astA,astB] ->

267196 let

268− err0 e = err (Index 0 e)

197+ err0 e = err (E.Index 0 e)

269198 ok0 a =

270199 let

271− err1 e = err (Index 1 e)

200+ err1 e = err (E.Index 1 e)

272201 ok1 b = ok (a,b)

273202 in

274203 decodeB astB ok1 err1

@@ -276,103 +205,70 @@ pair (Decoder decodeA) (Decoder decodeB) =

276205 decodeA astA ok0 err0

277206

278207 _ ->

279− err (Expecting region (TArrayPair (length vs)))

208+ err (E.Expecting (E.TArrayPair (length vs)))

280209

281210 _ ->

282− err (Expecting region TArray)

283−

284−

211+ err (E.Expecting E.TArray)

285212

286−-- OBJECTS

287213

288214

289−data KeyDecoder x a =

290− KeyDecoder (P.Parser x a) (Row -> Col -> x)

215+-- OBJECT

291216

292217

293−dict :: (Ord k) => KeyDecoder x k -> Decoder x a -> Decoder x (Map.Map k a)

294−dict keyDecoder valueDecoder =

295− Map.fromList <$> pairs keyDecoder valueDecoder

218+dict :: Decoder e a -> Decoder e (Map.Map Utf8.String a)

219+dict decoder =

220+ Map.fromList <$> pairs decoder

296221

297222

298−pairs :: KeyDecoder x k -> Decoder x a -> Decoder x [(k, a)]

299−pairs keyDecoder valueDecoder =

300− Decoder $ \(A.At region ast) ok err ->

223+pairs :: Decoder e a -> Decoder e [(Utf8.String, a)]

224+pairs decoder =

225+ Decoder $ \ast ok err ->

301226 case ast of

302227 Object kvs ->

303− pairsHelp keyDecoder valueDecoder ok err kvs []

228+ pairsHelp decoder ok err kvs []

304229

305230 _ ->

306− err (Expecting region TObject)

231+ err (E.Expecting E.TObject)

307232

308233

309−pairsHelp :: KeyDecoder x k -> Decoder x a -> ([(k, a)] -> b) -> (Problem x -> b) -> [(P.Snippet, AST)] -> [(k, a)] -> b

310−pairsHelp keyDecoder@(KeyDecoder keyParser toBadEnd) valueDecoder@(Decoder decodeA) ok err kvs revs =

234+pairsHelp :: Decoder e a -> ([(Utf8.String, a)] -> b) -> (E.Problem e -> b) -> [(Utf8.String, AST)] -> [(Utf8.String, a)] -> b

235+pairsHelp decoder@(Decoder decodeA) ok err kvs revs =

311236 case kvs of

312237 [] ->

313238 ok (reverse revs)

314239

315− (snippet, ast) : kvs ->

316− case P.fromSnippet keyParser toBadEnd snippet of

317− Left x ->

318− err (Failure (snippetToRegion snippet) x)

319−

320− Right key ->

321− let

322− ok' value = pairsHelp keyDecoder valueDecoder ok err kvs ((key,value):revs)

323− err' prob =

324− let (P.Snippet fptr off len _ _) = snippet in

325− err (Field (B.PS fptr off len) prob)

326− in

327− decodeA ast ok' err'

328−

329−

330−snippetToRegion :: P.Snippet -> A.Region

331−snippetToRegion (P.Snippet _ _ len row col) =

332− A.Region (A.Position row col) (A.Position row (col + fromIntegral len))

333−

334−

335−

336−-- FIELDS

240+ (key, ast) : kvs ->

241+ let

242+ ok' a = pairsHelp decoder ok err kvs ((key,a):revs)

243+ err' e = err (E.Field key e)

244+ in

245+ decodeA ast ok' err'

337246

338247

339−field :: B.ByteString -> Decoder x a -> Decoder x a

248+field :: Utf8.String -> Decoder e a -> Decoder e a

340249field key (Decoder decodeA) =

341− Decoder $ \(A.At region ast) ok err ->

250+ Decoder $ \ast ok err ->

342251 case ast of

343252 Object kvs ->

344− case findField key kvs of

345− Just value ->

253+ case List.lookup key kvs of

254+ Just v ->

346255 let

347− err' prob =

348− err (Field key prob)

256+ err' e = err (E.Field key e)

349257 in

350− decodeA value ok err'

258+ decodeA v ok err'

351259

352260 Nothing ->

353− err (Expecting region (TObjectWith key))

261+ err (E.Expecting (E.TObjectWith key))

354262

355263 _ ->

356− err (Expecting region TObject)

357−

358−

359−findField :: B.ByteString -> [(P.Snippet, AST)] -> Maybe AST

360−findField key pairs =

361− case pairs of

362− [] ->

363− Nothing

364−

365− (P.Snippet fptr off len _ _, value) : remainingPairs ->

366− if key == B.PS fptr off len

367− then Just value

368− else findField key remainingPairs

264+ err (E.Expecting E.TObject)

369265

370266

371267

372268-- ONE OF

373269

374270

375−oneOf :: [Decoder x a] -> Decoder x a

271+oneOf :: [Decoder e a] -> Decoder e a

376272oneOf decoders =

377273 Decoder $ \ast ok err ->

378274 case decoders of

@@ -387,75 +283,71 @@ oneOf decoders =

387283 error "Ran into (Json.Decode.oneOf [])"

388284

389285

390−oneOfHelp :: AST -> (a -> b) -> (Problem x -> b) -> [Decoder x a] -> Problem x -> [Problem x] -> b

391−oneOfHelp ast ok err decoders p ps =

286+oneOfHelp :: AST -> (a -> b) -> (E.Problem e -> b) -> [Decoder e a] -> E.Problem e -> [E.Problem e] -> b

287+oneOfHelp ast ok err decoders e es =

392288 case decoders of

393289 Decoder decodeA : decoders ->

394290 let

395− err' p' =

396− oneOfHelp ast ok err decoders p' (p:ps)

291+ err' e' =

292+ oneOfHelp ast ok err decoders e' (e:es)

397293 in

398294 decodeA ast ok err'

399295

400296 [] ->

401− err (oneOfError [] p ps)

297+ err (oneOfError [] e es)

402298

403299

404−oneOfError :: [Problem x] -> Problem x -> [Problem x] -> Problem x

405−oneOfError problems prob ps =

406− case ps of

300+oneOfError :: [E.Problem e] -> E.Problem e -> [E.Problem e] -> E.Problem e

301+oneOfError errors err es =

302+ case es of

407303 [] ->

408− OneOf prob problems

304+ E.OneOf err errors

409305

410− p:ps ->

411− oneOfError (prob:problems) p ps

306+ e:es ->

307+ oneOfError (err:errors) e es

412308

413309

414310

415311-- FAILURE

416312

417313

418−failure :: x -> Decoder x a

419−failure x =

420− Decoder $ \(A.At region _) _ err ->

421− err (Failure region x)

314+failure :: e -> Decoder e a

315+failure e =

316+ Decoder $ \_ _ err ->

317+ err (E.Failure e)

422318

423319

424320

425321-- ERRORS

426322

427323

428−mapError :: (x -> y) -> Decoder x a -> Decoder y a

324+mapError :: (e -> e') -> Decoder e a -> Decoder e' a

429325mapError func (Decoder decodeA) =

430326 Decoder $ \ast ok err ->

431327 let

432− err' prob = err (mapErrorHelp func prob)

328+ err' e = err (mapErrorHelp func e)

433329 in

434330 decodeA ast ok err'

435331

436332

437−mapErrorHelp :: (x -> y) -> Problem x -> Problem y

438−mapErrorHelp func problem =

439− case problem of

440− Field k p -> Field k (mapErrorHelp func p)

441− Index i p -> Index i (mapErrorHelp func p)

442− OneOf p ps -> OneOf (mapErrorHelp func p) (map (mapErrorHelp func) ps)

443− Failure r x -> Failure r (func x)

444− Expecting r e -> Expecting r e

333+mapErrorHelp :: (e -> e') -> E.Problem e -> E.Problem e'

334+mapErrorHelp func err =

335+ case err of

336+ E.Field k e -> E.Field k (mapErrorHelp func e)

337+ E.Index i e -> E.Index i (mapErrorHelp func e)

338+ E.OneOf e es -> E.OneOf (mapErrorHelp func e) (map (mapErrorHelp func) es)

339+ E.Failure e -> E.Failure (func e)

340+ E.Expecting e -> E.Expecting e

445341

446342

447343

448344-- AST

449345

450346

451−type AST =

452− A.Located AST_

453−

454−

455−data AST_

347+data AST

456348 = Array [AST]

457− | Object [(P.Snippet, AST)]

458− | String P.Snippet

349+ | Object [(Utf8.String, AST)]

350+ | String Utf8.String

459351 | Int Int

460352 | TRUE

461353 | FALSE

@@ -467,33 +359,7 @@ data AST_

467359

468360

469361type Parser a =

470− P.Parser ParseError a

471−

472−

473−data ParseError

474− = Start Row Col

475− | ObjectField Row Col

476− | ObjectColon Row Col

477− | ObjectEnd Row Col

478− | ArrayEnd Row Col

479− | StringProblem StringProblem Row Col

480− | NoLeadingZeros Row Col

481− | NoFloats Row Col

482− | BadEnd Row Col

483−

484−-- PIndex Int ParseError Row Col

485−-- PField Json.String ParseError Row Col

486−

487−

488−data StringProblem

489− = BadStringEnd

490− | BadStringControlChar

491− | BadStringEscapeChar

492− | BadStringEscapeHex

493−

494−

495−

496−-- PARSE AST

362+ P.Parser E.ParseError a

497363

498364

499365pFile :: Parser AST

@@ -501,60 +367,69 @@ pFile =

501367 do spaces

502368 value <- pValue

503369 spaces

370+ endOfFile

504371 return value

505372

506373

507374pValue :: Parser AST

508375pValue =

509− P.addLocation $

510− P.oneOf Start

511− [ String <$> pString Start

376+ P.oneOf E.Value

377+ [ fmap String pString

512378 , pObject

513379 , pArray

514380 , pInt

515− , K.k4 0x74 0x72 0x75 0x65 Start >> return TRUE

516− , K.k5 0x66 0x61 0x6C 0x73 0x65 Start >> return FALSE

517− , K.k4 0x6E 0x75 0x6C 0x6C Start >> return NULL

381+ , K.k4 0x74 0x72 0x75 0x65 E.Bool >> return TRUE

382+ , K.k5 0x66 0x61 0x6C 0x73 0x65 E.Bool >> return FALSE

383+ , K.k4 0x6E 0x75 0x6C 0x6C E.Null >> return NULL

518384 ]

519385

520386

387+endOfFile :: Parser ()

388+endOfFile =

389+ P.Parser $ \state@(P.State pos end _ row col) _ eok _ eerr ->

390+ if pos < end then

391+ eerr row col E.EndOfFile

392+ else

393+ eok () state

394+

395+

521396

522397-- OBJECT

523398

524399

525−pObject :: Parser AST_

400+pObject :: Parser AST

526401pObject =

527− do P.word1 0x7B {- { -} Start

402+ do P.word1 0x7B {- { -} E.ObjectStart

528403 spaces

529− P.oneOf ObjectField

404+ P.oneOf E.ObjectMore

530405 [ do entry <- pField

531406 spaces

532407 pObjectHelp [entry]

533− , do P.word1 0x7D {-}-} ObjectEnd

408+ , do P.word1 0x7D {-}-} E.ObjectEnd

534409 return (Object [])

535410 ]

536411

537412

538−pObjectHelp :: [(P.Snippet, AST)] -> Parser AST_

413+pObjectHelp :: [(Utf8.String, AST)] -> Parser AST

539414pObjectHelp revEntries =

540− P.oneOf ObjectEnd

415+ P.oneOf E.ObjectMore

541416 [

542− do P.word1 0x2C {-,-} ObjectEnd

417+ do P.word1 0x2C {-,-} E.ObjectMore

543418 spaces

544419 entry <- pField

545420 spaces

546421 pObjectHelp (entry:revEntries)

547422 ,

548− do P.word1 0x7D {-}-} ObjectEnd

423+ do P.word1 0x7D {-}-} E.ObjectEnd

549424 return (Object (reverse revEntries))

550425 ]

551426

552427

553−pField :: Parser (P.Snippet, AST)

428+pField :: Parser (Utf8.String, AST)

554429pField =

555− do key <- pString ObjectField

430+ do key <- pString

556431 spaces

557− P.word1 0x3A {-:-} ObjectColon

432+ P.word1 0x3A {-:-} E.Colon

558433 spaces

559434 value <- pValue

560435 return (key, value)

@@ -564,30 +439,30 @@ pField =

564439-- ARRAY

565440

566441

567−pArray :: Parser AST_

442+pArray :: Parser AST

568443pArray =

569− do P.word1 0x5B {-[-} Start

444+ do P.word1 0x5B {-[-} E.ArrayStart

570445 spaces

571− P.oneOf Start

446+ P.oneOf E.ArrayMore

572447 [ do entry <- pValue

573448 spaces

574449 pArrayHelp 1 [entry]

575− , do P.word1 0x5D {-]-} ArrayEnd

450+ , do P.word1 0x5D {-]-} E.ArrayEnd

576451 return (Array [])

577452 ]

578453

579454

580−pArrayHelp :: Int -> [AST] -> Parser AST_

455+pArrayHelp :: Int -> [AST] -> Parser AST

581456pArrayHelp !len revEntries =

582− P.oneOf ArrayEnd

457+ P.oneOf E.ArrayMore

583458 [

584− do P.word1 0x2C {-,-} ArrayEnd

459+ do P.word1 0x2C {-,-} E.ArrayMore

585460 spaces

586461 entry <- pValue

587462 spaces

588463 pArrayHelp (len + 1) (entry:revEntries)

589464 ,

590− do P.word1 0x5D {-]-} ArrayEnd

465+ do P.word1 0x5D {-]-} E.ArrayEnd

591466 return (Array (reverse revEntries))

592467 ]

593468

@@ -596,44 +471,41 @@ pArrayHelp !len revEntries =

596471-- STRING

597472

598473

599−pString :: (Row -> Col -> ParseError) -> Parser P.Snippet

600−pString start =

601− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

474+pString :: Parser Utf8.String

475+pString =

476+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

602477 if pos < end && P.unsafeIndex pos == 0x22 {-"-} then

603478

604479 let

605480 !pos1 = plusPtr pos 1

606− !col1 = col + 1

607481

608482 (# status, newPos, newRow, newCol #) =

609− pStringHelp pos1 end row col1

483+ pStringHelp pos1 end row (col + 1)

610484 in

611485 case status of

612486 GoodString ->

613487 let

614− !off = minusPtr pos1 (unsafeForeignPtrToPtr src)

615− !len = minusPtr newPos pos1 - 1

616− !snp = P.Snippet src off len row col1

617− !newState = P.State src newPos end indent newRow newCol

488+ !newState = P.State newPos end indent newRow newCol

489+ !content = Utf8.fromPtr pos1 (plusPtr newPos (-1))

618490 in

619− cok snp newState

491+ cok content newState

620492

621− BadString problem ->

622− cerr newRow newCol (StringProblem problem)

493+ BadStringEnd ->

494+ cerr newRow newCol E.StringEnd

623495

624496 else

625− eerr row col start

497+ eerr row col E.StringStart

626498

627499

628500data StringStatus

629501 = GoodString

630− | BadString StringProblem

502+ | BadStringEnd

631503

632504

633−pStringHelp :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> (# StringStatus, Ptr Word8, Row, Col #)

505+pStringHelp :: Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> (# StringStatus, Ptr Word8, Word16, Word16 #)

634506pStringHelp pos end row col =

635507 if pos >= end then

636− (# BadString BadStringEnd, pos, row, col #)

508+ (# BadStringEnd, pos, row, col #)

637509

638510 else

639511 case P.unsafeIndex pos of

@@ -641,50 +513,26 @@ pStringHelp pos end row col =

641513 (# GoodString, plusPtr pos 1, row, col + 1 #)

642514

643515 0x0A {-\n-} ->

644− (# BadString BadStringEnd, pos, row, col #)

516+ (# BadStringEnd, pos, row, col #)

645517

646518 0x5C {-\-} ->

647− let !pos1 = plusPtr pos 1 in

648− if pos1 >= end then

649− (# BadString BadStringEnd, pos1, row + 1, col #)

650− else

651− case P.unsafeIndex pos1 of

652− 0x22 {-"-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

653− 0x5C {-\-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

654− 0x2F {-/-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

655− 0x62 {-b-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

656− 0x66 {-f-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

657− 0x6E {-n-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

658− 0x72 {-r-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

659− 0x74 {-t-} -> pStringHelp (plusPtr pos 2) end row (col + 2)

660− 0x75 {-u-} ->

661− let !pos6 = plusPtr pos 6 in

662− if pos6 <= end

663− && isHex (P.unsafeIndex (plusPtr pos 2))

664− && isHex (P.unsafeIndex (plusPtr pos 3))

665− && isHex (P.unsafeIndex (plusPtr pos 4))

666− && isHex (P.unsafeIndex (plusPtr pos 5))

667− then

668− pStringHelp pos6 end row (col + 6)

669− else

670− (# BadString BadStringEscapeHex, pos, row, col #)

671−

672− _ ->

673− (# BadString BadStringEscapeChar, pos, row, col #)

519+ let

520+ !pos1 = plusPtr pos 1

521+ in

522+ if pos1 < end then

674523

675− word ->

676− if word < 0x20 then

677− (# BadString BadStringControlChar, pos, row, col #)

678− else

679− let !newPos = plusPtr pos (P.getCharWidth word) in

680− pStringHelp newPos end row (col + 1)

524+ let

525+ !word = P.unsafeIndex pos1

526+ !newPos = plusPtr pos1 (P.getCharWidth pos1 end word)

527+ in

528+ pStringHelp newPos end row (col + 2)

681529

530+ else

531+ (# BadStringEnd, pos1, row + 1, col #)

682532

683−isHex :: Word8 -> Bool

684−isHex word =

685− 0x30 {-0-} <= word && word <= 0x39 {-9-}

686− || 0x61 {-a-} <= word && word <= 0x66 {-f-}

687− || 0x41 {-A-} <= word && word <= 0x46 {-F-}

533+ word ->

534+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

535+ pStringHelp newPos end row (col + 1)

688536

689537

690538

@@ -693,7 +541,7 @@ isHex word =

693541

694542spaces :: Parser ()

695543spaces =

696− P.Parser $ \state@(P.State src pos end indent row col) cok eok _ _ ->

544+ P.Parser $ \state@(P.State pos end indent row col) cok eok _ _ ->

697545 let

698546 (# newPos, newRow, newCol #) =

699547 eatSpaces pos end row col

@@ -703,12 +551,12 @@ spaces =

703551 else

704552 let

705553 !newState =

706− P.State src newPos end indent newRow newCol

554+ P.State newPos end indent newRow newCol

707555 in

708556 cok () newState

709557

710558

711−eatSpaces :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> (# Ptr Word8, Row, Col #)

559+eatSpaces :: Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> (# Ptr Word8, Word16, Word16 #)

712560eatSpaces pos end row col =

713561 if pos >= end then

714562 (# pos, row, col #)

@@ -727,29 +575,29 @@ eatSpaces pos end row col =

727575-- INTS

728576

729577

730−pInt :: Parser AST_

578+pInt :: Parser AST

731579pInt =

732− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

580+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

733581 if pos >= end then

734− eerr row col Start

582+ eerr row col E.IntStart

735583

736584 else

737585 let !word = P.unsafeIndex pos in

738586 if not (isDecimalDigit word) then

739− eerr row col Start

587+ eerr row col E.IntStart

740588

741589 else if word == 0x30 {-0-} then

742590

743591 let

744592 !pos1 = plusPtr pos 1

745− !newState = P.State src pos1 end indent row (col + 1)

593+ !newState = P.State pos1 end indent row (col + 1)

746594 in

747595 if pos1 < end then

748596 let !word1 = P.unsafeIndex pos1 in

749597 if isDecimalDigit word1 then

750− cerr row (col + 1) NoLeadingZeros

598+ cerr row (col + 1) E.NoLeadingZeros

751599 else if word1 == 0x2E {-.-} then

752− cerr row (col + 1) NoFloats

600+ cerr row (col + 1) E.NoFloats

753601 else

754602 cok (Int 0) newState

755603 else

@@ -766,12 +614,12 @@ pInt =

766614 GoodInt ->

767615 let

768616 !newState =

769− P.State src newPos end indent row (col + len)

617+ P.State newPos end indent row (col + len)

770618 in

771619 cok (Int n) newState

772620

773621 BadIntEnd ->

774− cerr row (col + len) NoFloats

622+ cerr row (col + len) E.NoFloats

775623

776624

777625data IntStatus = GoodInt | BadIntEnd

compiler/src/Json/Encode.hs+21−37

@@ -10,7 +10,6 @@ module Json.Encode

1010 , object

1111 , string

1212 , name

13− , chars

1413 , bool

1514 , int

1615 , number

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

3332import qualified Data.Utf8 as Utf8

3433

3534import qualified File

36−import qualified Json.String as Json

3735

3836

3937

@@ -42,7 +40,7 @@ import qualified Json.String as Json

4240

4341data Value

4442 = Array [Value]

45− | Object [(Json.String, Value)]

43+ | Object [(Utf8.String, Value)]

4644 | String B.Builder

4745 | Boolean Bool

4846 | Integer Int

@@ -55,14 +53,14 @@ array =

5553 Array

5654

5755

58−object :: [(Json.String, Value)] -> Value

56+object :: [(Utf8.String,Value)] -> Value

5957object =

6058 Object

6159

6260

63−string :: Json.String -> Value

61+string :: Utf8.String -> Value

6462string str =

65− String (B.char7 '"' <> Json.toBuilder str <> B.char7 '"')

63+ String (encodeUtf8 str)

6664

6765

6866name :: Name.Name -> Value

@@ -90,7 +88,7 @@ null =

9088 Null

9189

9290

93−dict :: (k -> Json.String) -> (v -> Value) -> Map.Map k v -> Value

91+dict :: (k -> Utf8.String) -> (v -> Value) -> Map.Map k v -> Value

9492dict encodeKey encodeValue pairs =

9593 Object $ map (encodeKey *** encodeValue) (Map.toList pairs)

9694

@@ -101,35 +99,12 @@ list encodeEntry entries =

10199

102100

103101

104−-- CHARS

105−

106−

107−chars :: [Char] -> Value -- PERF can this be done better? Look for examples.

108−chars chrs =

109− String (B.char7 '"' <> B.stringUtf8 (escape chrs) <> B.char7 '"')

110−

111−

112−escape :: [Char] -> [Char]

113−escape chrs =

114− case chrs of

115− [] ->

116− []

117−

118− c:cs

119− | c == '\r' -> '\\' : 'r' : escape cs

120− | c == '\n' -> '\\' : 'n' : escape cs

121− | c == '\"' -> '\\' : '"' : escape cs

122− | c == '\\' -> '\\' : '\\' : escape cs

123− | otherwise -> c : escape cs

124−

125−

126−

127102-- HELPERS

128103

129104

130−(==>) :: [Char] -> value -> (Json.String, value)

131−(==>) key value =

132− (Json.fromChars key, value)

105+(==>) :: a -> b -> (a, b)

106+(==>) a b =

107+ (a, b)

133108

134109

135110

@@ -169,7 +144,7 @@ encodeUgly value =

169144 Object (first : rest) ->

170145 let

171146 encodeEntry char (key, entry) =

172− B.char7 char <> B.char7 '"' <> Utf8.toBuilder key <> B.string7 "\":" <> encodeUgly entry

147+ B.char7 char <> encodeUtf8 key <> B.char7 ':' <> encodeUgly entry

173148 in

174149 encodeEntry '{' first <> mconcat (map (encodeEntry ',') rest) <> B.char7 '}'

175150

@@ -230,6 +205,15 @@ encodeHelp indent value =

230205

231206

232207

208+-- ENCODE UTF-8

209+

210+

211+encodeUtf8 :: Utf8.String -> B.Builder

212+encodeUtf8 str =

213+ B.char7 '"' <> Utf8.toBuilder str <> B.char7 '"'

214+

215+

216+

233217-- ENCODE ARRAY

234218

235219

@@ -252,7 +236,7 @@ arrayClose =

252236-- ENCODE OBJECT

253237

254238

255−encodeObject :: BSC.ByteString -> (Json.String, Value) -> [(Json.String, Value)] -> B.Builder

239+encodeObject :: BSC.ByteString -> (Utf8.String, Value) -> [(Utf8.String, Value)] -> B.Builder

256240encodeObject =

257241 encodeSequence objectOpen objectClose encodeField

258242

@@ -267,9 +251,9 @@ objectClose =

267251 B.char7 '}'

268252

269253

270−encodeField :: BSC.ByteString -> (Json.String, Value) -> B.Builder

254+encodeField :: BSC.ByteString -> (Utf8.String, Value) -> B.Builder

271255encodeField indent (key, value) =

272− B.char7 '"' <> Utf8.toBuilder key <> B.string7 "\": " <> encodeHelp indent value

256+ encodeUtf8 key <> B.string7 ": " <> encodeHelp indent value

273257

274258

275259

compiler/src/Json/String.hsdeleted−192

@@ -1,192 +0,0 @@

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

2−{-# LANGUAGE BangPatterns, EmptyDataDecls #-}

3−module Json.String

4− ( String

5− , isEmpty

6− --

7− , fromPtr

8− , fromName

9− , fromChars

10− , fromSnippet

11− , fromComment

12− --

13− , toChars

14− , toBuilder

15− )

16− where

17−

18−

19−import Prelude hiding (String)

20−import qualified Data.ByteString.Builder as B

21−import qualified Data.Coerce as Coerce

22−import qualified Data.Name as Name

23−import qualified Data.Utf8 as Utf8

24−import Data.Utf8 (MBA, newByteArray, copyFromPtr, freeze, writeWord8)

25−import Data.Word (Word8)

26−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

27−import Foreign.ForeignPtr (withForeignPtr)

28−import GHC.Exts (RealWorld)

29−import GHC.IO (stToIO, unsafeDupablePerformIO, unsafePerformIO)

30−import GHC.ST (ST)

31−

32−import qualified Parse.Primitives as P

33−

34−

35−

36−-- JSON STRINGS

37−

38−

39−-- INVARIANT: any Json.String is appropriately escaped already

40−-- PERF: is this the right representation for Json.String? Maybe ByteString instead?

41−--

42−type String =

43− Utf8.Utf8 JSON_STRING

44−

45−

46−data JSON_STRING

47−

48−

49−isEmpty :: String -> Bool

50−isEmpty =

51− Utf8.isEmpty

52−

53−

54−

55−-- FROM

56−

57−

58−fromPtr :: Ptr Word8 -> Ptr Word8 -> String

59−fromPtr =

60− Utf8.fromPtr

61−

62−

63−fromChars :: [Char] -> String

64−fromChars =

65− Utf8.fromChars

66−

67−

68−fromSnippet :: P.Snippet -> String

69−fromSnippet =

70− Utf8.fromSnippet

71−

72−

73−fromName :: Name.Name -> String

74−fromName =

75− Coerce.coerce

76−

77−

78−

79−-- TO

80−

81−

82−toChars :: String -> [Char]

83−toChars =

84− Utf8.toChars

85−

86−

87−{-# INLINE toBuilder #-}

88−toBuilder :: String -> B.Builder

89−toBuilder =

90− Utf8.toBuilder

91−

92−

93−

94−-- FROM COMMENT

95−

96−

97−fromComment :: P.Snippet -> String

98−fromComment (P.Snippet fptr off len _ _) =

99− unsafePerformIO $ withForeignPtr fptr $ \ptr ->

100− let

101− !pos = plusPtr ptr off

102− !end = plusPtr pos len

103− !str = fromChunks (chompChunks pos end pos [])

104− in

105− return str

106−

107−

108−chompChunks :: Ptr Word8 -> Ptr Word8 -> Ptr Word8 -> [Chunk] -> [Chunk]

109−chompChunks pos end start revChunks =

110− if pos >= end then

111− reverse (addSlice start end revChunks)

112− else

113− let

114− !word = P.unsafeIndex pos

115− in

116− case word of

117− 0x0A {-\n-} -> chompEscape 0x6E {-n-} pos end start revChunks

118− 0x22 {-"-} -> chompEscape 0x22 {-"-} pos end start revChunks

119− 0x5C {-\-} -> chompEscape 0x5C {-\-} pos end start revChunks

120− 0x0D {-\r-} ->

121− let

122− !newPos = plusPtr pos 1

123− in

124− chompChunks newPos end newPos (addSlice start pos revChunks)

125−

126− _ ->

127− let

128− !width = P.getCharWidth word

129− !newPos = plusPtr pos width

130− in

131− chompChunks newPos end start revChunks

132−

133−

134−chompEscape :: Word8 -> Ptr Word8 -> Ptr Word8 -> Ptr Word8 -> [Chunk] -> [Chunk]

135−chompEscape escape pos end start revChunks =

136− let

137− !pos1 = plusPtr pos 1

138− in

139− chompChunks pos1 end pos1 (Escape escape : addSlice start pos revChunks)

140−

141−

142−addSlice :: Ptr Word8 -> Ptr Word8 -> [Chunk] -> [Chunk]

143−addSlice start end revChunks =

144− if start == end

145− then revChunks

146− else Slice start (minusPtr end start) : revChunks

147−

148−

149−

150−-- FROM CHUNKS

151−

152−

153−data Chunk

154− = Slice (Ptr Word8) Int

155− | Escape Word8

156−

157−

158−fromChunks :: [Chunk] -> String

159−fromChunks chunks =

160− unsafeDupablePerformIO (stToIO (

161− do let !len = sum (map chunkToWidth chunks)

162− mba <- newByteArray len

163− writeChunks mba 0 chunks

164− freeze mba

165− ))

166−

167−

168−chunkToWidth :: Chunk -> Int

169−chunkToWidth chunk =

170− case chunk of

171− Slice _ len -> len

172− Escape _ -> 2

173−

174−

175−writeChunks :: MBA RealWorld -> Int -> [Chunk] -> ST RealWorld ()

176−writeChunks mba offset chunks =

177− case chunks of

178− [] ->

179− return ()

180−

181− chunk : chunks ->

182− case chunk of

183− Slice ptr len ->

184− do copyFromPtr ptr mba offset len

185− let !newOffset = offset + len

186− writeChunks mba newOffset chunks

187−

188− Escape word ->

189− do writeWord8 mba offset 0x5C {- \ -}

190− writeWord8 mba (offset + 1) word

191− let !newOffset = offset + 2

192− writeChunks mba newOffset chunks

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

@@ -22,11 +22,11 @@ import qualified Data.Map as Map

2222import qualified Data.Maybe as Maybe

2323import qualified Data.Name as Name

2424import qualified Data.NonEmptyList as NE

25+import qualified Data.Utf8 as Utf8

2526

2627import qualified AST.Canonical as Can

2728import qualified Data.Index as Index

2829import qualified Elm.ModuleName as ModuleName

29−import qualified Elm.String as ES

3030import qualified Reporting.Annotation as A

3131

3232

@@ -41,8 +41,8 @@ data Pattern

4141

4242

4343data Literal

44− = Chr ES.String

45− | Str ES.String

44+ = Chr Utf8.String

45+ | Str Utf8.String

4646 | Int Int

4747 deriving (Eq)

4848

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

@@ -27,11 +27,11 @@ import qualified Data.List as List

2727import qualified Data.Maybe as Maybe

2828import qualified Data.Name as Name

2929import qualified Data.Set as Set

30+import qualified Data.Utf8 as Utf8

3031

3132import qualified AST.Canonical as Can

3233import qualified Data.Index as Index

3334import qualified Elm.ModuleName as ModuleName

34−import qualified Elm.String as ES

3535import qualified Reporting.Annotation as A

3636

3737

@@ -77,8 +77,8 @@ data Test

7777 | IsNil

7878 | IsTuple

7979 | IsInt Int

80− | IsChr ES.String

81− | IsStr ES.String

80+ | IsChr Utf8.String

81+ | IsStr Utf8.String

8282 | IsBool Bool

8383 deriving (Eq, Ord)

8484

@@ -618,7 +618,7 @@ instance Binary Test where

618618 5 -> liftM IsStr get

619619 6 -> liftM IsInt get

620620 7 -> liftM IsBool get

621− _ -> fail "problem getting DecisionTree.Test binary"

621+ _ -> error "problem getting DecisionTree.Test binary"

622622

623623

624624instance Binary Path where

@@ -634,4 +634,4 @@ instance Binary Path where

634634 0 -> liftM2 Index get get

635635 1 -> liftM Unbox get

636636 2 -> pure Empty

637− _ -> fail "problem getting DecisionTree.Path binary"

637+ _ -> error "problem getting DecisionTree.Path binary"

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

@@ -213,10 +213,10 @@ findMain defs =

213213 def:rest ->

214214 case def of

215215 Can.Def (A.At region name) _ _ ->

216− if name == Name._main then Just region else findMain rest

216+ if name == Name.main then Just region else findMain rest

217217

218218 Can.TypedDef (A.At region name) _ _ _ _ ->

219− if name == Name._main then Just region else findMain rest

219+ if name == Name.main then Just region else findMain rest

220220

221221

222222defToName :: Can.Def -> Name.Name

@@ -244,7 +244,7 @@ addDef home annotations def graph =

244244

245245addDefHelp :: A.Region -> Annotations -> ModuleName.Canonical -> Name.Name -> [Can.Pattern] -> Can.Expr -> Opt.LocalGraph -> Result i w Opt.LocalGraph

246246addDefHelp region annotations home name args body graph@(Opt.LocalGraph _ nodes fieldCounts) =

247− if name /= Name._main then

247+ if name /= Name.main then

248248 Result.ok (addDefNode home name args body Set.empty graph)

249249 else

250250 let

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

@@ -58,7 +58,7 @@ toEncoder tipe =

5858 | name == Name.array -> encodeArray arg

5959

6060 _ ->

61− error "toEncoder: bad custom type"

61+ error "toEncoder: bad union type"

6262

6363 Can.TRecord _ (Just _) ->

6464 error "toEncoder: bad record"

@@ -68,7 +68,7 @@ toEncoder tipe =

6868 encodeField (name, Can.FieldType _ fieldType) =

6969 do encoder <- toEncoder fieldType

7070 let value = Opt.Call encoder [Opt.Access (Opt.VarLocal Name.dollar) name]

71− return $ Opt.Tuple (Opt.Str (Name.toElmString name)) value Nothing

71+ return $ Opt.Tuple (Opt.Str (Name.toUtf8 name)) value Nothing

7272 in

7373 do object <- encode "object"

7474 keyValuePairs <- traverse encodeField (Map.toList fields)

@@ -309,7 +309,7 @@ fieldAndThen decoder (key, Can.FieldType _ tipe) =

309309 return $

310310 Opt.Call andThen

311311 [ Opt.Function [key] decoder

312− , Opt.Call field [ Opt.Str (Name.toElmString key), typeDecoder ]

312+ , Opt.Call field [ Opt.Str (Name.toUtf8 key), typeDecoder ]

313313 ]

314314

315315

compiler/src/Parse/Declaration.hs+16−15

@@ -20,6 +20,7 @@ import qualified Parse.Space as Space

2020import qualified Parse.Symbol as Symbol

2121import qualified Parse.Type as Type

2222import qualified Parse.Variable as Var

23+import Parse.Space (DocComment)

2324import Parse.Primitives hiding (State)

2425import qualified Parse.Primitives as P

2526import qualified Reporting.Annotation as A

@@ -31,10 +32,10 @@ import qualified Reporting.Error.Syntax as E

3132

3233

3334data Decl

34− = Value (Maybe Src.Comment) (A.Located Src.Value)

35− | Union (Maybe Src.Comment) (A.Located Src.Union)

36− | Alias (Maybe Src.Comment) (A.Located Src.Alias)

37− | Port (Maybe Src.Comment) Src.Port

35+ = Value (Maybe DocComment) (A.Located Src.Value)

36+ | Union (Maybe DocComment) (A.Located Src.Union)

37+ | Alias (Maybe DocComment) (A.Located Src.Alias)

38+ | Port (Maybe DocComment) Src.Port

3839

3940

4041declaration :: Space.Parser E.Decl Decl

@@ -52,7 +53,7 @@ declaration =

5253-- DOC COMMENT

5354

5455

55−chompDocComment :: Parser E.Decl (Maybe Src.Comment)

56+chompDocComment :: Parser E.Decl (Maybe DocComment)

5657chompDocComment =

5758 oneOfWithFallback

5859 [

@@ -69,7 +70,7 @@ chompDocComment =

6970

7071

7172{-# INLINE valueDecl #-}

72−valueDecl :: Maybe Src.Comment -> A.Position -> Space.Parser E.Decl Decl

73+valueDecl :: Maybe DocComment -> A.Position -> Space.Parser E.Decl Decl

7374valueDecl maybeDocs start =

7475 do name <- Var.lower E.DeclStart

7576 end <- getPosition

@@ -80,7 +81,7 @@ valueDecl maybeDocs start =

8081 do word1 0x3A {-:-} E.DeclDefEquals

8182 Space.chompAndCheckIndent E.DeclDefSpace E.DeclDefIndentType

8283 (tipe, _) <- specialize E.DeclDefType Type.expression

83− Space.checkFreshLine E.DeclDefNameRepeat

84+ Space.checkFreshLine E.DeclDefFreshLineAfterType

8485 defName <- chompMatchingName name

8586 Space.chompAndCheckIndent E.DeclDefSpace E.DeclDefIndentEquals

8687 chompDefArgsAndBody maybeDocs start defName (Just tipe) []

@@ -89,7 +90,7 @@ valueDecl maybeDocs start =

8990 ]

9091

9192

92−chompDefArgsAndBody :: Maybe Src.Comment -> A.Position -> A.Located Name.Name -> Maybe Src.Type -> [Src.Pattern] -> Space.Parser E.DeclDef Decl

93+chompDefArgsAndBody :: Maybe DocComment -> A.Position -> A.Located Name.Name -> Maybe Src.Type -> [Src.Pattern] -> Space.Parser E.DeclDef Decl

9394chompDefArgsAndBody maybeDocs start name tipe revArgs =

9495 oneOf E.DeclDefEquals

9596 [ do arg <- specialize E.DeclDefArg Pattern.term

@@ -109,14 +110,14 @@ chompMatchingName expectedName =

109110 let

110111 (P.Parser parserL) = Var.lower E.DeclDefNameRepeat

111112 in

112− P.Parser $ \state@(P.State _ _ _ _ sr sc) cok eok cerr eerr ->

113+ P.Parser $ \state@(P.State _ _ _ sr sc) cok eok cerr eerr ->

113114 let

114− cokL name newState@(P.State _ _ _ _ er ec) =

115+ cokL name newState@(P.State _ _ _ er ec) =

115116 if expectedName == name

116117 then cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState

117118 else cerr sr sc (E.DeclDefNameMatch name)

118119

119− eokL name newState@(P.State _ _ _ _ er ec) =

120+ eokL name newState@(P.State _ _ _ er ec) =

120121 if expectedName == name

121122 then eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState

122123 else eerr sr sc (E.DeclDefNameMatch name)

@@ -129,7 +130,7 @@ chompMatchingName expectedName =

129130

130131

131132{-# INLINE typeDecl #-}

132−typeDecl :: Maybe Src.Comment -> A.Position -> Space.Parser E.Decl Decl

133+typeDecl :: Maybe DocComment -> A.Position -> Space.Parser E.Decl Decl

133134typeDecl maybeDocs start =

134135 inContext E.DeclType (Keyword.type_ E.DeclStart) $

135136 do Space.chompAndCheckIndent E.DT_Space E.DT_IndentName

@@ -214,7 +215,7 @@ chompVariants variants end =

214215

215216

216217{-# INLINE portDecl #-}

217−portDecl :: Maybe Src.Comment -> Space.Parser E.Decl Decl

218+portDecl :: Maybe DocComment -> Space.Parser E.Decl Decl

218219portDecl maybeDocs =

219220 inContext E.Port (Keyword.port_ E.DeclStart) $

220221 do Space.chompAndCheckIndent E.PortSpace E.PortIndentName

@@ -235,7 +236,7 @@ portDecl maybeDocs =

235236

236237-- INVARIANT: always chomps to a freshline

237238--

238−infix_ :: Parser E.Module (A.Located Src.Infix)

239+infix_ :: Parser E.Module (A.Located Src.Binop)

239240infix_ =

240241 let

241242 err = E.Infix

@@ -263,4 +264,4 @@ infix_ =

263264 end <- getPosition

264265 Space.chomp _err

265266 Space.checkFreshLine err

266− return (A.at start end (Src.Infix op associativity precedence name))

267+ return (A.at start end (Src.Binop op associativity precedence name))

compiler/src/Parse/Docs.hsnew file+275

@@ -0,0 +1,275 @@

1+module Parse.Docs

2+ ( Docs(..)

3+ , parser

4+ )

5+ where

6+

7+

8+

9+-- DOCS

10+

11+

12+data Docs =

13+ Docs

14+ { _exposed :: [A.Located Name.Name]

15+ , _overview :: Utf8.String

16+ , _listed :: [A.Located Name.Name]

17+ , _comments :: Map.Map Name.Name Utf8.String

18+ }

19+

20+

21+

22+-- PARSER

23+

24+

25+parser :: Parser Docs

26+parser =

27+ error "TODO implement docs parser"

28+

29+

30+chompUntilDocs :: Parser Bool

31+chompUntilDocs =

32+ P.Parser $ \(P.State fp offset terminal indent row col ctx) cok _ _ _ ->

33+ let

34+ (# isStart, newOffset, newRow, newCol #) =

35+ eatDocs fp offset terminal row col

36+

37+ !newState =

38+ P.State fp newOffset terminal indent newRow newCol ctx

39+ in

40+ cok isStart newState

41+

42+

43+eatDocs :: ForeignPtr Word8 -> Int -> Int -> Word16 -> Word16 -> (# Bool, Int, Word16, Word16 #)

44+eatDocs fp offset terminal row col =

45+ if offset >= terminal then

46+ (# False, offset, row, col #)

47+

48+ else if isDocsStart fp offset terminal then

49+ (# True, offset + 5, row, col + 5 #)

50+

51+ else

52+ let !word = P.unsafeIndex fp offset in

53+ if word == 0x0A {- \n -} then

54+ eatDocs fp (offset + 1) terminal (row + 1) 1

55+

56+ else

57+ let !newOffset = offset + P.getCharWidth fp offset terminal word in

58+ eatDocs fp newOffset terminal row (col + 1)

59+

60+

61+isDocsStart :: ForeignPtr Word8 -> Int -> Int -> Bool

62+isDocsStart =

63+ let (B.PS dfp doff dlen) = docsStart in

64+ P.isSubstring dfp doff dlen

65+

66+

67+{-# NOINLINE docsStart #-}

68+docsStart :: B.ByteString

69+docsStart =

70+ "@docs"

71+

72+

73+chompOverview :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

74+chompOverview names =

75+ do isDocs <- chompUntilDocs

76+ if isDocs

77+ then chompOverviewHelp names

78+ else return names

79+

80+

81+chompOverviewHelp :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

82+chompOverviewHelp names =

83+ do pos <- getPosition

84+ (SPos spos) <- whitespace

85+ if pos == spos

86+ then chompOverview names

87+ else chompOverview =<< chompDocs names

88+

89+

90+chompDocs :: [A.Located Name.Name] -> Parser [A.Located Name.Name]

91+chompDocs names =

92+ do name <- addLocation (oneOf SE.XXX [ Var.lower, Var.upper, chompBinop ])

93+ spos <- whitespace

94+ oneOf SE.XXX

95+ [ do checkSpace spos

96+ word1 0x2C {-,-} SE.XXX

97+ spaces

98+ chompDocs (name:names)

99+ , return (name:names)

100+ ]

101+

102+

103+chompBinop :: Parser Name.Name

104+chompBinop =

105+ do word1 0x28 {-(-} SE.XXX

106+ name <- Symbol.binop

107+ word1 0x29 {-)-} SE.XXX

108+ return name

109+

110+

111+

112+

113+-- CHECK NAMES

114+

115+

116+type Result i w a =

117+ Result.Result i w E.Error a

118+

119+

120+type Dups =

121+ Map.Map Name.Name (OneOrMore.OneOrMore A.Region)

122+

123+

124+checkNames :: Map.Map Name.Name (A.Located Can.Export) -> [A.Located Name.Name] -> Result i w ()

125+checkNames exports names =

126+ do docs <- Map.traverseWithKey isUnique (List.foldl' addName Map.empty names)

127+ let overlap = Map.size (Map.intersection docs exports)

128+ if Map.size exports == overlap && overlap == Map.size docs

129+ then Result.ok ()

130+ else

131+ do _ <- Map.traverseWithKey onlyInDocs (Map.difference docs exports)

132+ _ <- Map.traverseWithKey onlyInExports (Map.difference exports docs)

133+ Result.ok ()

134+

135+

136+addName :: Dups -> A.Located Name.Name -> Dups

137+addName dict (A.At region name) =

138+ Map.insertWith OneOrMore.more name (OneOrMore.one region) dict

139+

140+

141+isUnique :: Name.Name -> OneOrMore.OneOrMore A.Region -> Result i w A.Region

142+isUnique name regions =

143+ case regions of

144+ OneOrMore.One region ->

145+ Result.ok region

146+

147+ OneOrMore.More _ _ ->

148+ let (r1:r2:_) = OneOrMore.toList regions in

149+ Result.throw (E.Duplicate name r1 r2)

150+

151+

152+onlyInDocs :: Name.Name -> A.Region -> Result i w a

153+onlyInDocs name region =

154+ Result.throw $ E.OnlyInDocs name region

155+

156+

157+onlyInExports :: Name.Name -> A.Located Can.Export -> Result i w a

158+onlyInExports name (A.At region _) =

159+ Result.throw $ E.OnlyInExports name region

160+

161+

162+

163+-- CHECK EXPORTS

164+

165+

166+data Info =

167+ Info

168+ { _iComments :: Map.Map Name.Name Comment

169+ , _iValues :: Types

170+ , _iUnions :: Map.Map Name.Name Can.Union

171+ , _iAliases :: Map.Map Name.Name Can.Alias

172+ , _iBinops :: Map.Map Name.Name Can.Binop

173+ , _iEffects :: Can.Effects

174+ }

175+

176+

177+checkExport :: Info -> Name.Name -> A.Located Can.Export -> Result i w (Module -> Module)

178+checkExport info name (A.At region export) =

179+ case export of

180+ Can.ExportValue ->

181+ do tipe <- getType name info

182+ comment <- getComment region name info

183+ Result.ok $ \m ->

184+ m { _values = Map.insert name (Value comment tipe) (_values m) }

185+

186+ Can.ExportBinop ->

187+ do let (Can.Binop_ assoc prec realName) = _iBinops info ! name

188+ tipe <- getType realName info

189+ comment <- getComment region realName info

190+ Result.ok $ \m ->

191+ m { _binops = Map.insert name (Binop comment tipe assoc prec) (_binops m) }

192+

193+ Can.ExportAlias ->

194+ do let (Can.Alias tvars tipe) = _iAliases info ! name

195+ comment <- getComment region name info

196+ Result.ok $ \m ->

197+ m { _aliases = Map.insert name (Alias comment tvars (Extract.fromType tipe)) (_aliases m) }

198+

199+ Can.ExportUnionOpen ->

200+ do let (Can.Union tvars ctors _ _) = _iUnions info ! name

201+ comment <- getComment region name info

202+ Result.ok $ \m ->

203+ m { _unions = Map.insert name (Union comment tvars (map dector ctors)) (_unions m) }

204+

205+ Can.ExportUnionClosed ->

206+ do let (Can.Union tvars _ _ _) = _iUnions info ! name

207+ comment <- getComment region name info

208+ Result.ok $ \m ->

209+ m { _unions = Map.insert name (Union comment tvars []) (_unions m) }

210+

211+ Can.ExportPort ->

212+ do tipe <- getType name info

213+ comment <- getComment region name info

214+ Result.ok $ \m ->

215+ m { _values = Map.insert name (Value comment tipe) (_values m) }

216+

217+

218+getComment :: A.Region -> Name.Name -> Info -> Result i w Comment

219+getComment region name info =

220+ case Map.lookup name (_iComments info) of

221+ Nothing ->

222+ Result.throw (E.NoComment name region)

223+

224+ Just comment ->

225+ Result.ok comment

226+

227+

228+getType :: Name.Name -> Info -> Result i w Type.Type

229+getType name info =

230+ case _iValues info ! name of

231+ A.At defRegion Nothing ->

232+ Result.throw (E.NoAnnotation name defRegion)

233+

234+ A.At _ (Just tipe) ->

235+ Result.ok (Extract.fromType tipe)

236+

237+

238+dector :: Can.Ctor -> (Name.Name, [Type.Type])

239+dector (Can.Ctor name _ _ args) =

240+ ( name, map Extract.fromType args )

241+

242+

243+

244+-- GATHER TYPES

245+

246+

247+type Types =

248+ Map.Map Name.Name (A.Located (Maybe Can.Type))

249+

250+

251+gatherTypes :: Can.Decls -> Types -> Types

252+gatherTypes decls types =

253+ case decls of

254+ Can.Declare def subDecls ->

255+ gatherTypes subDecls (addDef types def)

256+

257+ Can.DeclareRec defs subDecls ->

258+ gatherTypes subDecls (List.foldl' addDef types defs)

259+

260+ Can.SaveTheEnvironment ->

261+ types

262+

263+

264+addDef :: Types -> Can.Def -> Types

265+addDef types def =

266+ case def of

267+ Can.Def (A.At region name) _ _ ->

268+ Map.insert name (A.At region Nothing) types

269+

270+ Can.TypedDef (A.At region name) _ typedArgs _ resultType ->

271+ let

272+ tipe =

273+ foldr Can.TLambda resultType (map snd typedArgs)

274+ in

275+ Map.insert name (A.At region (Just tipe)) types

compiler/src/Parse/Expression.hs+43−51

@@ -16,7 +16,7 @@ import qualified Parse.Shader as Shader

1616import qualified Parse.Space as Space

1717import qualified Parse.Symbol as Symbol

1818import qualified Parse.Type as Type

19−import qualified Parse.String as String

19+import qualified Parse.Utf8 as Utf8

2020import qualified Parse.Variable as Var

2121import Parse.Primitives hiding (State)

2222import qualified Parse.Primitives as P

@@ -46,13 +46,13 @@ term =

4646

4747string :: A.Position -> Parser E.Expr Src.Expr

4848string start =

49− do str <- String.string E.Start E.String

49+ do str <- Utf8.string E.Start E.String

5050 addEnd start (Src.Str str)

5151

5252

5353character :: A.Position -> Parser E.Expr Src.Expr

5454character start =

55− do chr <- String.character E.Start E.Char

55+ do chr <- Utf8.character E.Start E.Char

5656 addEnd start (Src.Chr chr)

5757

5858

@@ -128,46 +128,38 @@ chompListEnd start entries =

128128tuple :: A.Position -> Parser E.Expr Src.Expr

129129tuple start@(A.Position row col) =

130130 inContext E.Tuple (word1 0x28 {-(-} E.Start) $

131− do before <- getPosition

132− Space.chompAndCheckIndent E.TupleSpace E.TupleIndentExpr1

133− after <- getPosition

134− if before /= after

135− then

136− do (entry, end) <- specialize E.TupleExpr expression

137− Space.checkIndent end E.TupleIndentEnd

138− chompTupleEnd start entry []

139− else

140− oneOf E.TupleIndentExpr1

141− [

142− do op <- Symbol.operator E.TupleIndentExpr1 E.TupleOperatorReserved

143− if op == "-"

144− then

145− oneOf E.TupleOperatorClose

146− [

147− do word1 0x29 {-)-} E.TupleOperatorClose

148− addEnd start (Src.Op op)

149− ,

150− do (entry, end) <-

151− specialize E.TupleExpr $

152− do negatedExpr@(A.At (A.Region _ end) _) <- term

153− Space.chomp E.Space

154− let exprStart = A.Position row (col + 2)

155− let expr = A.at exprStart end (Src.Negate negatedExpr)

156− chompExprEnd exprStart (State [] expr [] end)

157− Space.checkIndent end E.TupleIndentEnd

158− chompTupleEnd start entry []

159− ]

160− else

161− do word1 0x29 {-)-} E.TupleOperatorClose

162− addEnd start (Src.Op op)

163− ,

164− do word1 0x29 {-)-} E.TupleIndentExpr1

165− addEnd start Src.Unit

166− ,

167− do (entry, end) <- specialize E.TupleExpr expression

168− Space.checkIndent end E.TupleIndentEnd

169− chompTupleEnd start entry []

170− ]

131+ oneOf E.TupleIndentExpr1

132+ [

133+ do op <- Symbol.operator E.TupleIndentExpr1 E.TupleOperatorReserved

134+ if op == "-"

135+ then

136+ oneOf E.TupleOperatorClose

137+ [

138+ do word1 0x29 {-)-} E.TupleOperatorClose

139+ addEnd start (Src.Op op)

140+ ,

141+ do (entry, end) <-

142+ specialize E.TupleExpr $

143+ do negatedExpr@(A.At (A.Region _ end) _) <- term

144+ Space.chomp E.Space

145+ let exprStart = A.Position row (col + 2)

146+ let expr = A.at exprStart end (Src.Negate negatedExpr)

147+ chompExprEnd exprStart (State [] expr [] end)

148+ Space.checkIndent end E.TupleIndentEnd

149+ chompTupleEnd start entry []

150+ ]

151+ else

152+ do word1 0x29 {-)-} E.TupleOperatorClose

153+ addEnd start (Src.Op op)

154+ ,

155+ do word1 0x29 {-)-} E.TupleIndentExpr1

156+ addEnd start Src.Unit

157+ ,

158+ do Space.chompAndCheckIndent E.TupleSpace E.TupleIndentExpr1

159+ (entry, end) <- specialize E.TupleExpr expression

160+ Space.checkIndent end E.TupleIndentEnd

161+ chompTupleEnd start entry []

162+ ]

171163

172164

173165chompTupleEnd :: A.Position -> Src.Expr -> [Src.Expr] -> Parser E.Tuple Src.Expr

@@ -275,14 +267,14 @@ chompExprEnd :: A.Position -> State -> Space.Parser E.Expr Src.Expr

275267chompExprEnd start (State ops expr args end) =

276268 oneOfWithFallback

277269 [ -- argument

278− do Space.checkIndent end E.Start

270+ do Space.checkIndent end E.IndentMoreExpr

279271 arg <- term

280272 newEnd <- getPosition

281273 Space.chomp E.Space

282274 chompExprEnd start (State ops expr (arg:args) newEnd)

283275

284276 , -- operator

285− do Space.checkIndent end E.Start

277+ do Space.checkIndent end E.IndentMoreExpr

286278 op@(A.At (A.Region opStart opEnd) opName) <- addLocation (Symbol.operator E.Start E.OperatorReserved)

287279 Space.chompAndCheckIndent E.Space (E.IndentOperatorRight opName)

288280 newStart <- getPosition

@@ -543,19 +535,19 @@ chompDefArgsAndBody start name tipe revArgs =

543535chompMatchingName :: Name.Name -> Parser E.Def (A.Located Name.Name)

544536chompMatchingName expectedName =

545537 let

546− (P.Parser parserL) = Var.lower E.DefNameRepeat

538+ (P.Parser parserL) = Var.lower (E.DefNameRepeat expectedName)

547539 in

548− P.Parser $ \state@(P.State _ _ _ _ sr sc) cok eok cerr eerr ->

540+ P.Parser $ \state@(P.State _ _ _ sr sc) cok eok cerr eerr ->

549541 let

550− cokL name newState@(P.State _ _ _ _ er ec) =

542+ cokL name newState@(P.State _ _ _ er ec) =

551543 if expectedName == name

552544 then cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState

553− else cerr sr sc (E.DefNameMatch name)

545+ else cerr sr sc (E.DefNameMatch expectedName name)

554546

555− eokL name newState@(P.State _ _ _ _ er ec) =

547+ eokL name newState@(P.State _ _ _ er ec) =

556548 if expectedName == name

557549 then eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState

558− else eerr sr sc (E.DefNameMatch name)

550+ else eerr sr sc (E.DefNameMatch expectedName name)

559551 in

560552 parserL state cokL eokL cerr eerr

561553

compiler/src/Parse/Keyword.hs+16−16

@@ -120,7 +120,7 @@ command_ tx = k7 0x63 0x6F 0x6D 0x6D 0x61 0x6E 0x64 tx

120120

121121subscription_ :: (Row -> Col -> x) -> Parser x ()

122122subscription_ toError =

123− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

123+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

124124 let !pos12 = plusPtr pos 12 in

125125 if pos12 <= end

126126 && P.unsafeIndex ( pos ) == 0x73

@@ -137,7 +137,7 @@ subscription_ toError =

137137 && P.unsafeIndex (plusPtr pos 11) == 0x6E

138138 && Var.getInnerWidth pos12 end == 0

139139 then

140− let !s = P.State src pos12 end indent row (col + 12) in cok () s

140+ let !s = P.State pos12 end indent row (col + 12) in cok () s

141141 else

142142 eerr row col toError

143143

@@ -148,21 +148,21 @@ subscription_ toError =

148148

149149k2 :: Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

150150k2 w1 w2 toError =

151− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

151+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

152152 let !pos2 = plusPtr pos 2 in

153153 if pos2 <= end

154154 && P.unsafeIndex ( pos ) == w1

155155 && P.unsafeIndex (plusPtr pos 1) == w2

156156 && Var.getInnerWidth pos2 end == 0

157157 then

158− let !s = P.State src pos2 end indent row (col + 2) in cok () s

158+ let !s = P.State pos2 end indent row (col + 2) in cok () s

159159 else

160160 eerr row col toError

161161

162162

163163k3 :: Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

164164k3 w1 w2 w3 toError =

165− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

165+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

166166 let !pos3 = plusPtr pos 3 in

167167 if pos3 <= end

168168 && P.unsafeIndex ( pos ) == w1

@@ -170,14 +170,14 @@ k3 w1 w2 w3 toError =

170170 && P.unsafeIndex (plusPtr pos 2) == w3

171171 && Var.getInnerWidth pos3 end == 0

172172 then

173− let !s = P.State src pos3 end indent row (col + 3) in cok () s

173+ let !s = P.State pos3 end indent row (col + 3) in cok () s

174174 else

175175 eerr row col toError

176176

177177

178178k4 :: Word8 -> Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

179179k4 w1 w2 w3 w4 toError =

180− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

180+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

181181 let !pos4 = plusPtr pos 4 in

182182 if pos4 <= end

183183 && P.unsafeIndex ( pos ) == w1

@@ -186,14 +186,14 @@ k4 w1 w2 w3 w4 toError =

186186 && P.unsafeIndex (plusPtr pos 3) == w4

187187 && Var.getInnerWidth pos4 end == 0

188188 then

189− let !s = P.State src pos4 end indent row (col + 4) in cok () s

189+ let !s = P.State pos4 end indent row (col + 4) in cok () s

190190 else

191191 eerr row col toError

192192

193193

194194k5 :: Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

195195k5 w1 w2 w3 w4 w5 toError =

196− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

196+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

197197 let !pos5 = plusPtr pos 5 in

198198 if pos5 <= end

199199 && P.unsafeIndex ( pos ) == w1

@@ -203,14 +203,14 @@ k5 w1 w2 w3 w4 w5 toError =

203203 && P.unsafeIndex (plusPtr pos 4) == w5

204204 && Var.getInnerWidth pos5 end == 0

205205 then

206− let !s = P.State src pos5 end indent row (col + 5) in cok () s

206+ let !s = P.State pos5 end indent row (col + 5) in cok () s

207207 else

208208 eerr row col toError

209209

210210

211211k6 :: Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

212212k6 w1 w2 w3 w4 w5 w6 toError =

213− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

213+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

214214 let !pos6 = plusPtr pos 6 in

215215 if pos6 <= end

216216 && P.unsafeIndex ( pos ) == w1

@@ -221,14 +221,14 @@ k6 w1 w2 w3 w4 w5 w6 toError =

221221 && P.unsafeIndex (plusPtr pos 5) == w6

222222 && Var.getInnerWidth pos6 end == 0

223223 then

224− let !s = P.State src pos6 end indent row (col + 6) in cok () s

224+ let !s = P.State pos6 end indent row (col + 6) in cok () s

225225 else

226226 eerr row col toError

227227

228228

229229k7 :: Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

230230k7 w1 w2 w3 w4 w5 w6 w7 toError =

231− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

231+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

232232 let !pos7 = plusPtr pos 7 in

233233 if pos7 <= end

234234 && P.unsafeIndex ( pos ) == w1

@@ -240,14 +240,14 @@ k7 w1 w2 w3 w4 w5 w6 w7 toError =

240240 && P.unsafeIndex (plusPtr pos 6) == w7

241241 && Var.getInnerWidth pos7 end == 0

242242 then

243− let !s = P.State src pos7 end indent row (col + 7) in cok () s

243+ let !s = P.State pos7 end indent row (col + 7) in cok () s

244244 else

245245 eerr row col toError

246246

247247

248248k8 :: Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

249249k8 w1 w2 w3 w4 w5 w6 w7 w8 toError =

250− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

250+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

251251 let !pos8 = plusPtr pos 8 in

252252 if pos8 <= end

253253 && P.unsafeIndex ( pos ) == w1

@@ -260,6 +260,6 @@ k8 w1 w2 w3 w4 w5 w6 w7 w8 toError =

260260 && P.unsafeIndex (plusPtr pos 7) == w8

261261 && Var.getInnerWidth pos8 end == 0

262262 then

263− let !s = P.State src pos8 end indent row (col + 8) in cok () s

263+ let !s = P.State pos8 end indent row (col + 8) in cok () s

264264 else

265265 eerr row col toError

compiler/src/Parse/Module.hs+143−194

@@ -2,10 +2,9 @@

22{-# LANGUAGE OverloadedStrings #-}

33module Parse.Module

44 ( fromByteString

5− , ProjectType(..)

6− , isKernel

5+ , Header(..)

6+ , Effects(..)

77 , chompImports

8− , chompImport

98 )

109 where

1110

@@ -31,111 +30,102 @@ import qualified Reporting.Error.Syntax as E

3130-- FROM BYTE STRING

3231

3332

34−fromByteString :: ProjectType -> BS.ByteString -> Either E.Error Src.Module

35−fromByteString projectType source =

36− case P.fromByteString (chompModule projectType) E.ModuleBadEnd source of

37− Right modul -> checkModule projectType modul

38− Left err -> Left (E.ParseError err)

39−

40−

41−

42−-- PROJECT TYPE

43−

44−

45−data ProjectType

46− = Package Pkg.Name

47− | Application

48−

33+fromByteString :: Pkg.Name -> BS.ByteString -> Either E.Error Src.Module

34+fromByteString pkg source =

35+ let

36+ parser

37+ | pkg == Pkg.core = core

38+ | Pkg.isKernel pkg = platform

39+ | otherwise = normal

40+ in

41+ case P.fromByteString parser source of

42+ P.Ok outcome _ ->

43+ case outcome of

44+ Right modul -> Right modul

45+ Left err -> Left err

4946

50−isCore :: ProjectType -> Bool

51−isCore projectType =

52− case projectType of

53− Package pkg -> pkg == Pkg.core

54− Application -> False

47+ P.Err err ->

48+ Left (E.ParseError err)

5549

5650

57−isKernel :: ProjectType -> Bool

58−isKernel projectType =

59− case projectType of

60− Package pkg -> Pkg.isKernel pkg

61− Application -> False

6251

52+-- MODULE

6353

6454

65−-- MODULE

55+normal :: Parser E.Module (Either E.Error Src.Module)

56+normal =

57+ do freshLine E.FreshLine

58+ header <- chompHeader

59+ comment <- chompModuleDocComment

60+ imports <- chompImports []

61+ decls <- specialize E.Declarations $ chompDecls []

62+ endOfFile

63+ return (checkModule header comment (Imports.addDefaults imports) [] decls)

6664

6765

68−data Module =

69− Module

70− { _header :: Maybe Header

71− , _imports :: [Src.Import]

72− , _infixes :: [A.Located Src.Infix]

73− , _decls :: [Decl.Decl]

74− }

66+core :: Parser E.Module (Either E.Error Src.Module)

67+core =

68+ do freshLine E.FreshLine

69+ header <- chompHeader

70+ comment <- chompModuleDocComment

71+ imports <- chompImports []

72+ binops <- chompBinops []

73+ decls <- specialize E.Declarations $ chompDecls []

74+ endOfFile

75+ return (checkModule header comment imports binops decls)

7576

7677

77−chompModule :: ProjectType -> Parser E.Module Module

78−chompModule projectType =

79− do header <- chompHeader

80− imports <- chompImports (if isCore projectType then [] else Imports.defaults)

81− infixes <- if isKernel projectType then chompInfixes [] else return []

78+platform :: Parser E.Module (Either E.Error Src.Module)

79+platform =

80+ do freshLine E.FreshLine

81+ header <- chompHeader

82+ comment <- chompModuleDocComment

83+ imports <- chompImports []

84+ binops <- chompBinops []

8285 decls <- specialize E.Declarations $ chompDecls []

83− return (Module header imports infixes decls)

86+ endOfFile

87+ return (checkModule header comment (Imports.addDefaults imports) binops decls)

8488

8589

8690

8791-- CHECK MODULE

8892

8993

90−checkModule :: ProjectType -> Module -> Either E.Error Src.Module

91−checkModule projectType (Module maybeHeader imports infixes decls) =

94+checkModule :: Maybe Header -> Maybe Space.DocComment -> [Src.Import] -> [A.Located Src.Binop] -> [Decl.Decl] -> Either E.Error Src.Module

95+checkModule maybeHeader _maybeDocs imports binops decls =

9296 let

9397 (values, unions, aliases, ports) = categorizeDecls [] [] [] [] decls

9498 in

9599 case maybeHeader of

96− Just (Header name effects exports docs) ->

97− Src.Module (Just name) exports (toDocs docs decls) imports values unions aliases infixes

98− <$> checkEffects projectType ports effects

100+ Just (Header name effects exports) ->

101+ Src.Module (Just name) exports imports values unions aliases binops

102+ <$> checkEffects ports effects

99103

100104 Nothing ->

101105 Right $

102− Src.Module Nothing (A.At A.one Src.Open) (Src.NoDocs A.one) imports values unions aliases infixes $

106+ Src.Module Nothing (A.At A.one Src.Open) imports values unions aliases binops $

103107 case ports of

104108 [] -> Src.NoEffects

105109 _:_ -> Src.Ports ports

106110

107111

108−checkEffects :: ProjectType -> [Src.Port] -> Effects -> Either E.Error Src.Effects

109−checkEffects projectType ports effects =

112+checkEffects :: [Src.Port] -> Effects -> Either E.Error Src.Effects

113+checkEffects ports effects =

110114 case effects of

111115 NoEffects region ->

112116 case ports of

113− [] ->

114− Right Src.NoEffects

115−

116− Src.Port name _ : _ ->

117− case projectType of

118− Package _ -> Left (E.NoPortsInPackage name)

119− Application -> Left (E.UnexpectedPort region)

117+ [] -> Right Src.NoEffects

118+ _:_ -> Left (E.UnexpectedPort region)

120119

121120 Ports region ->

122− case projectType of

123− Package _ ->

124− Left (E.NoPortModulesInPackage region)

125−

126− Application ->

127− case ports of

128− [] -> Left (E.NoPorts region)

129− _:_ -> Right (Src.Ports ports)

121+ case ports of

122+ [] -> Left (E.NoPorts region)

123+ _:_ -> Right (Src.Ports ports)

130124

131125 Manager region manager ->

132− if isKernel projectType then

133− case ports of

134− [] -> Right (Src.Manager region manager)

135− _:_ -> Left (E.UnexpectedPort region)

136− else

137− Left (E.NoEffectsOutsideKernel region)

138−

126+ case ports of

127+ [] -> Right (Src.Manager region manager)

128+ _:_ -> Left (E.UnexpectedPort region)

139129

140130

141131categorizeDecls :: [A.Located Src.Value] -> [A.Located Src.Union] -> [A.Located Src.Alias] -> [Src.Port] -> [Decl.Decl] -> ( [A.Located Src.Value], [A.Located Src.Union], [A.Located Src.Alias], [Src.Port] )

@@ -153,41 +143,6 @@ categorizeDecls values unions aliases ports decls =

153143

154144

155145

156−-- TO DOCS

157−

158−

159−toDocs :: Either A.Region Src.Comment -> [Decl.Decl] -> Src.Docs

160−toDocs comment decls =

161− case comment of

162− Right overview ->

163− Src.YesDocs overview (getComments decls [])

164−

165− Left region ->

166− Src.NoDocs region

167−

168−

169−getComments :: [Decl.Decl] -> [(Name.Name,Src.Comment)] -> [(Name.Name,Src.Comment)]

170−getComments decls comments =

171− case decls of

172− [] ->

173− comments

174−

175− decl:otherDecls ->

176− case decl of

177− Decl.Value c (A.At _ (Src.Value n _ _ _)) -> getComments otherDecls (addComment c n comments)

178− Decl.Union c (A.At _ (Src.Union n _ _ )) -> getComments otherDecls (addComment c n comments)

179− Decl.Alias c (A.At _ (Src.Alias n _ _ )) -> getComments otherDecls (addComment c n comments)

180− Decl.Port c (Src.Port n _ ) -> getComments otherDecls (addComment c n comments)

181−

182−

183−addComment :: Maybe Src.Comment -> A.Located Name.Name -> [(Name.Name,Src.Comment)] -> [(Name.Name,Src.Comment)]

184−addComment maybeComment (A.At _ name) comments =

185− case maybeComment of

186− Just comment -> (name, comment) : comments

187− Nothing -> comments

188−

189−

190−

191146-- FRESH LINES

192147

193148

@@ -197,6 +152,15 @@ freshLine toFreshLineError =

197152 Space.checkFreshLine toFreshLineError

198153

199154

155+endOfFile :: Parser E.Module ()

156+endOfFile =

157+ P.Parser $ \state@(P.State pos end _ row col) _ eok _ eerr ->

158+ if pos < end then

159+ eerr row col E.ModuleEndOfFile

160+ else

161+ eok () state

162+

163+

200164

201165-- CHOMP DECLARATIONS

202166

@@ -205,36 +169,35 @@ chompDecls :: [Decl.Decl] -> Parser E.Decl [Decl.Decl]

205169chompDecls decls =

206170 do (decl, _) <- Decl.declaration

207171 oneOfWithFallback

208− [ do Space.checkFreshLine E.DeclStart

172+ [ do Space.checkFreshLine E.DeclFreshLineStart

209173 chompDecls (decl:decls)

210174 ]

211175 (reverse (decl:decls))

212176

213177

214−chompInfixes :: [A.Located Src.Infix] -> Parser E.Module [A.Located Src.Infix]

215−chompInfixes infixes =

178+chompBinops :: [A.Located Src.Binop] -> Parser E.Module [A.Located Src.Binop]

179+chompBinops binops =

216180 oneOfWithFallback

217181 [ do binop <- Decl.infix_

218− chompInfixes (binop:infixes)

182+ chompBinops (binop:binops)

219183 ]

220− infixes

184+ binops

221185

222186

223187

224188-- MODULE DOC COMMENT

225189

226190

227−chompModuleDocCommentSpace :: Parser E.Module (Either A.Region Src.Comment)

228−chompModuleDocCommentSpace =

229− do (A.At region ()) <- addLocation (freshLine E.FreshLine)

230− oneOfWithFallback

231− [

232− do docComment <- Space.docComment E.ImportStart E.ModuleSpace

233− Space.chomp E.ModuleSpace

234− Space.checkFreshLine E.FreshLine

235− return (Right docComment)

236− ]

237− (Left region)

191+chompModuleDocComment :: Parser E.Module (Maybe Space.DocComment)

192+chompModuleDocComment =

193+ oneOfWithFallback

194+ [

195+ do docComment <- Space.docComment E.ImportStart E.ModuleSpace

196+ Space.chomp E.ModuleSpace

197+ Space.checkFreshLine E.FreshLine

198+ return (Just docComment)

199+ ]

200+ Nothing

238201

239202

240203

@@ -242,7 +205,7 @@ chompModuleDocCommentSpace =

242205

243206

244207data Header =

245− Header (A.Located Name.Name) Effects (A.Located Src.Exposing) (Either A.Region Src.Comment)

208+ Header (A.Located Name.Name) Effects (A.Located Src.Exposing)

246209

247210

248211data Effects

@@ -253,43 +216,40 @@ data Effects

253216

254217chompHeader :: Parser E.Module (Maybe Header)

255218chompHeader =

256− do freshLine E.FreshLine

257− start <- getPosition

219+ do start <- getPosition

258220 oneOfWithFallback

259221 [

260222 -- module MyThing exposing (..)

261223 do Keyword.module_ E.ModuleProblem

262− effectEnd <- getPosition

224+ end <- getPosition

263225 Space.chompAndCheckIndent E.ModuleSpace E.ModuleProblem

264226 name <- addLocation (Var.moduleName E.ModuleName)

265227 Space.chompAndCheckIndent E.ModuleSpace E.ModuleProblem

266228 Keyword.exposing_ E.ModuleProblem

267229 Space.chompAndCheckIndent E.ModuleSpace E.ModuleProblem

268230 exports <- addLocation (specialize E.ModuleExposing exposing)

269− comment <- chompModuleDocCommentSpace

270− return $ Just $

271− Header name (NoEffects (A.Region start effectEnd)) exports comment

231+ freshLine E.FreshLine

232+ return (Just (Header name (NoEffects (A.Region start end)) exports))

272233 ,

273234 -- port module MyThing exposing (..)

274235 do Keyword.port_ E.PortModuleProblem

275236 Space.chompAndCheckIndent E.ModuleSpace E.PortModuleProblem

276237 Keyword.module_ E.PortModuleProblem

277− effectEnd <- getPosition

238+ end <- getPosition

278239 Space.chompAndCheckIndent E.ModuleSpace E.PortModuleProblem

279240 name <- addLocation (Var.moduleName E.PortModuleName)

280241 Space.chompAndCheckIndent E.ModuleSpace E.PortModuleProblem

281242 Keyword.exposing_ E.PortModuleProblem

282243 Space.chompAndCheckIndent E.ModuleSpace E.PortModuleProblem

283244 exports <- addLocation (specialize E.PortModuleExposing exposing)

284− comment <- chompModuleDocCommentSpace

285− return $ Just $

286− Header name (Ports (A.Region start effectEnd)) exports comment

245+ freshLine E.FreshLine

246+ return (Just (Header name (Ports (A.Region start end)) exports))

287247 ,

288248 -- effect module MyThing where { command = MyCmd } exposing (..)

289249 do Keyword.effect_ E.Effect

290250 Space.chompAndCheckIndent E.ModuleSpace E.Effect

291251 Keyword.module_ E.Effect

292− effectEnd <- getPosition

252+ end <- getPosition

293253 Space.chompAndCheckIndent E.ModuleSpace E.Effect

294254 name <- addLocation (Var.moduleName E.ModuleName)

295255 Space.chompAndCheckIndent E.ModuleSpace E.Effect

@@ -300,9 +260,8 @@ chompHeader =

300260 Keyword.exposing_ E.Effect

301261 Space.chompAndCheckIndent E.ModuleSpace E.Effect

302262 exports <- addLocation (specialize (const E.Effect) exposing)

303− comment <- chompModuleDocCommentSpace

304− return $ Just $

305− Header name (Manager (A.Region start effectEnd) manager) exports comment

263+ freshLine E.FreshLine

264+ return (Just (Header name (Manager (A.Region start end) manager) exports))

306265 ]

307266 -- default header

308267 Nothing

@@ -372,33 +331,28 @@ spaces_em =

372331

373332

374333chompImports :: [Src.Import] -> Parser E.Module [Src.Import]

375−chompImports is =

334+chompImports imports =

376335 oneOfWithFallback

377− [ do i <- chompImport

378− chompImports (i:is)

336+ [ do Keyword.import_ E.ImportStart

337+ Space.chompAndCheckIndent E.ModuleSpace E.ImportIndentName

338+ name@(A.At (A.Region _ end) _) <- addLocation (Var.moduleName E.ImportName)

339+ Space.chomp E.ModuleSpace

340+ oneOf E.ImportEnd

341+ [ do Space.checkFreshLine E.ImportEnd

342+ chompImports $

343+ Src.Import name Nothing (Src.Explicit []) : imports

344+ , do Space.checkIndent end E.ImportEnd

345+ oneOf E.ImportAs

346+ [ chompAs name imports

347+ , chompExposing name Nothing imports

348+ ]

349+ ]

379350 ]

380− (reverse is)

351+ (reverse imports)

381352

382353

383−chompImport :: Parser E.Module Src.Import

384−chompImport =

385− do Keyword.import_ E.ImportStart

386− Space.chompAndCheckIndent E.ModuleSpace E.ImportIndentName

387− name@(A.At (A.Region _ end) _) <- addLocation (Var.moduleName E.ImportName)

388− Space.chomp E.ModuleSpace

389− oneOf E.ImportEnd

390− [ do Space.checkFreshLine E.ImportEnd

391− return $ Src.Import name Nothing (Src.Explicit [])

392− , do Space.checkIndent end E.ImportEnd

393− oneOf E.ImportAs

394− [ chompAs name

395− , chompExposing name Nothing

396− ]

397− ]

398−

399−

400−chompAs :: A.Located Name.Name -> Parser E.Module Src.Import

401−chompAs name =

354+chompAs :: A.Located Name.Name -> [Src.Import] -> Parser E.Module [Src.Import]

355+chompAs name imports =

402356 do Keyword.as_ E.ImportAs

403357 Space.chompAndCheckIndent E.ModuleSpace E.ImportIndentAlias

404358 alias <- Var.upper E.ImportAlias

@@ -406,19 +360,21 @@ chompAs name =

406360 Space.chomp E.ModuleSpace

407361 oneOf E.ImportEnd

408362 [ do Space.checkFreshLine E.ImportEnd

409− return $ Src.Import name (Just alias) (Src.Explicit [])

363+ chompImports $

364+ Src.Import name (Just alias) (Src.Explicit []) : imports

410365 , do Space.checkIndent end E.ImportEnd

411− chompExposing name (Just alias)

366+ chompExposing name (Just alias) imports

412367 ]

413368

414369

415−chompExposing :: A.Located Name.Name -> Maybe Name.Name -> Parser E.Module Src.Import

416−chompExposing name maybeAlias =

370+chompExposing :: A.Located Name.Name -> Maybe Name.Name -> [Src.Import] -> Parser E.Module [Src.Import]

371+chompExposing name maybeAlias imports =

417372 do Keyword.exposing_ E.ImportExposing

418373 Space.chompAndCheckIndent E.ModuleSpace E.ImportIndentExposingList

419374 exposed <- specialize E.ImportExposingList exposing

420375 freshLine E.ImportEnd

421− return $ Src.Import name maybeAlias exposed

376+ chompImports $

377+ Src.Import name maybeAlias exposed : imports

422378

423379

424380

@@ -429,24 +385,24 @@ exposing :: Parser E.Exposing Src.Exposing

429385exposing =

430386 do word1 0x28 {-(-} E.ExposingStart

431387 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValue

432− oneOf E.ExposingValue

433− [ do word2 0x2E 0x2E {-..-} E.ExposingValue

388+ oneOf E.ExposingIndentValue

389+ [ do word2 0x2E 0x2E {-..-} E.ExposingIndentValue

434390 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd

435391 word1 0x29 {-)-} E.ExposingEnd

436392 return Src.Open

437− , do exposed <- chompExposed

393+ , do exposed <- addLocation chompExposed

438394 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd

439395 exposingHelp [exposed]

440396 ]

441397

442398

443−exposingHelp :: [Src.Exposed] -> Parser E.Exposing Src.Exposing

399+exposingHelp :: [A.Located Src.Exposed] -> Parser E.Exposing Src.Exposing

444400exposingHelp revExposed =

445401 oneOf E.ExposingEnd

446402 [ do word1 0x2C {-,-} E.ExposingEnd

447403 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValue

448− exposed <- chompExposed

449− Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd

404+ exposed <- addLocation chompExposed

405+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValueEnd

450406 exposingHelp (exposed:revExposed)

451407 , do word1 0x29 {-)-} E.ExposingEnd

452408 return (Src.Explicit (reverse revExposed))

@@ -455,33 +411,26 @@ exposingHelp revExposed =

455411

456412chompExposed :: Parser E.Exposing Src.Exposed

457413chompExposed =

458− do start <- getPosition

459− oneOf E.ExposingValue

460− [ do name <- Var.lower E.ExposingValue

461− end <- getPosition

462− return $ Src.Lower $ A.at start end name

463− , do word1 0x28 {-(-} E.ExposingValue

464− op <- Symbol.operator E.ExposingOperator E.ExposingOperatorReserved

465− word1 0x29 {-)-} E.ExposingOperatorRightParen

466− end <- getPosition

467− return $ Src.Operator (A.Region start end) op

468− , do name <- Var.upper E.ExposingValue

469− end <- getPosition

470− Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd

471− Src.Upper (A.at start end name) <$> privacy

472− ]

414+ oneOf E.ExposingValue

415+ [ Src.Lower <$> Var.lower E.ExposingValue

416+ , do word1 0x28 {-(-} E.ExposingValue

417+ op <- Symbol.operator E.ExposingOperator E.ExposingOperatorReserved

418+ word1 0x29 {-)-} E.ExposingOperatorRightParen

419+ return (Src.Operator op)

420+ , do name <- Var.upper E.ExposingValue

421+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentTypePrivacy

422+ Src.Upper name <$> privacy

423+ ]

473424

474425

475426privacy :: Parser E.Exposing Src.Privacy

476427privacy =

477428 oneOfWithFallback

478429 [ do word1 0x28 {-(-} E.ExposingTypePrivacy

479− Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy

480− start <- getPosition

481− word2 0x2E 0x2E {-..-} E.ExposingTypePrivacy

482− end <- getPosition

483− Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy

484− word1 0x29 {-)-} E.ExposingTypePrivacy

485− return $ Src.Public (A.Region start end)

430+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentTypePrivacyDots

431+ word2 0x2E 0x2E {-..-} E.ExposingTypePrivacyDots

432+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentTypePrivacyEnd

433+ word1 0x29 {-)-} E.ExposingTypePrivacyEnd

434+ return Src.Public

486435 ]

487436 Src.Private

compiler/src/Parse/Number.hs+8−8

@@ -11,11 +11,11 @@ module Parse.Number

1111 where

1212

1313

14+import qualified Data.Utf8 as Utf8

1415import Data.Word (Word8)

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

1617

1718import qualified AST.Utils.Binop as Binop

18−import qualified Elm.Float as EF

1919import Parse.Primitives (Parser, Row, Col)

2020import qualified Parse.Variable as Var

2121import qualified Parse.Primitives as P

@@ -43,12 +43,12 @@ isDecimalDigit word =

4343

4444data Number

4545 = Int Int

46− | Float EF.Float

46+ | Float (Utf8.Under256 Float)

4747

4848

4949number :: (Row -> Col -> x) -> (E.Number -> Row -> Col -> x) -> Parser x Number

5050number toExpectation toError =

51− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

51+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

5252 if pos >= end then

5353 eerr row col toExpectation

5454

@@ -76,16 +76,16 @@ number toExpectation toError =

7676 let

7777 !newCol = col + fromIntegral (minusPtr newPos pos)

7878 !integer = Int n

79− !newState = P.State src newPos end indent row newCol

79+ !newState = P.State newPos end indent row newCol

8080 in

8181 cok integer newState

8282

8383 OkFloat newPos ->

8484 let

8585 !newCol = col + fromIntegral (minusPtr newPos pos)

86− !copy = EF.fromPtr pos newPos

86+ !copy = Utf8.fromPtr pos newPos

8787 !float = Float copy

88− !newState = P.State src newPos end indent row newCol

88+ !newState = P.State newPos end indent row newCol

8989 in

9090 cok float newState

9191

@@ -290,7 +290,7 @@ stepHex pos end word acc

290290

291291precedence :: (Row -> Col -> x) -> Parser x Binop.Precedence

292292precedence toExpectation =

293− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

293+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

294294 if pos >= end then

295295 eerr row col toExpectation

296296

@@ -299,7 +299,7 @@ precedence toExpectation =

299299 if isDecimalDigit word then

300300 cok

301301 (Binop.Precedence (fromIntegral (word - 0x30 {-0-})))

302− (P.State src (plusPtr pos 1) end indent row (col + 1))

302+ (P.State (plusPtr pos 1) end indent row (col + 1))

303303

304304 else

305305 eerr row col toExpectation

compiler/src/Parse/Pattern.hs+22−25

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

1616import qualified Parse.Keyword as Keyword

1717import qualified Parse.Number as Number

1818import qualified Parse.Space as Space

19−import qualified Parse.String as String

19+import qualified Parse.Utf8 as Utf8

2020import qualified Parse.Variable as Var

2121import qualified Parse.Primitives as P

2222import Parse.Primitives (Parser, addLocation, addEnd, getPosition, inContext, oneOf, oneOfWithFallback, word1, word2)

@@ -67,16 +67,13 @@ termHelp start =

6767 return (A.at start end (Src.PInt int))

6868

6969 Number.Float float ->

70− P.Parser $ \(P.State _ _ _ _ row col) _ _ cerr _ ->

71− let

72− width = fromIntegral (Utf8.size float)

73− in

74− cerr row (col - width) (E.PFloat width)

70+ P.Parser $ \(P.State _ _ _ row col) _ _ cerr _ ->

71+ cerr row col (E.PFloat (Utf8.size float))

7572 ,

76− do str <- String.string E.PStart E.PString

73+ do str <- Utf8.string E.PStart E.PString

7774 addEnd start (Src.PStr str)

7875 ,

79− do chr <- String.character E.PStart E.PChar

76+ do chr <- Utf8.character E.PStart E.PChar

8077 addEnd start (Src.PChr chr)

8178 ]

8279

@@ -87,7 +84,7 @@ termHelp start =

8784

8885wildcard :: Parser E.Pattern ()

8986wildcard =

90− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

87+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

9188 if pos == end || P.unsafeIndex pos /= 0x5F {- _ -} then

9289 eerr row col E.PStart

9390 else

@@ -96,10 +93,10 @@ wildcard =

9693 !newCol = col + 1

9794 in

9895 if Var.getInnerWidth newPos end > 0 then

99− let (# badPos, badCol #) = Var.chompInnerChars newPos end newCol in

100− cerr row col (E.PWildcardNotVar (Name.fromPtr pos badPos) (fromIntegral (badCol - col)))

96+ let (# _, badCol #) = Var.chompInnerChars newPos end newCol in

97+ cerr row col (E.PWildcardNotVar (fromIntegral (badCol - col)))

10198 else

102− let !newState = P.State src newPos end indent row newCol in

99+ let !newState = P.State newPos end indent row newCol in

103100 cok () newState

104101

105102

@@ -129,7 +126,7 @@ recordHelp start vars =

129126 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd

130127 recordHelp start (var:vars)

131128 , do word1 0x7D {-}-} E.PRecordEnd

132− addEnd start (Src.PRecord (reverse vars))

129+ addEnd start (Src.PRecord vars)

133130 ]

134131

135132

@@ -140,7 +137,7 @@ recordHelp start vars =

140137tuple :: A.Position -> Parser E.Pattern Src.Pattern

141138tuple start =

142139 inContext E.PTuple (word1 0x28 {-(-} E.PStart) $

143− do Space.chompAndCheckIndent E.PTupleSpace E.PTupleIndentExpr1

140+ do Space.chompAndCheckIndent E.PTupleSpace E.PTupleIndentOpen

144141 oneOf E.PTupleOpen

145142 [ do (pattern, end) <- P.specialize E.PTupleExpr expression

146143 Space.checkIndent end E.PTupleIndentEnd

@@ -154,7 +151,7 @@ tupleHelp :: A.Position -> Src.Pattern -> [Src.Pattern] -> Parser E.PTuple Src.P

154151tupleHelp start firstPattern revPatterns =

155152 oneOf E.PTupleEnd

156153 [ do word1 0x2C {-,-} E.PTupleEnd

157− Space.chompAndCheckIndent E.PTupleSpace E.PTupleIndentExprN

154+ Space.chompAndCheckIndent E.PTupleSpace E.PTupleIndentExpr

158155 (pattern, end) <- P.specialize E.PTupleExpr expression

159156 Space.checkIndent end E.PTupleIndentEnd

160157 tupleHelp start firstPattern (pattern : revPatterns)

@@ -205,18 +202,18 @@ listHelp start patterns =

205202expression :: Space.Parser E.Pattern Src.Pattern

206203expression =

207204 do start <- getPosition

208− ePart <- exprPart

209− exprHelp start [] ePart

205+ cTerm <- exprTerm

206+ exprHelp start [] cTerm

210207

211208

212209exprHelp :: A.Position -> [Src.Pattern] -> (Src.Pattern, A.Position) -> Space.Parser E.Pattern Src.Pattern

213−exprHelp start revPatterns (pattern, end) =

210+exprHelp start patterns (pattern, end) =

214211 oneOfWithFallback

215212 [ do Space.checkIndent end E.PIndentStart

216213 word2 0x3A 0x3A {-::-} E.PStart

217214 Space.chompAndCheckIndent E.PSpace E.PIndentStart

218− ePart <- exprPart

219− exprHelp start (pattern:revPatterns) ePart

215+ cTerm <- exprTerm

216+ exprHelp start (pattern:patterns) cTerm

220217 , do Space.checkIndent end E.PIndentStart

221218 Keyword.as_ E.PStart

222219 Space.chompAndCheckIndent E.PSpace E.PIndentAlias

@@ -226,11 +223,11 @@ exprHelp start revPatterns (pattern, end) =

226223 Space.chomp E.PSpace

227224 let alias = A.at nameStart newEnd name

228225 return

229− ( A.at start newEnd (Src.PAlias (List.foldl' cons pattern revPatterns) alias)

226+ ( A.at start newEnd (Src.PAlias (List.foldl' cons pattern patterns) alias)

230227 , newEnd

231228 )

232229 ]

233− ( List.foldl' cons pattern revPatterns

230+ ( List.foldl' cons pattern patterns

234231 , end

235232 )

236233

@@ -241,11 +238,11 @@ cons tl hd =

241238

242239

243240

244−-- EXPRESSION PART

241+-- EXPRESSION TERM

245242

246243

247−exprPart :: Space.Parser E.Pattern Src.Pattern

248−exprPart =

244+exprTerm :: Space.Parser E.Pattern Src.Pattern

245+exprTerm =

249246 oneOf E.PStart

250247 [

251248 do start <- getPosition

compiler/src/Parse/Primitives.hs+47−95

@@ -1,7 +1,8 @@

11{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing #-}

2−{-# LANGUAGE BangPatterns, Rank2Types, UnboxedTuples #-}

2+{-# LANGUAGE BangPatterns, Rank2Types, UnboxedTuples, OverloadedStrings #-}

33module Parse.Primitives

4− ( fromByteString

4+ ( Result(..)

5+ , fromByteString

56 , Parser(..)

67 , State(..)

78 , Row

@@ -12,20 +13,18 @@ module Parse.Primitives

1213 , getIndent, setIndent, withIndent, withBacksetIndent

1314 , word1, word2

1415 , unsafeIndex, isWord, getCharWidth

15− , Snippet(..)

16− , fromSnippet

1716 )

1817 where

1918

2019

2120import Prelude hiding (length)

2221import qualified Control.Applicative as Applicative (Applicative(..))

22+import Control.Monad

2323import qualified Data.ByteString.Internal as B

2424import Data.Word (Word8, Word16)

2525import Foreign.Ptr (Ptr, plusPtr)

2626import Foreign.Storable (peek)

27−import Foreign.ForeignPtr (ForeignPtr, touchForeignPtr)

28−import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

27+import GHC.ForeignPtr (touchForeignPtr, unsafeForeignPtrToPtr)

2928

3029import qualified Reporting.Annotation as A

3130

@@ -46,10 +45,9 @@ newtype Parser x a =

4645 )

4746

4847

49−data State = -- PERF try taking some out to avoid allocation

48+data State = -- TODO try adding UNPACK to everything

5049 State

51− { _src :: ForeignPtr Word8

52− , _pos :: !(Ptr Word8)

50+ { _pos :: !(Ptr Word8)

5351 , _end :: !(Ptr Word8)

5452 , _indent :: !Word16

5553 , _row :: !Row

@@ -85,23 +83,7 @@ instance Applicative.Applicative (Parser x) where

8583 pure = return

8684

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

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

89− Parser $ \state cok eok cerr eerr ->

90− let

91− cokF func s1 =

92− let

93− cokA arg s2 = cok (func arg) s2

94− in

95− parserArg s1 cokA cokA cerr cerr

96−

97− eokF func s1 =

98− let

99− cokA arg s2 = cok (func arg) s2

100− eokA arg s2 = eok (func arg) s2

101− in

102− parserArg s1 cokA eokA cerr eerr

103− in

104− parserFunc state cokF eokF cerr eerr

86+ (<*>) = ap

10587

10688

10789

@@ -135,7 +117,7 @@ oneOfHelp state cok eok cerr eerr toError parsers =

135117

136118 [] ->

137119 let

138− (State _ _ _ _ row col) = state

120+ (State _ _ _ row col) = state

139121 in

140122 eerr row col toError

141123

@@ -145,7 +127,7 @@ oneOfHelp state cok eok cerr eerr toError parsers =

145127

146128

147129{-# INLINE oneOfWithFallback #-}

148−oneOfWithFallback :: [Parser x a] -> a -> Parser x a -- PERF is this function okay? Worried about allocation/laziness with fallback values.

130+oneOfWithFallback :: [Parser x a] -> a -> Parser x a -- TODO is this function okay? Worried about allocation/laziness with fallback values.

149131oneOfWithFallback parsers fallback =

150132 Parser $ \state cok eok cerr _ ->

151133 oowfHelp state cok eok cerr parsers fallback

@@ -201,56 +183,26 @@ instance Monad (Parser x) where

201183-- FROM BYTESTRING

202184

203185

204−fromByteString :: Parser x a -> (Row -> Col -> x) -> B.ByteString -> Either x a

205−fromByteString (Parser parser) toBadEnd (B.PS fptr offset length) =

186+data Result x a

187+ = Ok !a State

188+ | Err x

189+

190+

191+fromByteString :: Parser x a -> B.ByteString -> Result x a

192+fromByteString (Parser parser) (B.PS fp offset length) =

206193 B.accursedUnutterablePerformIO $

207194 let

208− toOk' = toOk toBadEnd

209− !pos = plusPtr (unsafeForeignPtrToPtr fptr) offset

195+ !pos = plusPtr (unsafeForeignPtrToPtr fp) offset

210196 !end = plusPtr pos length

211− !result = parser (State fptr pos end 0 1 1) toOk' toOk' toErr toErr

197+ !result = parser (State pos end 0 1 1) Ok Ok toErr toErr

212198 in

213− do touchForeignPtr fptr

199+ do touchForeignPtr fp

214200 return result

215201

216202

217−toOk :: (Row -> Col -> x) -> a -> State -> Either x a

218−toOk toBadEnd !a (State _ pos end _ row col) =

219− if pos == end

220− then Right a

221− else Left (toBadEnd row col)

222−

223−

224−toErr :: Row -> Col -> (Row -> Col -> x) -> Either x a

203+toErr :: Row -> Col -> (Row -> Col -> x) -> Result x a

225204toErr row col toError =

226− Left (toError row col)

227−

228−

229−

230−-- FROM SNIPPET

231−

232−

233−data Snippet =

234− Snippet

235− { _fptr :: ForeignPtr Word8

236− , _offset :: Int

237− , _length :: Int

238− , _offRow :: Row

239− , _offCol :: Col

240− }

241−

242−

243−fromSnippet :: Parser x a -> (Row -> Col -> x) -> Snippet -> Either x a

244−fromSnippet (Parser parser) toBadEnd (Snippet fptr offset length row col) =

245− B.accursedUnutterablePerformIO $

246− let

247− toOk' = toOk toBadEnd

248− !pos = plusPtr (unsafeForeignPtrToPtr fptr) offset

249− !end = plusPtr pos length

250− !result = parser (State fptr pos end 0 row col) toOk' toOk' toErr toErr

251− in

252− do touchForeignPtr fptr

253− return result

205+ Err (toError row col)

254206

255207

256208

@@ -259,30 +211,30 @@ fromSnippet (Parser parser) toBadEnd (Snippet fptr offset length row col) =

259211

260212getCol :: Parser x Word16

261213getCol =

262− Parser $ \state@(State _ _ _ _ _ col) _ eok _ _ ->

214+ Parser $ \state@(State _ _ _ _ col) _ eok _ _ ->

263215 eok col state

264216

265217

266218{-# INLINE getPosition #-}

267219getPosition :: Parser x A.Position

268220getPosition =

269− Parser $ \state@(State _ _ _ _ row col) _ eok _ _ ->

221+ Parser $ \state@(State _ _ _ row col) _ eok _ _ ->

270222 eok (A.Position row col) state

271223

272224

273225addLocation :: Parser x a -> Parser x (A.Located a)

274226addLocation (Parser parser) =

275− Parser $ \state@(State _ _ _ _ sr sc) cok eok cerr eerr ->

227+ Parser $ \state@(State _ _ _ sr sc) cok eok cerr eerr ->

276228 let

277− cok' a s@(State _ _ _ _ er ec) = cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) a) s

278− eok' a s@(State _ _ _ _ er ec) = eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) a) s

229+ cok' a s@(State _ _ _ er ec) = cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) a) s

230+ eok' a s@(State _ _ _ er ec) = eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) a) s

279231 in

280232 parser state cok' eok' cerr eerr

281233

282234

283235addEnd :: A.Position -> a -> Parser x (A.Located a)

284236addEnd start value =

285− Parser $ \state@(State _ _ _ _ row col) _ eok _ _ ->

237+ Parser $ \state@(State _ _ _ row col) _ eok _ _ ->

286238 eok (A.at start (A.Position row col) value) state

287239

288240

@@ -292,37 +244,37 @@ addEnd start value =

292244

293245getIndent :: Parser x Word16

294246getIndent =

295− Parser $ \state@(State _ _ _ indent _ _) _ eok _ _ ->

247+ Parser $ \state@(State _ _ indent _ _) _ eok _ _ ->

296248 eok indent state

297249

298250

299251setIndent :: Word16 -> Parser x ()

300252setIndent indent =

301− Parser $ \(State src pos end _ row col) _ eok _ _ ->

253+ Parser $ \(State pos end _ row col) _ eok _ _ ->

302254 let

303− !newState = State src pos end indent row col

255+ !newState = State pos end indent row col

304256 in

305257 eok () newState

306258

307259

308260withIndent :: Parser x a -> Parser x a

309261withIndent (Parser parser) =

310− Parser $ \(State src pos end oldIndent row col) cok eok cerr eerr ->

262+ Parser $ \(State pos end oldIndent row col) cok eok cerr eerr ->

311263 let

312− cok' a (State s p e _ r c) = cok a (State s p e oldIndent r c)

313− eok' a (State s p e _ r c) = eok a (State s p e oldIndent r c)

264+ cok' a (State p e _ r c) = cok a (State p e oldIndent r c)

265+ eok' a (State p e _ r c) = eok a (State p e oldIndent r c)

314266 in

315− parser (State src pos end col row col) cok' eok' cerr eerr

267+ parser (State pos end col row col) cok' eok' cerr eerr

316268

317269

318270withBacksetIndent :: Word16 -> Parser x a -> Parser x a

319271withBacksetIndent backset (Parser parser) =

320− Parser $ \(State src pos end oldIndent row col) cok eok cerr eerr ->

272+ Parser $ \(State pos end oldIndent row col) cok eok cerr eerr ->

321273 let

322− cok' a (State s p e _ r c) = cok a (State s p e oldIndent r c)

323− eok' a (State s p e _ r c) = eok a (State s p e oldIndent r c)

274+ cok' a (State p e _ r c) = cok a (State p e oldIndent r c)

275+ eok' a (State p e _ r c) = eok a (State p e oldIndent r c)

324276 in

325− parser (State src pos end (col - backset) row col) cok' eok' cerr eerr

277+ parser (State pos end (col - backset) row col) cok' eok' cerr eerr

326278

327279

328280

@@ -331,7 +283,7 @@ withBacksetIndent backset (Parser parser) =

331283

332284inContext :: (x -> Row -> Col -> y) -> Parser y start -> Parser x a -> Parser y a

333285inContext addContext (Parser parserStart) (Parser parserA) =

334− Parser $ \state@(State _ _ _ _ row col) cok eok cerr eerr ->

286+ Parser $ \state@(State _ _ _ row col) cok eok cerr eerr ->

335287 let

336288 cerrA r c tx = cerr row col (addContext (tx r c))

337289 eerrA r c tx = eerr row col (addContext (tx r c))

@@ -344,7 +296,7 @@ inContext addContext (Parser parserStart) (Parser parserA) =

344296

345297specialize :: (x -> Row -> Col -> y) -> Parser x a -> Parser y a

346298specialize addContext (Parser parser) =

347− Parser $ \state@(State _ _ _ _ row col) cok eok cerr eerr ->

299+ Parser $ \state@(State _ _ _ row col) cok eok cerr eerr ->

348300 let

349301 cerr' r c tx = cerr row col (addContext (tx r c))

350302 eerr' r c tx = eerr row col (addContext (tx r c))

@@ -358,9 +310,9 @@ specialize addContext (Parser parser) =

358310

359311word1 :: Word8 -> (Row -> Col -> x) -> Parser x ()

360312word1 word toError =

361− Parser $ \(State src pos end indent row col) cok _ _ eerr ->

313+ Parser $ \(State pos end indent row col) cok _ _ eerr ->

362314 if pos < end && unsafeIndex pos == word then

363− let !newState = State src (plusPtr pos 1) end indent row (col + 1) in

315+ let !newState = State (plusPtr pos 1) end indent row (col + 1) in

364316 cok () newState

365317 else

366318 eerr row col toError

@@ -368,12 +320,12 @@ word1 word toError =

368320

369321word2 :: Word8 -> Word8 -> (Row -> Col -> x) -> Parser x ()

370322word2 w1 w2 toError =

371− Parser $ \(State src pos end indent row col) cok _ _ eerr ->

323+ Parser $ \(State pos end indent row col) cok _ _ eerr ->

372324 let

373325 !pos1 = plusPtr pos 1

374326 in

375327 if pos1 < end && unsafeIndex pos == w1 && unsafeIndex pos1 == w2 then

376− let !newState = State src (plusPtr pos 2) end indent row (col + 2) in

328+ let !newState = State (plusPtr pos 2) end indent row (col + 2) in

377329 cok () newState

378330 else

379331 eerr row col toError

@@ -394,8 +346,8 @@ isWord pos end word =

394346 pos < end && unsafeIndex pos == word

395347

396348

397−getCharWidth :: Word8 -> Int

398−getCharWidth word

349+getCharWidth :: Ptr Word8 -> Ptr Word8 -> Word8 -> Int

350+getCharWidth _pos _end word

399351 | word < 0x80 = 1

400352 | word < 0xc0 = error "Need UTF-8 encoded input. Ran into unrecognized bits."

401353 | word < 0xe0 = 2

compiler/src/Parse/Repl.hsnew file+117

@@ -0,0 +1,117 @@

1+{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+module Parse.Repl

4+ ( Entry(..)

5+ , parseEntry

6+ )

7+ where

8+

9+

10+import qualified Data.ByteString.UTF8 as BS_UTF8

11+import Data.Name (Name)

12+

13+import qualified AST.Source as Src

14+import qualified Parse.Primitives as P

15+import Parse.Utils

16+

17+

18+

19+-- ENTRY

20+

21+

22+data Entry

23+ = Import Name (Maybe Name) Src.Exposing String

24+ | Type Name String

25+ | Def (Maybe Name) String

26+ | Other String

27+ | Annotation

28+ | Port

29+

30+

31+

32+-- PARSE

33+

34+

35+parseEntry :: String -> Entry

36+parseEntry source =

37+ case P.fromByteString parser (BS_UTF8.fromString source) of

38+ P.Ok entry _ ->

39+ entry

40+

41+ P.Err _ _ _ _ ->

42+ Other source

43+

44+

45+parser :: Parser Entry

46+parser =

47+ error "TODO parse the REPL stuff"

48+

49+{-

50+ oneOf

51+ [

52+ do Keyword.import_

53+ spaces

54+ name <- Var.moduleName

55+ alias <- tryAlias

56+ exposing <-

57+ oneOf

58+ [ do spaces

59+ Keyword.exposing_

60+ spaces

61+ Module.exposing

62+ , return (Src.Explicit [])

63+ ]

64+ return (Import name alias exposing source)

65+ ,

66+ do Keyword.port_

67+ return Port

68+ ,

69+ do Keyword.type_

70+ spaces

71+ oneOf

72+ [ do Keyword.alias_

73+ spaces

74+ , return ()

75+ ]

76+ name <- Var.upper

77+ return (Type name source)

78+ ,

79+ do root <- Pattern.term

80+ spaces

81+ case A.toValue root of

82+ Src.PVar name ->

83+ oneOf

84+ [ do word1 0x3A {-:-} E.XXX

85+ return Annotation

86+ , do chompArgs

87+ return (Def (Just name) source)

88+ ]

89+

90+ _ ->

91+ do word1 0x3D {-=-} E.XXX

92+ return (Def Nothing source)

93+ ]

94+

95+

96+chompArgs :: Parser ()

97+chompArgs =

98+ oneOf

99+ [ do Pattern.term

100+ spaces

101+ chompArgs

102+ , do word1 0x3D {-=-} E.XXX

103+ return ()

104+ ]

105+

106+

107+tryAlias :: Parser (Maybe Name)

108+tryAlias =

109+ oneOf

110+ [ try $

111+ do spaces

112+ Keyword.as_

113+ spaces

114+ Just <$> Var.upper

115+ , return Nothing

116+ ]

117+-}

compiler/src/Parse/Shader.hs+17−18

@@ -6,13 +6,12 @@ module Parse.Shader

66 where

77

88

9−import qualified Data.ByteString.Internal as B

10−import qualified Data.ByteString.UTF8 as BS_UTF8

9+import qualified Data.List as List

1110import qualified Data.Map as Map

1211import qualified Data.Name as Name

12+import qualified Data.Utf8 as Utf8

1313import Data.Word (Word8)

14−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

15−import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

14+import Foreign.Ptr (Ptr, plusPtr)

1615import qualified Language.GLSL.Parser as GLP

1716import qualified Language.GLSL.Syntax as GLS

1817import qualified Text.Parsec as Parsec

@@ -35,16 +34,17 @@ shader start@(A.Position row col) =

3534 do block <- parseBlock

3635 shdr <- parseGlsl row col block

3736 end <- P.getPosition

38− return (A.at start end (Src.Shader (Shader.fromChars block) shdr))

37+ let src = List.intercalate "\\n" (lines block)

38+ return (A.at start end (Src.Shader (Utf8.fromChars src) shdr))

3939

4040

4141

4242-- BLOCK

4343

4444

45−parseBlock :: Parser E.Expr [Char]

45+parseBlock :: Parser E.Expr String

4646parseBlock =

47− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

47+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

4848 let

4949 !pos6 = plusPtr pos 6

5050 in

@@ -63,12 +63,11 @@ parseBlock =

6363 case status of

6464 Good ->

6565 let

66− !off = minusPtr pos6 (unsafeForeignPtrToPtr src)

67− !len = minusPtr newPos pos6

68− !block = BS_UTF8.toString (B.PS src off len)

69− !newState = P.State src (plusPtr newPos 2) end indent newRow (newCol + 2)

66+ !block = Utf8.fromPtr pos6 newPos

67+ !source = Utf8.toChars block

68+ !newState = P.State (plusPtr newPos 2) end indent newRow (newCol + 2)

7069 in

71− cok block newState

70+ cok source newState

7271

7372 Unending ->

7473 cerr row col E.EndlessShader

@@ -96,7 +95,7 @@ eatShader pos end row col =

9695 eatShader (plusPtr pos 1) end (row + 1) 1

9796

9897 else

99− let !newPos = plusPtr pos (P.getCharWidth word) in

98+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

10099 eatShader newPos end row (col + 1)

101100

102101

@@ -104,7 +103,7 @@ eatShader pos end row col =

104103-- GLSL

105104

106105

107−parseGlsl :: Row -> Col -> [Char] -> Parser E.Expr Shader.Types

106+parseGlsl :: Row -> Col -> String -> Parser E.Expr Shader.Types

108107parseGlsl startRow startCol src =

109108 case GLP.parse src of

110109 Right (GLS.TranslationUnit decls) ->

@@ -129,9 +128,9 @@ parseGlsl startRow startCol src =

129128 else failure (startRow + row - 1) col msg

130129

131130

132−failure :: Row -> Col -> [Char] -> Parser E.Expr a

131+failure :: Row -> Col -> String -> Parser E.Expr a

133132failure row col msg =

134− P.Parser $ \(P.State _ _ _ _ _ _) _ _ cerr _ ->

133+ P.Parser $ \(P.State _ _ _ _ _) _ _ cerr _ ->

135134 cerr row col (E.ShaderProblem msg)

136135

137136

@@ -144,7 +143,7 @@ emptyTypes =

144143 Shader.Types Map.empty Map.empty Map.empty

145144

146145

147−addInput :: (GLS.StorageQualifier, Shader.Type, [Char]) -> Shader.Types -> Shader.Types

146+addInput :: (GLS.StorageQualifier, Shader.Type, String) -> Shader.Types -> Shader.Types

148147addInput (qual, tipe, name) glDecls =

149148 case qual of

150149 GLS.Attribute -> glDecls { Shader._attribute = Map.insert (Name.fromChars name) tipe (Shader._attribute glDecls) }

@@ -153,7 +152,7 @@ addInput (qual, tipe, name) glDecls =

153152 _ -> error "Should never happen due to `extractInputs` function"

154153

155154

156−extractInputs :: GLS.ExternalDeclaration -> [(GLS.StorageQualifier, Shader.Type, [Char])]

155+extractInputs :: GLS.ExternalDeclaration -> [(GLS.StorageQualifier, Shader.Type, String)]

157156extractInputs decl =

158157 case decl of

159158 GLS.Declaration

compiler/src/Parse/Space.hs+25−24

@@ -10,16 +10,15 @@ module Parse.Space

1010 , checkAligned

1111 , checkFreshLine

1212 --

13+ , DocComment(..)

1314 , docComment

1415 )

1516 where

1617

1718

1819import Data.Word (Word8, Word16)

19−import Foreign.Ptr (Ptr, plusPtr, minusPtr)

20−import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

20+import Foreign.Ptr (Ptr, plusPtr)

2121

22−import qualified AST.Source as Src

2322import Parse.Primitives (Row, Col)

2423import qualified Parse.Primitives as P

2524import qualified Reporting.Annotation as A

@@ -40,14 +39,14 @@ type Parser x a =

4039

4140chomp :: (E.Space -> Row -> Col -> x) -> P.Parser x ()

4241chomp toError =

43− P.Parser $ \(P.State src pos end indent row col) cok _ cerr _ ->

42+ P.Parser $ \(P.State pos end indent row col) cok _ cerr _ ->

4443 let

4544 (# status, newPos, newRow, newCol #) = eatSpaces pos end row col

4645 in

4746 case status of

4847 Good ->

4948 let

50− !newState = P.State src newPos end indent newRow newCol

49+ !newState = P.State newPos end indent newRow newCol

5150 in

5251 cok () newState

5352

@@ -61,7 +60,7 @@ chomp toError =

6160

6261checkIndent :: A.Position -> (Row -> Col -> x) -> P.Parser x ()

6362checkIndent (A.Position endRow endCol) toError =

64− P.Parser $ \state@(P.State _ _ _ indent _ col) _ eok _ eerr ->

63+ P.Parser $ \state@(P.State _ _ indent _ col) _ eok _ eerr ->

6564 if col > indent && col > 1

6665 then eok () state

6766 else eerr endRow endCol toError

@@ -69,7 +68,7 @@ checkIndent (A.Position endRow endCol) toError =

6968

7069checkAligned :: (Word16 -> Row -> Col -> x) -> P.Parser x ()

7170checkAligned toError =

72− P.Parser $ \state@(P.State _ _ _ indent row col) _ eok _ eerr ->

71+ P.Parser $ \state@(P.State _ _ indent row col) _ eok _ eerr ->

7372 if col == indent

7473 then eok () state

7574 else eerr row col (toError indent)

@@ -77,7 +76,7 @@ checkAligned toError =

7776

7877checkFreshLine :: (Row -> Col -> x) -> P.Parser x ()

7978checkFreshLine toError =

80− P.Parser $ \state@(P.State _ _ _ _ row col) _ eok _ eerr ->

79+ P.Parser $ \state@(P.State _ _ _ row col) _ eok _ eerr ->

8180 if col == 1

8281 then eok () state

8382 else eerr row col toError

@@ -89,7 +88,7 @@ checkFreshLine toError =

8988

9089chompAndCheckIndent :: (E.Space -> Row -> Col -> x) -> (Row -> Col -> x) -> P.Parser x ()

9190chompAndCheckIndent toSpaceError toIndentError =

92− P.Parser $ \(P.State src pos end indent row col) cok _ cerr _ ->

91+ P.Parser $ \(P.State pos end indent row col) cok _ cerr _ ->

9392 let

9493 (# status, newPos, newRow, newCol #) = eatSpaces pos end row col

9594 in

@@ -99,7 +98,7 @@ chompAndCheckIndent toSpaceError toIndentError =

9998 then

10099

101100 let

102− !newState = P.State src newPos end indent newRow newCol

101+ !newState = P.State newPos end indent newRow newCol

103102 in

104103 cok () newState

105104

@@ -157,7 +156,7 @@ eatSpaces pos end row col =

157156-- LINE COMMENTS

158157

159158

160−eatLineComment :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> (# Status, Ptr Word8, Row, Col #)

159+eatLineComment :: Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> (# Status, Ptr Word8, Word16, Word16 #)

161160eatLineComment pos end row col =

162161 if pos >= end then

163162 (# Good, pos, row, col #)

@@ -167,7 +166,7 @@ eatLineComment pos end row col =

167166 if word == 0x0A {- \n -} then

168167 eatSpaces (plusPtr pos 1) end (row + 1) 1

169168 else

170− let !newPos = plusPtr pos (P.getCharWidth word) in

169+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

171170 eatLineComment newPos end row (col + 1)

172171

173172

@@ -208,7 +207,7 @@ data MultiStatus

208207 | MultiEndless

209208

210209

211−eatMultiCommentHelp :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Word16 -> (# MultiStatus, Ptr Word8, Row, Col #)

210+eatMultiCommentHelp :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Word16 -> (# MultiStatus, Ptr Word8, Word16, Word16 #)

212211eatMultiCommentHelp pos end row col openComments =

213212 if pos >= end then

214213 (# MultiEndless, pos, row, col #)

@@ -231,7 +230,7 @@ eatMultiCommentHelp pos end row col openComments =

231230 eatMultiCommentHelp (plusPtr pos 2) end row (col + 2) (openComments + 1)

232231

233232 else

234− let !newPos = plusPtr pos (P.getCharWidth word) in

233+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

235234 eatMultiCommentHelp newPos end row (col + 1) openComments

236235

237236

@@ -239,9 +238,16 @@ eatMultiCommentHelp pos end row col openComments =

239238-- DOCUMENTATION COMMENT

240239

241240

242−docComment :: (Row -> Col -> x) -> (E.Space -> Row -> Col -> x) -> P.Parser x Src.Comment

241+data DocComment =

242+ DocComment

243+ { _start :: Ptr Word8

244+ , _end :: Ptr Word8

245+ }

246+

247+

248+docComment :: (Row -> Col -> x) -> (E.Space -> Row -> Col -> x) -> P.Parser x DocComment

243249docComment toExpectation toSpaceError =

244− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

250+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

245251 let

246252 !pos3 = plusPtr pos 3

247253 in

@@ -251,19 +257,14 @@ docComment toExpectation toSpaceError =

251257 && P.unsafeIndex (plusPtr pos 2) == 0x7C {- | -}

252258 then

253259 let

254− !col3 = col + 3

255−

256260 (# status, newPos, newRow, newCol #) =

257− eatMultiCommentHelp pos3 end row col3 1

261+ eatMultiCommentHelp pos3 end row (col + 3) 1

258262 in

259263 case status of

260264 MultiGood ->

261265 let

262− !off = minusPtr pos3 (unsafeForeignPtrToPtr src)

263− !len = minusPtr newPos pos3 - 2

264− !snippet = P.Snippet src off len row col3

265− !comment = Src.Comment snippet

266− !newState = P.State src newPos end indent newRow newCol

266+ !comment = DocComment pos3 (plusPtr newPos (-2))

267+ !newState = P.State newPos end indent newRow newCol

267268 in

268269 cok comment newState

269270

compiler/src/Parse/Symbol.hs+3−3

@@ -33,14 +33,14 @@ data BadOperator

3333

3434operator :: (Row -> Col -> x) -> (BadOperator -> Row -> Col -> x) -> Parser x Name.Name

3535operator toExpectation toError =

36− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

36+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

3737 let !newPos = chompOps pos end in

3838 if pos == newPos then

3939 eerr row col toExpectation

4040

4141 else

4242 case Name.fromPtr pos newPos of

43− "." -> eerr row col (toError BadDot)

43+ "." -> cerr row col (toError BadDot)

4444 "|" -> cerr row col (toError BadPipe)

4545 "->" -> cerr row col (toError BadArrow)

4646 "=" -> cerr row col (toError BadEquals)

@@ -48,7 +48,7 @@ operator toExpectation toError =

4848 op ->

4949 let

5050 !newCol = col + fromIntegral (minusPtr newPos pos)

51− !newState = P.State src newPos end indent row newCol

51+ !newState = P.State newPos end indent row newCol

5252 in

5353 cok op newState

5454

compiler/src/Parse/Type.hs+3−3

@@ -47,7 +47,7 @@ term =

4747 oneOf E.TTupleOpen

4848 [ do word1 0x29 {-)-} E.TTupleOpen

4949 addEnd start Src.TUnit

50− , do Space.chompAndCheckIndent E.TTupleSpace E.TTupleIndentType1

50+ , do Space.chompAndCheckIndent E.TTupleSpace E.TTupleIndentType

5151 (tipe, end) <- specialize E.TTupleType expression

5252 Space.checkIndent end E.TTupleIndentEnd

5353 chompTupleEnd start tipe []

@@ -95,7 +95,7 @@ expression =

9595 ]

9696 oneOfWithFallback

9797 [ do Space.checkIndent end1 E.TIndentStart -- should never trigger

98− word2 0x2D 0x3E {-->-} E.TStart -- could just be another type instead

98+ word2 0x2D 0x3E {-->-} E.TArrow

9999 Space.chompAndCheckIndent E.TSpace E.TIndentStart

100100 (tipe2, end2) <- expression

101101 let tipe = A.at start end2 (Src.TLambda tipe1 tipe2)

@@ -147,7 +147,7 @@ chompTupleEnd :: A.Position -> Src.Type -> [Src.Type] -> Parser E.TTuple Src.Typ

147147chompTupleEnd start firstType revTypes =

148148 oneOf E.TTupleEnd

149149 [ do word1 0x2C {-,-} E.TTupleEnd

150− Space.chompAndCheckIndent E.TTupleSpace E.TTupleIndentTypeN

150+ Space.chompAndCheckIndent E.TTupleSpace E.TTupleIndentType

151151 (tipe, end) <- specialize E.TTupleType expression

152152 Space.checkIndent end E.TTupleIndentEnd

153153 chompTupleEnd start firstType (tipe : revTypes)

compiler/src/Parse/String.hs → compiler/src/Parse/Utf8.hsrenamed+36−37

@@ -1,6 +1,6 @@

11{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}

22{-# LANGUAGE BangPatterns, MagicHash, OverloadedStrings, UnboxedTuples #-}

3−module Parse.String

3+module Parse.Utf8

44 ( string

55 , character

66 )

@@ -11,7 +11,6 @@ import qualified Data.Utf8 as Utf8

1111import Data.Word (Word8, Word16)

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

1313

14−import qualified Elm.String as ES

1514import Parse.Primitives (Parser, Row, Col)

1615import qualified Parse.Number as Number

1716import qualified Parse.Primitives as P

@@ -22,9 +21,9 @@ import qualified Reporting.Error.Syntax as E

2221-- CHARACTER

2322

2423

25−character :: (Row -> Col -> x) -> (E.Char -> Row -> Col -> x) -> Parser x ES.String

24+character :: (Row -> Col -> x) -> (E.Char -> Row -> Col -> x) -> Parser x Utf8.String

2625character toExpectation toError =

27− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

26+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

2827 if pos >= end || P.unsafeIndex pos /= 0x27 {- ' -} then

2928 eerr row col toExpectation

3029

@@ -35,8 +34,8 @@ character toExpectation toError =

3534 cerr row col (toError (E.CharNotString (fromIntegral (newCol - col))))

3635 else

3736 let

38− !newState = P.State src newPos end indent row newCol

39− !char = ES.fromChunks [mostRecent]

37+ !newState = P.State newPos end indent row newCol

38+ !char = Utf8.fromChunks [mostRecent]

4039 in

4140 cok char newState

4241

@@ -48,12 +47,12 @@ character toExpectation toError =

4847

4948

5049data CharResult

51− = Good (Ptr Word8) Col Word16 ES.Chunk

50+ = Good (Ptr Word8) Col Word16 Utf8.Chunk

5251 | CharEndless Col

5352 | CharEscape Row Col E.Escape

5453

5554

56−chompChar :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Word16 -> ES.Chunk -> CharResult

55+chompChar :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Word16 -> Utf8.Chunk -> CharResult

5756chompChar pos end row col numChars mostRecent =

5857 if pos >= end then

5958 CharEndless col

@@ -74,10 +73,10 @@ chompChar pos end row col numChars mostRecent =

7473 else if word == 0x5C {- \ -} then

7574 case eatEscape (plusPtr pos 1) end row col of

7675 EscapeNormal ->

77− chompChar (plusPtr pos 2) end row (col + 2) (numChars + 1) (ES.Slice pos 2)

76+ chompChar (plusPtr pos 2) end row (col + 2) (numChars + 1) (Utf8.Slice pos 2)

7877

7978 EscapeUnicode delta code ->

80− chompChar (plusPtr pos delta) end row (col + fromIntegral delta) (numChars + 1) (ES.CodePoint code)

79+ chompChar (plusPtr pos delta) end row (col + fromIntegral delta) (numChars + 1) (Utf8.CodePoint code)

8180

8281 EscapeProblem r c badEscape ->

8382 CharEscape r c badEscape

@@ -87,19 +86,19 @@ chompChar pos end row col numChars mostRecent =

8786

8887 else

8988 let

90− !width = P.getCharWidth word

89+ !width = P.getCharWidth pos end word

9190 !newPos = plusPtr pos width

9291 in

93− chompChar newPos end row (col + 1) (numChars + 1) (ES.Slice pos width)

92+ chompChar newPos end row (col + 1) (numChars + 1) (Utf8.Slice pos width)

9493

9594

9695

9796-- STRINGS

9897

9998

100−string :: (Row -> Col -> x) -> (E.String -> Row -> Col -> x) -> Parser x ES.String

99+string :: (Row -> Col -> x) -> (E.String -> Row -> Col -> x) -> Parser x Utf8.String

101100string toExpectation toError =

102− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

101+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

103102 if isDoubleQuote pos end then

104103

105104 let

@@ -122,7 +121,7 @@ string toExpectation toError =

122121 Ok newPos newRow newCol utf8 ->

123122 let

124123 !newState =

125− P.State src newPos end indent newRow newCol

124+ P.State newPos end indent newRow newCol

126125 in

127126 cok utf8 newState

128127

@@ -140,32 +139,32 @@ isDoubleQuote pos end =

140139

141140

142141data StringResult

143− = Ok (Ptr Word8) Row Col !ES.String

142+ = Ok (Ptr Word8) Row Col !Utf8.String

144143 | Err Row Col E.String

145144

146145

147−finalize :: Ptr Word8 -> Ptr Word8 -> [ES.Chunk] -> ES.String

146+finalize :: Ptr Word8 -> Ptr Word8 -> [Utf8.Chunk] -> Utf8.String

148147finalize start end revChunks =

149− ES.fromChunks $ reverse $

148+ Utf8.fromChunks $ reverse $

150149 if start == end then

151150 revChunks

152151 else

153− ES.Slice start (minusPtr end start) : revChunks

152+ Utf8.Slice start (minusPtr end start) : revChunks

154153

155154

156−addEscape :: ES.Chunk -> Ptr Word8 -> Ptr Word8 -> [ES.Chunk] -> [ES.Chunk]

155+addEscape :: Utf8.Chunk -> Ptr Word8 -> Ptr Word8 -> [Utf8.Chunk] -> [Utf8.Chunk]

157156addEscape chunk start end revChunks =

158157 if start == end then

159158 chunk : revChunks

160159 else

161− chunk : ES.Slice start (minusPtr end start) : revChunks

160+ chunk : Utf8.Slice start (minusPtr end start) : revChunks

162161

163162

164163

165164-- SINGLE STRINGS

166165

167166

168−singleString :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Ptr Word8 -> [ES.Chunk] -> StringResult

167+singleString :: Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> Ptr Word8 -> [Utf8.Chunk] -> StringResult

169168singleString pos end row col initialPos revChunks =

170169 if pos >= end then

171170 Err row col E.StringEndless_Single

@@ -194,7 +193,7 @@ singleString pos end row col initialPos revChunks =

194193 EscapeUnicode delta code ->

195194 let !newPos = plusPtr pos delta in

196195 singleString newPos end row (col + fromIntegral delta) newPos $

197− addEscape (ES.CodePoint code) initialPos pos revChunks

196+ addEscape (Utf8.CodePoint code) initialPos pos revChunks

198197

199198 EscapeProblem r c x ->

200199 Err r c (E.StringEscape x)

@@ -203,7 +202,7 @@ singleString pos end row col initialPos revChunks =

203202 Err row (col + 1) E.StringEndless_Single

204203

205204 else

206− let !newPos = plusPtr pos (P.getCharWidth word) in

205+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

207206 singleString newPos end row (col + 1) initialPos revChunks

208207

209208

@@ -211,7 +210,7 @@ singleString pos end row col initialPos revChunks =

211210-- MULTI STRINGS

212211

213212

214−multiString :: Ptr Word8 -> Ptr Word8 -> Row -> Col -> Ptr Word8 -> Row -> Col -> [ES.Chunk] -> StringResult

213+multiString :: Ptr Word8 -> Ptr Word8 -> Word16 -> Word16 -> Ptr Word8 -> Word16 -> Word16 -> [Utf8.Chunk] -> StringResult

215214multiString pos end row col initialPos sr sc revChunks =

216215 if pos >= end then

217216 Err sr sc E.StringEndless_Multi

@@ -245,7 +244,7 @@ multiString pos end row col initialPos sr sc revChunks =

245244 EscapeUnicode delta code ->

246245 let !newPos = plusPtr pos delta in

247246 multiString newPos end row (col + fromIntegral delta) newPos sr sc $

248− addEscape (ES.CodePoint code) initialPos pos revChunks

247+ addEscape (Utf8.CodePoint code) initialPos pos revChunks

249248

250249 EscapeProblem r c x ->

251250 Err r c (E.StringEscape x)

@@ -254,7 +253,7 @@ multiString pos end row col initialPos sr sc revChunks =

254253 Err sr sc E.StringEndless_Multi

255254

256255 else

257− let !newPos = plusPtr pos (P.getCharWidth word) in

256+ let !newPos = plusPtr pos (P.getCharWidth pos end word) in

258257 multiString newPos end row (col + 1) initialPos sr sc revChunks

259258

260259

@@ -314,30 +313,30 @@ eatUnicode pos end row col =

314313

315314

316315{-# NOINLINE singleQuote #-}

317−singleQuote :: ES.Chunk

316+singleQuote :: Utf8.Chunk

318317singleQuote =

319− ES.Escape 0x27 {-'-}

318+ Utf8.Escape 0x27 {- ' -}

320319

321320

322321{-# NOINLINE doubleQuote #-}

323−doubleQuote :: ES.Chunk

322+doubleQuote :: Utf8.Chunk

324323doubleQuote =

325− ES.Escape 0x22 {-"-}

324+ Utf8.Escape 0x22 {- " -}

326325

327326

328327{-# NOINLINE newline #-}

329−newline :: ES.Chunk

328+newline :: Utf8.Chunk

330329newline =

331− ES.Escape 0x6E {-n-}

330+ Utf8.Escape 0x6E {- n -}

332331

333332

334333{-# NOINLINE carriageReturn #-}

335−carriageReturn :: ES.Chunk

334+carriageReturn :: Utf8.Chunk

336335carriageReturn =

337− ES.Escape 0x72 {-r-}

336+ Utf8.Escape 0x72 {- \r -}

338337

339338

340339{-# NOINLINE placeholder #-}

341−placeholder :: ES.Chunk

340+placeholder :: Utf8.Chunk

342341placeholder =

343− ES.CodePoint 0xFFFD {-replacement character-}

342+ Utf8.CodePoint 0xFFFD {- replacement character -}

compiler/src/Parse/Variable.hs+14−15

@@ -1,5 +1,5 @@

11{-# OPTIONS_GHC -Wall #-}

2−{-# LANGUAGE BangPatterns, MagicHash, OverloadedStrings, UnboxedTuples #-}

2+{-# LANGUAGE BangPatterns, MagicHash, UnboxedTuples, OverloadedStrings #-}

33module Parse.Variable

44 ( lower

55 , upper

@@ -8,7 +8,6 @@ module Parse.Variable

88 , foreignUpper

99 , foreignAlpha

1010 , chompInnerChars

11− , getUpperWidth

1211 , getInnerWidth

1312 , getInnerWidthHelp

1413 , reservedWords

@@ -35,13 +34,13 @@ import qualified Parse.Primitives as P

3534

3635upper :: (Row -> Col -> x) -> Parser x Name.Name

3736upper toError =

38− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

37+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

3938 let (# newPos, newCol #) = chompUpper pos end col in

4039 if pos == newPos then

4140 eerr row col toError

4241 else

4342 let !name = Name.fromPtr pos newPos in

44− cok name (P.State src newPos end indent row newCol)

43+ cok name (P.State newPos end indent row newCol)

4544

4645

4746

@@ -50,7 +49,7 @@ upper toError =

5049

5150lower :: (Row -> Col -> x) -> Parser x Name.Name

5251lower toError =

53− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

52+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

5453 let (# newPos, newCol #) = chompLower pos end col in

5554 if pos == newPos then

5655 eerr row col toError

@@ -61,13 +60,13 @@ lower toError =

6160 else

6261 let

6362 !newState =

64− P.State src newPos end indent row newCol

63+ P.State newPos end indent row newCol

6564 in

6665 cok name newState

6766

6867

6968{-# NOINLINE reservedWords #-}

70−reservedWords :: Set.Set Name.Name -- PERF try using a trie instead

69+reservedWords :: Set.Set Name.Name -- TODO try using a trie instead

7170reservedWords =

7271 Set.fromList

7372 [ "if", "then", "else"

@@ -87,7 +86,7 @@ reservedWords =

8786

8887moduleName :: (Row -> Col -> x) -> Parser x Name.Name

8988moduleName toError =

90− P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->

89+ P.Parser $ \(P.State pos end indent row col) cok _ cerr eerr ->

9190 let

9291 (# pos1, col1 #) = chompUpper pos end col

9392 in

@@ -101,7 +100,7 @@ moduleName toError =

101100 Good ->

102101 let

103102 !name = Name.fromPtr pos newPos

104− !newState = P.State src newPos end indent row newCol

103+ !newState = P.State newPos end indent row newCol

105104 in

106105 cok name newState

107106

@@ -141,22 +140,22 @@ data Upper

141140

142141foreignUpper :: (Row -> Col -> x) -> Parser x Upper

143142foreignUpper toError =

144− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

143+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

145144 let (# upperStart, upperEnd, newCol #) = foreignUpperHelp pos end col in

146145 if upperStart == upperEnd then

147146 eerr row newCol toError

148147 else

149148 let

150− !newState = P.State src upperEnd end indent row newCol

149+ !newState = P.State upperEnd end indent row newCol

151150 !name = Name.fromPtr upperStart upperEnd

152− !upperName =

151+ !foreign =

153152 if upperStart == pos then

154153 Unqualified name

155154 else

156155 let !home = Name.fromPtr pos (plusPtr upperStart (-1)) in

157156 Qualified home name

158157 in

159− cok upperName newState

158+ cok foreign newState

160159

161160

162161foreignUpperHelp :: Ptr Word8 -> Ptr Word8 -> Col -> (# Ptr Word8, Ptr Word8, Col #)

@@ -180,13 +179,13 @@ foreignUpperHelp pos end col =

180179

181180foreignAlpha :: (Row -> Col -> x) -> Parser x Src.Expr_

182181foreignAlpha toError =

183− P.Parser $ \(P.State src pos end indent row col) cok _ _ eerr ->

182+ P.Parser $ \(P.State pos end indent row col) cok _ _ eerr ->

184183 let (# alphaStart, alphaEnd, newCol, varType #) = foreignAlphaHelp pos end col in

185184 if alphaStart == alphaEnd then

186185 eerr row newCol toError

187186 else

188187 let

189− !newState = P.State src alphaEnd end indent row newCol

188+ !newState = P.State alphaEnd end indent row newCol

190189 !name = Name.fromPtr alphaStart alphaEnd

191190 in

192191 if alphaStart == pos then

compiler/src/Reporting/Annotation.hs+1−1

@@ -26,7 +26,7 @@ import Data.Word (Word16)

2626

2727

2828data Located a =

29− At Region a -- PERF see if unpacking region is helpful

29+ At Region a -- TODO see if unpacking region is helpful

3030

3131

3232instance Functor Located where

compiler/src/Reporting/Doc.hs+47−79

@@ -7,38 +7,16 @@ module Reporting.Doc

77 , P.hcat, P.hsep, P.indent, P.sep, P.vcat

88 , P.red, P.cyan, P.magenta, P.green, P.blue, P.black, P.yellow

99 , P.dullred, P.dullcyan, P.dullyellow

10− --

11− , fromChars

12− , fromName

13− , fromVersion

14− , fromPackage

15− , fromInt

16− --

17− , toAnsi

18− , toString

19− , toLine

20− --

10+

11+ , fromChars, fromName, fromInt, fromUtf8

12+ , toAnsi, toString, toLine

2113 , encode

22− --

23− , stack

24− , reflow

25− , commaSep

26− --

27− , toSimpleNote

28− , toFancyNote

29− , toSimpleHint

30− , toFancyHint

31− --

32− , link

33− , fancyLink

34− , reflowLink

35− , makeLink

36− , makeNakedLink

37− --

38− , args

39− , moreArgs

40− , ordinal

41− , intToOrdinal

14+

15+ , stack, reflow, commaSep

16+ , toSimpleNote, toSimpleHint, toFancyHint

17+ , link, fancyLink, reflowLink, makeLink, makeNakedLink

18+ , args, moreArgs

19+ , ordinal, intToOrdinal

4220 , cycle

4321 )

4422 where

@@ -48,17 +26,14 @@ import Prelude hiding (cycle)

4826import qualified Data.List as List

4927import Data.Monoid ((<>))

5028import qualified Data.Name as Name

29+import qualified Data.Utf8 as Utf8

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

5231import qualified System.Info as Info

5332import System.IO (Handle)

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

5534

5635import qualified Data.Index as Index

57−import qualified Elm.Package as Pkg

58−import qualified Elm.Version as V

59−import Json.Encode ((==>))

6036import qualified Json.Encode as E

61−import qualified Json.String as Json

6237

6338

6439

@@ -75,21 +50,16 @@ fromName name =

7550 P.text (Name.toChars name)

7651

7752

78−fromVersion :: V.Version -> P.Doc

79−fromVersion vsn =

80− P.text (V.toChars vsn)

81−

82−

83−fromPackage :: Pkg.Name -> P.Doc

84−fromPackage pkg =

85− P.text (Pkg.toChars pkg)

86−

87−

8853fromInt :: Int -> P.Doc

8954fromInt n =

9055 P.text (show n)

9156

9257

58+fromUtf8 :: Utf8.String -> P.Doc

59+fromUtf8 utf8 =

60+ P.text (Utf8.toChars utf8)

61+

62+

9363

9464-- TO STRING

9565

@@ -141,21 +111,12 @@ commaSep conjunction addStyle names =

141111

142112

143113

144−-- NOTES

114+-- HINTS

145115

146116

147117toSimpleNote :: String -> P.Doc

148118toSimpleNote message =

149− toFancyNote (map P.text (words message))

150−

151−

152−toFancyNote :: [P.Doc] -> P.Doc

153−toFancyNote chunks =

154− P.fillSep (P.underline "Note" <> ":" : chunks)

155−

156−

157−

158−-- HINTS

119+ P.fillSep ((P.underline "Note" <> ":") : map P.text (words message))

159120

160121

161122toSimpleHint :: String -> P.Doc

@@ -172,32 +133,32 @@ toFancyHint chunks =

172133-- LINKS

173134

174135

175−link :: String -> String -> String -> String -> P.Doc

136+link :: P.Doc -> String -> String -> String -> P.Doc

176137link word before fileName after =

177138 P.fillSep $

178− (P.underline (P.text word) <> ":")

139+ (P.underline word <> ":")

179140 : map P.text (words before)

180141 ++ P.text (makeLink fileName)

181142 : map P.text (words after)

182143

183144

184−fancyLink :: String -> [P.Doc] -> String -> [P.Doc] -> P.Doc

145+fancyLink :: P.Doc -> [P.Doc] -> String -> [P.Doc] -> P.Doc

185146fancyLink word before fileName after =

186147 P.fillSep $

187− (P.underline (P.text word) <> ":") : before ++ P.text (makeLink fileName) : after

148+ (P.underline word <> ":") : before ++ P.text (makeLink fileName) : after

188149

189150

190−makeLink :: [Char] -> [Char]

151+makeLink :: String -> String

191152makeLink fileName =

192− "<https://elm-lang.org/" <> V.toChars V.compiler <> "/" <> fileName <> ">"

153+ "<https://elm-lang.org/" <> error "TODO V.toString V.compiler" <> "/" <> fileName <> ">"

193154

194155

195−makeNakedLink :: [Char] -> [Char]

156+makeNakedLink :: String -> String

196157makeNakedLink fileName =

197− "https://elm-lang.org/" <> V.toChars V.compiler <> "/" <> fileName

158+ "https://elm-lang.org/" <> error "TODO V.toString V.compiler" <> "/" <> fileName

198159

199160

200−reflowLink :: [Char] -> [Char] -> [Char] -> P.Doc

161+reflowLink :: String -> String -> String -> P.Doc

201162reflowLink before fileName after =

202163 P.fillSep $

203164 map P.text (words before)

@@ -306,8 +267,10 @@ data Color

306267 | WHITE

307268

308269

309−toJsonHelp :: Style -> [String] -> P.SimpleDoc -> [E.Value]

270+toJsonHelp :: Style -> [a] -> P.SimpleDoc -> [E.Value]

310271toJsonHelp style revChunks simpleDoc =

272+ error "TODO generate json on errors" style revChunks simpleDoc sgrToStyle encodeColor

273+{-

311274 case simpleDoc of

312275 P.SFail ->

313276 error $

@@ -318,18 +281,23 @@ toJsonHelp style revChunks simpleDoc =

318281 [ encodeChunks style revChunks ]

319282

320283 P.SChar char rest ->

321− toJsonHelp style ([char] : revChunks) rest

284+ toJsonHelp style (TB.singleton char : revChunks) rest

322285

323286 P.SText _ string rest ->

324− toJsonHelp style (string : revChunks) rest

287+ toJsonHelp style (TB.fromString string : revChunks) rest

325288

326289 P.SLine indent rest ->

327− toJsonHelp style (replicate indent ' ' : "\n" : revChunks) rest

290+ toJsonHelp style (spaces indent : "\n" : revChunks) rest

328291

329292 P.SSGR sgrs rest ->

330293 encodeChunks style revChunks : toJsonHelp (sgrToStyle sgrs style) [] rest

331294

332295

296+spaces :: Int -> TB.Builder

297+spaces n =

298+ TB.fromText (Text.replicate n " ")

299+-}

300+

333301sgrToStyle :: [Ansi.SGR] -> Style -> Style

334302sgrToStyle sgrs style@(Style bold underline color) =

335303 case sgrs of

@@ -390,28 +358,28 @@ toColor layer intensity color =

390358 Ansi.White -> pick White WHITE

391359 Ansi.Black -> pick Black BLACK

392360

393−

394−encodeChunks :: Style -> [String] -> E.Value

361+{-

362+encodeChunks :: Style -> [TB.Builder] -> E.Value

395363encodeChunks (Style bold underline color) revChunks =

396364 let

397− chars = concat (reverse revChunks)

365+ !str = Utf8.concat (reverse revChunks)

398366 in

399367 case color of

400368 Nothing | not bold && not underline ->

401− E.chars chars

369+ E.string str

402370

403371 _ ->

404372 E.object

405− [ "bold" ==> E.bool bold

406− , "underline" ==> E.bool underline

407− , "color" ==> maybe E.null encodeColor color

408− , "string" ==> E.chars chars

373+ [ ("bold", E.bool bold)

374+ , ("underline", E.bool underline)

375+ , ("color", maybe E.null encodeColor color)

376+ , ("string", E.string str)

409377 ]

410−

378+-}

411379

412380encodeColor :: Color -> E.Value

413381encodeColor color =

414− E.string $ Json.fromChars $

382+ E.string $

415383 case color of

416384 Red -> "red"

417385 RED -> "RED"

compiler/src/Reporting/Error.hs+26−32

@@ -10,9 +10,10 @@ module Reporting.Error

1010

1111

1212import qualified Data.ByteString as B

13+import qualified Data.Name as Name

1314import qualified Data.NonEmptyList as NE

1415import qualified Data.OneOrMore as OneOrMore

15−import qualified System.FilePath as FP

16+import qualified Data.Utf8 as Utf8

1617

1718import qualified Elm.ModuleName as ModuleName

1819import qualified File

@@ -21,7 +22,6 @@ import Json.Encode ((==>))

2122import qualified Reporting.Annotation as A

2223import qualified Reporting.Doc as D

2324import qualified Reporting.Error.Canonicalize as Canonicalize

24−import qualified Reporting.Error.Docs as Docs

2525import qualified Reporting.Error.Import as Import

2626import qualified Reporting.Error.Main as Main

2727import qualified Reporting.Error.Pattern as Pattern

@@ -39,8 +39,8 @@ import qualified Reporting.Report as Report

3939data Module =

4040 Module

4141 { _name :: ModuleName.Raw

42− , _absolutePath :: FilePath

43− , _modificationTime :: File.Time

42+ , _path :: FilePath

43+ , _time :: File.Time

4444 , _source :: B.ByteString

4545 , _error :: Error

4646 }

@@ -57,7 +57,6 @@ data Error

5757 | BadTypes L.Localizer (NE.List Type.Error)

5858 | BadMains L.Localizer (OneOrMore.OneOrMore Main.Error)

5959 | BadPatterns (NE.List Pattern.Error)

60− | BadDocs Docs.Error

6160

6261

6362

@@ -85,34 +84,32 @@ toReports source err =

8584 BadPatterns errs ->

8685 fmap (Pattern.toReport source) errs

8786

88− BadDocs docsErr ->

89− Docs.toReports source docsErr

90−

9187

9288

9389-- TO DOC

9490

9591

96−toDoc :: FilePath -> Module -> [Module] -> D.Doc

97−toDoc root err errs =

92+toDoc :: Module -> [Module] -> D.Doc

93+toDoc err errs =

9894 let

99− (NE.List m ms) = NE.sortBy _modificationTime (NE.List err errs)

95+ timeCompare m1 m2 = compare (_time m1) (_time m2)

96+ (NE.List m ms) = NE.sortBy timeCompare (NE.List err errs)

10097 in

101− D.vcat (toDocHelp root m ms)

98+ D.vcat (toDocHelp m ms)

10299

103100

104−toDocHelp :: FilePath -> Module -> [Module] -> [D.Doc]

105−toDocHelp root module1 modules =

101+toDocHelp :: Module -> [Module] -> [D.Doc]

102+toDocHelp module1 modules =

106103 case modules of

107104 [] ->

108− [moduleToDoc root module1

105+ [moduleToDoc module1

109106 ,""

110107 ]

111108

112109 module2 : otherModules ->

113− moduleToDoc root module1

110+ moduleToDoc module1

114111 : toSeparator module1 module2

115− : toDocHelp root module2 otherModules

112+ : toDocHelp module2 otherModules

116113

117114

118115toSeparator :: Module -> Module -> D.Doc

@@ -134,22 +131,19 @@ toSeparator beforeModule afterModule =

134131-- MODULE TO DOC

135132

136133

137−moduleToDoc :: FilePath -> Module -> D.Doc

138−moduleToDoc root (Module _ absolutePath _ source err) =

134+moduleToDoc :: Module -> D.Doc

135+moduleToDoc (Module _ path _ source err) =

139136 let

140137 reports =

141138 toReports (Code.toSource source) err

142−

143− relativePath =

144− FP.makeRelative root absolutePath

145139 in

146− D.vcat $ map (reportToDoc relativePath) (NE.toList reports)

140+ D.vcat $ map (reportToDoc path) (NE.toList reports)

147141

148142

149143reportToDoc :: FilePath -> Report.Report -> D.Doc

150−reportToDoc relativePath (Report.Report title _ _ message) =

144+reportToDoc path (Report.Report title _ _ message) =

151145 D.vcat

152− [ toMessageBar title relativePath

146+ [ toMessageBar title path

153147 , ""

154148 , message

155149 , ""

@@ -179,8 +173,8 @@ toJson (Module name path _ source err) =

179173 toReports (Code.toSource source) err

180174 in

181175 E.object

182− [ "path" ==> E.chars path

183− , "name" ==> E.name name

176+ [ "path" ==> E.string (Utf8.fromChars path)

177+ , "name" ==> E.string (Name.toUtf8 name)

184178 , "problems" ==> E.array (map reportToJson (NE.toList reports))

185179 ]

186180

@@ -188,7 +182,7 @@ toJson (Module name path _ source err) =

188182reportToJson :: Report.Report -> E.Value

189183reportToJson (Report.Report title region _sgstns message) =

190184 E.object

191− [ "title" ==> E.chars title

185+ [ "title" ==> E.string (Utf8.fromChars title)

192186 , "region" ==> encodeRegion region

193187 , "message" ==> D.encode message

194188 ]

@@ -199,12 +193,12 @@ encodeRegion (A.Region (A.Position sr sc) (A.Position er ec)) =

199193 E.object

200194 [ "start" ==>

201195 E.object

202− [ "line" ==> E.int (fromIntegral sr)

203− , "column" ==> E.int (fromIntegral sc)

196+ [ ("line", E.int (fromIntegral sr))

197+ , ("column", E.int (fromIntegral sc))

204198 ]

205199 , "end" ==>

206200 E.object

207− [ "line" ==> E.int (fromIntegral er)

208− , "column" ==> E.int (fromIntegral ec)

201+ [ ("line", E.int (fromIntegral er))

202+ , ("column", E.int (fromIntegral ec))

209203 ]

210204 ]

compiler/src/Reporting/Error/Canonicalize.hs+40−41

@@ -14,10 +14,8 @@ module Reporting.Error.Canonicalize

1414

1515

1616import qualified Data.Char as Char

17−import qualified Data.List as List

1817import qualified Data.Map as Map

1918import qualified Data.Name as Name

20−import qualified Data.OneOrMore as OneOrMore

2119import qualified Data.Set as Set

2220

2321import qualified AST.Canonical as Can

@@ -39,10 +37,10 @@ import qualified Reporting.Suggest as Suggest

3937

4038data Error

4139 = AnnotationTooShort A.Region Name.Name Index.ZeroBased Int

42− | AmbiguousVar A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

43− | AmbiguousType A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

44− | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

45− | AmbiguousBinop A.Region Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)

40+ | AmbiguousVar A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]

41+ | AmbiguousType A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]

42+ | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]

43+ | AmbiguousBinop A.Region Name.Name [ModuleName.Canonical]

4644 | BadArity A.Region BadArityContext Name.Name Int Int

4745 | Binop A.Region Name.Name Name.Name

4846 | DuplicateDecl Name.Name A.Region A.Region

@@ -166,17 +164,17 @@ toReport source err =

166164 <> " be deleted? Maybe some parentheses are missing?"

167165 )

168166

169− AmbiguousVar region maybePrefix name h hs ->

170− ambiguousName source region maybePrefix name h hs "variable"

167+ AmbiguousVar region maybePrefix name possibleHomes ->

168+ ambiguousName source region maybePrefix name possibleHomes "variable"

171169

172− AmbiguousType region maybePrefix name h hs ->

173− ambiguousName source region maybePrefix name h hs "type"

170+ AmbiguousType region maybePrefix name possibleHomes ->

171+ ambiguousName source region maybePrefix name possibleHomes "type"

174172

175− AmbiguousVariant region maybePrefix name h hs ->

176− ambiguousName source region maybePrefix name h hs "variant"

173+ AmbiguousVariant region maybePrefix name possibleHomes ->

174+ ambiguousName source region maybePrefix name possibleHomes "variant"

177175

178− AmbiguousBinop region name h hs ->

179− ambiguousName source region Nothing name h hs "operator"

176+ AmbiguousBinop region name possibleHomes ->

177+ ambiguousName source region Nothing name possibleHomes "operator"

180178

181179 BadArity region badArityContext name expected actual ->

182180 let

@@ -244,11 +242,11 @@ toReport source err =

244242

245243 DuplicateAliasArg typeName name r1 r2 ->

246244 nameClash source r1 r2 $

247− "The `" <> Name.toChars typeName <> "` type alias has multiple `" <> Name.toChars name <> "` type variables."

245+ "The `" <> Name.toChars typeName <> "` type alias has multilpe `" <> Name.toChars name <> "` type variables."

248246

249247 DuplicateUnionArg typeName name r1 r2 ->

250248 nameClash source r1 r2 $

251− "The `" <> Name.toChars typeName <> "` type has multiple `" <> Name.toChars name <> "` type variables."

249+ "The `" <> Name.toChars typeName <> "` type has multilpe `" <> Name.toChars name <> "` type variables."

252250

253251 DuplicatePattern context name r1 r2 ->

254252 nameClash source r1 r2 $

@@ -276,7 +274,7 @@ toReport source err =

276274 "You have declared that `" ++ Name.toChars name ++ "` is an effect type:"

277275 ,

278276 D.reflow $

279− "But I cannot find a custom type named `" ++ Name.toChars name ++ "` in this file!"

277+ "But I cannot find a union type named `" ++ Name.toChars name ++ "` in this file!"

280278 )

281279

282280 EffectFunctionNotFound region name ->

@@ -344,7 +342,7 @@ toReport source err =

344342 Code.toSnippet source region Nothing

345343 (

346344 D.reflow $

347− "The (..) syntax is for exposing variants of a custom type. It cannot be used with a type alias like `"

345+ "The (..) syntax is for exposing union type constructors. It cannot be used with a type alias like `"

348346 ++ Name.toChars name ++ "` though."

349347 ,

350348 D.reflow $

@@ -357,12 +355,12 @@ toReport source err =

357355 (

358356 D.reflow $

359357 "You are trying to import the `" <> Name.toChars ctor

360− <> "` variant by name:"

358+ <> "` type constructor by name:"

361359 ,

362360 D.fillSep

363361 ["Try","importing",D.green (D.fromName tipe <> "(..)"),"instead."

364362 ,"The","dots","mean","“expose","the",D.fromName tipe,"type","and"

365− ,"all","its","variants","so","it","gives","you","access","to"

363+ ,"all","its","constructors”","so","it","gives","you","access","to"

366364 , D.fromName ctor <> "."

367365 ]

368366 )

@@ -388,8 +386,13 @@ toReport source err =

388386 D.reflow $

389387 "The `" <> Name.toChars name <> "` type alias cannot be followed by (..) like this:"

390388 ,

391− D.reflow $

392− "Remove the (..) and it should work."

389+ D.stack

390+ [ "Remove the (..) and it should work."

391+ , D.link "Hint"

392+ "The distinction between `type` and `type alias` is important here. Read"

393+ "types-vs-type-aliases"

394+ "to learn more."

395+ ]

393396 )

394397

395398 ImportExposingNotFound region (ModuleName.Canonical _ home) value possibleNames ->

@@ -519,7 +522,7 @@ toReport source err =

519522 <> "` as a function, but it is not available in pattern matching like this:"

520523 ,

521524 D.reflow $

522− "I recommend matching the record as a variable and unpacking it later."

525+ "I recommend matching matching the record as a variable and unpacking it later."

523526 )

524527

525528 PortPayloadInvalid region portName _badType invalidPayload ->

@@ -679,7 +682,7 @@ toReport source err =

679682 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."

680683 ,

681684 D.stack

682− [ makeTheory "Are you trying to mutate a variable?" $

685+ [ makeTheory "Are you are trying to mutate a variable?" $

683686 "Elm does not have mutation, so when I see " ++ Name.toChars name

684687 ++ " defined in terms of " ++ Name.toChars name

685688 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"

@@ -725,7 +728,7 @@ toReport source err =

725728 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."

726729 ,

727730 D.stack

728− [ makeTheory "Are you trying to mutate a variable?" $

731+ [ makeTheory "Are you are trying to mutate a variable?" $

729732 "Elm does not have mutation, so when I see " ++ Name.toChars name

730733 ++ " defined in terms of " ++ Name.toChars name

731734 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"

@@ -976,32 +979,28 @@ nameClash source r1 r2 messageThatEndsWithPunctuation =

976979-- AMBIGUOUS NAME

977980

978981

979−ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> ModuleName.Canonical -> OneOrMore.OneOrMore ModuleName.Canonical -> String -> Report.Report

980−ambiguousName source region maybePrefix name h hs thing =

981− let

982− possibleHomes = List.sort (h : OneOrMore.destruct (:) hs)

983− in

982+ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> [ModuleName.Canonical] -> String -> Report.Report

983+ambiguousName source region maybePrefix name possibleHomes thing =

984984 Report.Report "AMBIGUOUS NAME" region [] $

985985 Code.toSnippet source region Nothing $

986986 case maybePrefix of

987987 Nothing ->

988988 let

989989 homeToYellowDoc (ModuleName.Canonical _ home) =

990− D.dullyellow (D.fromName home <> "." <> D.fromName name)

990+ D.dullyellow (D.fromName home)

991+

992+ bothOrAll =

993+ if length possibleHomes == 2 then "both" else "all"

991994 in

992995 (

993− D.reflow $ "This usage of `" ++ Name.toChars name ++ "` is ambiguous:"

996+ D.reflow $ "This usage of `" ++ Name.toChars name ++ "` is ambiguous."

994997 ,

995998 D.stack

996999 [ D.reflow $

997− "This name is exposed by " ++ show (length possibleHomes) ++ " of your imports, so I am not\

998− \ sure which one to use:"

1000+ "Check your imports. The following modules " ++ bothOrAll

1001+ ++ " expose a `" ++ Name.toChars name ++ "` " ++ thing ++ ":"

9991002 , D.indent 4 $ D.vcat $ map homeToYellowDoc possibleHomes

1000− , D.reflow $

1001− "I recommend using qualified names for imported values. I also recommend having\

1002− \ at most one `exposing (..)` per file to make name clashes like this less common\

1003− \ in the long run."

1004− , D.link "Note" "Check out" "imports" "for more info on the import syntax."

1003+ , D.reflowLink "Read" "imports" "to learn how to clarify which one you want."

10051004 ]

10061005 )

10071006

@@ -1009,9 +1008,9 @@ ambiguousName source region maybePrefix name h hs thing =

10091008 let

10101009 homeToYellowDoc (ModuleName.Canonical _ home) =

10111010 if prefix == home then

1012− D.cyan "import" <+> D.fromName home

1011+ D.blue "import" <+> D.dullyellow (D.fromName home)

10131012 else

1014− D.cyan "import" <+> D.fromName home <+> D.cyan "as" <+> D.fromName prefix

1013+ D.blue "import" <+> D.dullyellow (D.fromName home) <+> D.blue "as" <+> D.dullyellow (D.fromName prefix)

10151014

10161015 eitherOrAny =

10171016 if length possibleHomes == 2 then "either" else "any"

compiler/src/Reporting/Error/Docs.hs+18−127

@@ -2,24 +2,17 @@

22{-# LANGUAGE OverloadedStrings #-}

33module Reporting.Error.Docs

44 ( Error(..)

5− , SyntaxProblem(..)

6− , NameProblem(..)

7− , DefProblem(..)

8− , toReports

5+ , toReport

96 )

107 where

118

129

1310import qualified Data.Name as Name

14−import qualified Data.NonEmptyList as NE

1511

16−import Parse.Primitives (Row, Col)

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

1812import qualified Reporting.Annotation as A

1913import Reporting.Doc ((<>))

2014import qualified Reporting.Doc as D

2115import qualified Reporting.Render.Code as Code

22−import qualified Reporting.Error.Syntax as E

2316import qualified Reporting.Report as Report

2417

2518

@@ -27,56 +20,36 @@ import qualified Reporting.Report as Report

2720data Error

2821 = NoDocs A.Region

2922 | ImplicitExposing A.Region

30− | SyntaxProblem SyntaxProblem

31− | NameProblems (NE.List NameProblem)

32− | DefProblems (NE.List DefProblem)

33−

34−

35−data SyntaxProblem

36− = Op Row Col

37− | OpBad BadOperator Row Col

38− | Name Row Col

39− | Space E.Space Row Col

40− | Comma Row Col

41− | BadEnd Row Col

42−

43−

44−data NameProblem

45− = NameDuplicate Name.Name A.Region A.Region

46− | NameOnlyInDocs Name.Name A.Region

47− | NameOnlyInExports Name.Name A.Region

48−

49−

50−data DefProblem

51− = NoComment Name.Name A.Region

23+ | Duplicate Name.Name A.Region A.Region

24+ | OnlyInDocs Name.Name A.Region

25+ | OnlyInExports Name.Name A.Region

26+ | NoComment Name.Name A.Region

5227 | NoAnnotation Name.Name A.Region

5328

5429

5530

56−-- TO REPORTS

31+-- TO REPORT

5732

5833

59−toReports :: Code.Source -> Error -> NE.List Report.Report

60−toReports source err =

34+toReport :: Code.Source -> Error -> Report.Report

35+toReport source err =

6136 case err of

6237 NoDocs region ->

63− NE.singleton $

6438 Report.Report "NO DOCS" region [] $

65− Code.toSnippet source region Nothing

66− (

39+ D.stack

40+ [

6741 D.reflow $

6842 "You must have a documentation comment between the module\

6943 \ declaration and the imports."

7044 ,

7145 D.reflow

72− "Learn more at <https://package.elm-lang.org/help/documentation-format>"

73− )

46+ "Learn more at <http://package.elm-lang.org/help/documentation-format>"

47+ ]

7448

7549 ImplicitExposing region ->

76− NE.singleton $

7750 Report.Report "IMPLICIT EXPOSING" region [] $

78− Code.toSnippet source region Nothing

79− (

51+ D.stack

52+ [

8053 D.reflow $

8154 "I need you to be explicit about what this module exposes:"

8255 ,

@@ -86,83 +59,9 @@ toReports source err =

8659 \ to be explicit about this is a way of adding another quality check before\

8760 \ code gets published. So as you write out the public API, ask yourself if\

8861 \ it will be easy to understand as people read the documentation!"

89− )

90−

91− SyntaxProblem problem ->

92− NE.singleton $

93− toSyntaxProblemReport source problem

94−

95− NameProblems problems ->

96− fmap (toNameProblemReport source) problems

97−

98− DefProblems problems ->

99− fmap (toDefProblemReport source) problems

100−

101−

102−

103−-- SYNTAX PROBLEM

104−

62+ ]

10563

106−toSyntaxProblemReport :: Code.Source -> SyntaxProblem -> Report.Report

107−toSyntaxProblemReport source problem =

108− let

109− toSyntaxReport row col details =

110− let

111− region = toRegion row col

112− in

113− Report.Report "PROBLEM IN DOCS" region [] $

114− Code.toSnippet source region Nothing

115− ( D.reflow "I was partway through parsing your module documentation, but I got stuck here:"

116− , D.stack $

117− [ D.reflow details

118− , D.toSimpleHint $

119− "Read through <https://package.elm-lang.org/help/documentation-format> for\

120− \ tips on how to write module documentation!"

121− ]

122− )

123− in

124− case problem of

125− Op row col ->

126− toSyntaxReport row col $

127− "I am trying to parse an operator like (+) or (*) but something is going wrong."

128−

129− OpBad _ row col ->

130− toSyntaxReport row col $

131− "I am trying to parse an operator like (+) or (*) but it looks like you are using\

132− \ a reserved symbol in this case."

133−

134− Name row col ->

135− toSyntaxReport row col $

136− "I was expecting to see the name of another exposed value from this module."

137−

138− Space space row col ->

139− E.toSpaceReport source space row col

140−

141− Comma row col ->

142− toSyntaxReport row col $

143− "I was expecting to see a comma next."

144−

145− BadEnd row col ->

146− toSyntaxReport row col $

147− "I am not really sure what I am getting stuck on though."

148−

149−

150−toRegion :: Row -> Col -> A.Region

151−toRegion row col =

152− let

153− pos = A.Position row col

154− in

155− A.Region pos pos

156−

157−

158−

159−-- NAME PROBLEM

160−

161−

162−toNameProblemReport :: Code.Source -> NameProblem -> Report.Report

163−toNameProblemReport source problem =

164− case problem of

165− NameDuplicate name r1 r2 ->

64+ Duplicate name r1 r2 ->

16665 Report.Report "DUPLICATE DOCS" r2 [] $

16766 Code.toPair source r1 r2

16867 (

@@ -182,7 +81,7 @@ toNameProblemReport source problem =

18281 "Remove one of them!"

18382 )

18483

185− NameOnlyInDocs name region ->

84+ OnlyInDocs name region ->

18685 Report.Report "DOCS MISTAKE" region [] $

18786 Code.toSnippet source region Nothing

18887 (

@@ -195,7 +94,7 @@ toNameProblemReport source problem =

19594 <> Name.toChars name <> "` and forgot to delete it here?"

19695 )

19796

198− NameOnlyInExports name region ->

97+ OnlyInExports name region ->

19998 Report.Report "DOCS MISTAKE" region [] $

20099 Code.toSnippet source region Nothing

201100 (

@@ -211,14 +110,6 @@ toNameProblemReport source problem =

211110 ]

212111 )

213112

214−

215−

216−-- DEF PROBLEM

217−

218−

219−toDefProblemReport :: Code.Source -> DefProblem -> Report.Report

220−toDefProblemReport source problem =

221− case problem of

222113 NoComment name region ->

223114 Report.Report "NO DOCS" region [] $

224115 Code.toSnippet source region Nothing

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

@@ -56,7 +56,7 @@ toReport source (Error region name unimportedModules problem) =

5656 D.stack

5757 [

5858 D.reflow $

59− "I checked the \"dependencies\" and \"source-directories\" listed in your elm.json,\

59+ "I checked the \"dependencies\" and \"source-directories\" listend in your elm.json,\

6060 \ but I cannot find it! Maybe it is a typo for one of these names?"

6161 ,

6262 D.dullyellow $ D.indent 4 $ D.vcat $

compiler/src/Reporting/Error/Json.hs+269−281

@@ -1,344 +1,332 @@

11{-# OPTIONS_GHC -Wall #-}

22{-# LANGUAGE OverloadedStrings #-}

33module Reporting.Error.Json

4− ( toReport

5− , FailureToReport(..)

6− , Context(..)

7− , Reason(..)

4+ ( Error(..)

5+ , Problem(..)

6+ , DecodeExpectation(..)

7+ , ParseError(..)

8+ , toReport

89 )

910 where

1011

1112

12−import qualified Data.ByteString as BS

13−import qualified Data.ByteString.UTF8 as BS_UTF8

14−import qualified Data.NonEmptyList as NE

13+import qualified Data.Utf8 as Utf8

14+import Data.Word (Word16)

1515

16−import Json.Decode (Error(..), Problem(..), DecodeExpectation(..), ParseError(..), StringProblem(..))

17−import qualified Reporting.Annotation as A

18−import qualified Reporting.Doc as D

19−import qualified Reporting.Exit.Help as Help

20−import qualified Reporting.Render.Code as Code

16+import qualified Reporting.Report as Report

2117

2218

2319

24−-- TO REPORT

20+-- ERROR

2521

2622

27−toReport :: FilePath -> FailureToReport x -> Error x -> Reason -> Help.Report

28−toReport path ftr err reason =

29− case err of

30− DecodeProblem bytes problem ->

31− problemToReport path ftr (Code.toSource bytes) CRoot problem reason

23+data Error e

24+ = DecodeProblem (Problem e)

25+ | ParseProblem ParseError

3226

33− ParseProblem bytes parseError ->

34− parseErrorToReport path (Code.toSource bytes) parseError reason

3527

3628

37−newtype Reason =

38− ExplicitReason String

29+-- DECODE PROBLEMS

3930

4031

41−because :: Reason -> String -> String

42−because (ExplicitReason iNeedThings) problem =

43− iNeedThings ++ " " ++ problem

32+data Problem e

33+ = Field Utf8.String (Problem e)

34+ | Index Int (Problem e)

35+ | OneOf (Problem e) [Problem e]

36+ | Failure e

37+ | Expecting DecodeExpectation

4438

4539

40+data DecodeExpectation

41+ = TObject

42+ | TArray

43+ | TString

44+ | TBool

45+ | TInt

46+ | TObjectWith Utf8.String

47+ | TArrayPair Int

4648

47−-- PARSE ERROR TO REPORT

4849

4950

50−parseErrorToReport :: FilePath -> Code.Source -> ParseError -> Reason -> Help.Report

51−parseErrorToReport path source parseError reason =

52− let

53− toSnippet title row col (problem, details) =

54− let

55− pos = A.Position row col

56− surroundings = A.Region (A.Position (max 1 (row - 2)) 1) pos

57− region = A.Region pos pos

58− in

59− Help.jsonReport title (Just path) $

60− Code.toSnippet source surroundings (Just region)

61− ( D.reflow (because reason problem)

62− , details

63− )

64− in

65− case parseError of

66− Start row col ->

67− toSnippet "EXPECTING A VALUE" row col

68− (

69− "I was expecting to see a JSON value next:"

70− ,

71− D.stack

72− [ D.fillSep

73− ["Try","something","like",D.dullyellow "\"this\"","or"

74− ,D.dullyellow "42","to","move","on","to","better","hints!"

75− ]

76− , D.toSimpleNote $

77− "The JSON specification does not allow trailing commas, so you can sometimes\

78− \ get this error in arrays that have an extra comma at the end. In that case,\

79− \ remove that last comma or add another array entry after it!"

80− ]

81− )

51+-- PARSE ERROR

8252

83− ObjectField row col ->

84− toSnippet "EXTRA COMMA" row col

85− (

86− "I was partway through parsing a JSON object when I got stuck here:"

87− ,

88− D.stack

89− [ D.fillSep

90− ["I","saw","a","comma","right","before","I","got","stuck","here,"

91− ,"so","I","was","expecting","to","see","a","field","name","like"

92− ,D.dullyellow "\"type\"","or",D.dullyellow "\"dependencies\"","next."

93− ]

94− , D.reflow $

95− "This error is commonly caused by trailing commas in JSON objects. Those are\

96− \ actually disallowed by <https://json.org> so check the previous line for a\

97− \ trailing comma that may need to be deleted."

98− , objectNote

99− ]

100− )

10153

102− ObjectColon row col ->

103− toSnippet "EXPECTING COLON" row col

104− (

105− "I was partway through parsing a JSON object when I got stuck here:"

106− ,

107− D.stack

108− [ D.reflow $ "I was expecting to see a colon next."

109− , objectNote

110− ]

111− )

54+data ParseError

55+ = PIndex Int ParseError Row Col

56+ | PField Utf8.String ParseError Row Col

57+ | ObjectStart Row Col

58+ | ObjectMore Row Col

59+ | ObjectEnd Row Col

60+ | ArrayStart Row Col

61+ | ArrayMore Row Col

62+ | ArrayEnd Row Col

63+ | StringStart Row Col

64+ | StringEnd Row Col

65+ | IntStart Row Col

66+ | NoLeadingZeros Row Col

67+ | NoFloats Row Col

68+ | Bool Row Col

69+ | Null Row Col

70+ | Value Row Col

71+ | Colon Row Col

72+ | EndOfFile Row Col

11273

113− ObjectEnd row col ->

114− toSnippet "UNFINISHED OBJECT" row col

115− (

116− "I was partway through parsing a JSON object when I got stuck here:"

117− ,

118− D.stack

74+

75+type Row = Word16

76+type Col = Word16

77+

78+

79+

80+-- TO REPORT

81+

82+

83+toReport :: Error e -> Report.Report

84+toReport err =

85+ error "TODO Reporting.Error.Json.toReport" err

86+

87+

88+{-

89+

90+-- ERROR

91+

92+

93+data Error e

94+ = BadJson Syntax.Error

95+ | BadContent (Json.Error e)

96+

97+

98+

99+-- TO DOC

100+

101+

102+toDoc :: String -> Code.Source -> (e -> [D.Doc]) -> Error e -> D.Doc

103+toDoc rootName source userErrorToDocs err =

104+ case err of

105+ BadJson syntaxError ->

106+ case Syntax.toReport source syntaxError of

107+ Report.Report _ _ _ doc ->

108+ doc

109+

110+ BadContent jsonError ->

111+ case flatten jsonError of

112+ [] ->

113+ D.reflow

114+ "I am not sure what is wrong with this JSON. Please create an <http://sscce.org>\

115+ \ and share it at <https://github.com/elm/compiler/issues> so I can\

116+ \ provide a helpful hint here!"

117+

118+ [flatError] ->

119+ flatErrorToDoc rootName [] userErrorToDocs flatError

120+

121+ flatErrors ->

122+ let

123+ toNumberedDoc index flatErr =

124+ D.dullcyan ("(" <> D.fromInt index <> ")") <+> flatErrorToDoc rootName [] userErrorToDocs flatErr

125+ in

126+ D.stack $

119127 [ D.reflow $

120− "I was expecting to see a comma or a closing curly brace next."

121− , D.reflow $

122− "Is a comma missing on the previous line? Is an array missing a closing square\

123− \ bracket? It is often something tricky like that!"

124− , objectNote

128+ "I have " ++ show (length flatErrors) ++ " theories on what is going wrong:"

125129 ]

126− )

130+ ++ zipWith toNumberedDoc [1..] flatErrors

131+

132+

133+

134+-- FLAT ERROR TO DOC

127135

128− ArrayEnd row col ->

129− toSnippet "UNFINISHED ARRAY" row col

130− (

131− "I was partway through parsing a JSON array when I got stuck here:"

132− ,

136+

137+flatErrorToDoc :: String -> [D.Doc] -> (e -> [D.Doc]) -> FlatError e -> D.Doc

138+flatErrorToDoc rootName starter userErrorToDocs (FlatError accesses json theory theories) =

139+ case theories of

140+ [] ->

141+ let

142+ explanation =

143+ case theory of

144+ Failure userError ->

145+ userErrorToDocs userError

146+

147+ Expecting tipe ->

148+ ["I","was","expecting"] ++ anExpectedThing tipe

149+ in

150+ case accesses of

151+ [] ->

152+ D.fillSep (starter ++ explanation)

153+

154+ _ ->

133155 D.stack

134− [ D.reflow $ "I was expecting to see a comma or a closing square bracket next."

135− , D.reflow $

136− "Is a comma missing on the previous line? It is often something like that!"

156+ [ D.fillSep $ starter ++ ["The"] ++ actualThing json ++ ["at",accessToDoc rootName accesses,"is","causing","issues."]

157+ , D.fillSep explanation

137158 ]

138− )

139−

140− StringProblem stringProblem row col ->

141− case stringProblem of

142− BadStringEnd ->

143− toSnippet "ENDLESS STRING" row col

144− (

145− "I got to the end of the line without seeing the closing double quote:"

146− ,

147− D.fillSep $

148− ["Strings","look","like",D.green "\"this\"","with","double"

149− ,"quotes","on","each","end.","Is","the","closing","double"

150− ,"quote","missing","in","your","code?"

151− ]

152− )

153−

154− BadStringControlChar ->

155− toSnippet "UNEXPECTED CONTROL CHARACTER" row col

156− (

157− "I ran into a control character unexpectedly:"

158− ,

159− D.reflow $

160− "These are characters that represent tabs, backspaces, newlines, and\

161− \ a bunch of other invisible characters. They all come before 20 in the\

162− \ ASCII range, and they are disallowed by the JSON specificaiton. Maybe\

163− \ a copy/paste added one of these invisible characters to your JSON?"

164− )

165−

166− BadStringEscapeChar ->

167− toSnippet "UNKNOWN ESCAPE" row col

168− (

169− "Backslashes always start escaped characters, but I do not recognize this one:"

170− ,

171− D.stack

172− [ D.reflow $

173− "Valid escape characters include:"

174− , D.dullyellow $ D.indent 4 $ D.vcat $

175− ["\\\"","\\\\","\\/","\\b","\\f","\\n","\\r","\\t","\\u003D"]

176− , D.reflow $

177− "Do you want one of those instead? Maybe you need \\\\ to escape a backslash?"

178− ]

179− )

180−

181− BadStringEscapeHex ->

182− toSnippet "BAD HEX ESCAPE" row col

183− (

184− "This is not a valid hex escape:"

185− ,

186− D.fillSep $

187− ["Valid","hex","escapes","in","JSON","are","between"

188− ,D.green "\\u0000","and",D.green "\\uFFFF"

189− ,"and","always","have","exactly","four","digits."

190− ]

191− )

192−

193− NoLeadingZeros row col ->

194− toSnippet "BAD NUMBER" row col

195− (

196− "Numbers cannot start with zeros like this:"

197− ,

198− D.reflow $ "Try deleting the leading zeros?"

199− )

200−

201− NoFloats row col ->

202− toSnippet "UNEXPECTED NUMBER" row col

203− (

204− "I got stuck while trying to parse this number:"

205− ,

206− D.reflow $

207− "I do not accept floating point numbers like 3.1415 right now. That kind\

208− \ of JSON value is not needed for any of the uses that Elm has for now."

209− )

210−

211− BadEnd row col ->

212− toSnippet "JSON PROBLEM" row col

213− (

214− "I was partway through parsing some JSON when I got stuck here:"

215− ,

216− D.reflow $

217− "I am not really sure what is wrong. This sometimes means there is extra\

218− \ stuff after a valid JSON value?"

219− )

220−

221−

222−objectNote :: D.Doc

223−objectNote =

224− D.stack

225− [ D.toSimpleNote $ "Here is an example of a valid JSON object for reference:"

226− , D.vcat

227− [ D.indent 4 $ "{"

228− , D.indent 6 $ D.dullyellow "\"name\"" <> ": " <> D.dullyellow "\"Tom\"" <> ","

229− , D.indent 6 $ D.dullyellow "\"age\"" <> ": " <> D.dullyellow "42"

230− , D.indent 4 $ "}"

159+

160+ _:_ ->

161+ let

162+ introduction =

163+ case accesses of

164+ [] ->

165+ ["I","am","having","trouble","with","the"]

166+ ++ actualThing json

167+ ++ ["here","because:"]

168+

169+ _ ->

170+ ["I","am","having","trouble","with","the"]

171+ ++ actualThing json

172+ ++ ["at",accessToDoc rootName accesses,"because:"]

173+ in

174+ D.stack

175+ [ D.fillSep (starter ++ introduction)

176+ , D.stack (toBullet [] userErrorToDocs theory : map (toBullet ["OR"] userErrorToDocs) theories)

177+ , D.reflow "I accept any of these things."

231178 ]

232− , D.reflow $

233− "Notice that (1) the field names are in double quotes and (2) there is no\

234− \ trailing comma after the last entry. Both are strict requirements in JSON!"

235− ]

236179

237180

181+accessToDoc :: String -> [String] -> D.Doc

182+accessToDoc rootName accesses =

183+ D.dullyellow (D.fromString (rootName ++ concat accesses))

238184

239−-- PROBLEM TO REPORT

240185

186+actualThing :: E.Value -> [D.Doc]

187+actualThing json =

188+ case json of

189+ E.Array _ -> [D.red "array"]

190+ E.Object _ -> [D.red "object"]

191+ E.String _ -> [D.red "string"]

192+ E.Boolean b -> [D.red (if b then "true" else "false"),"value"]

193+ E.Integer n -> ["number",D.red (D.fromInt n)]

194+ E.Number _ -> [D.red "number"]

195+ E.Null -> [D.red "null","value"]

241196

242−data Context

243− = CRoot

244− | CField BS.ByteString Context

245− | CIndex Int Context

246197

198+anExpectedThing :: Json.Type -> [D.Doc]

199+anExpectedThing tipe =

200+ case tipe of

201+ Json.TObject -> ["an", D.green "OBJECT" <> "."]

202+ Json.TArray -> ["an", D.green "ARRAY" <> "."]

203+ Json.TString -> ["a", D.green "STRING" <> "."]

204+ Json.TBool -> ["a", D.green "BOOLEAN" <> "."]

205+ Json.TInt -> ["an", D.green "INT" <> "."]

206+ Json.TObjectWith field -> ["an",D.green "OBJECT","with","a",D.green ("\"" <> D.fromString (Text.unpack field) <> "\""),"field."]

207+ Json.TArrayPair len ->

208+ ["an",D.green "ARRAY","with",D.green "TWO","entries."

209+ ,"This","array","has",D.fromInt len, if len == 1 then "element." else "elements."

210+ ]

247211

248−problemToReport :: FilePath -> FailureToReport x -> Code.Source -> Context -> Problem x -> Reason -> Help.Report

249−problemToReport path ftr source context problem reason =

250− case problem of

251− Field field prob ->

252− problemToReport path ftr source (CField field context) prob reason

253212

254− Index index prob ->

255− problemToReport path ftr source (CIndex index context) prob reason

213+toBullet :: [D.Doc] -> (e -> [D.Doc]) -> Theory e -> D.Doc

214+toBullet intro userErrorToDocs theory =

215+ D.indent 4 $ D.fillSep $ (++) intro $

216+ case theory of

217+ Failure userError ->

218+ userErrorToDocs userError

256219

257− OneOf p ps ->

258− -- NOTE: only displays the deepest problem. This works well for the kind

259− -- of JSON used by Elm, but probably would not work well in general.

260− let

261− (NE.List prob _) = NE.sortBy (negate . getMaxDepth) (NE.List p ps)

262− in

263− problemToReport path ftr source context prob reason

220+ Expecting tipe ->

221+ ["I","was","expecting"] ++ anExpectedThing tipe

222+

223+

224+

225+-- TO FLAT ERRORS

264226

265− Failure region x ->

266− _failureToReport ftr path source context region x

267227

268− Expecting region expectation ->

269− expectationToReport path source context region expectation reason

228+data FlatError e =

229+ FlatError [String] E.Value (Theory e) [Theory e]

270230

271231

272−getMaxDepth :: Problem x -> Int

273−getMaxDepth problem =

274− case problem of

275− Field _ prob -> 1 + getMaxDepth prob

276− Index _ prob -> 1 + getMaxDepth prob

277− OneOf p ps -> maximum (getMaxDepth p : map getMaxDepth ps)

278− Failure _ _ -> 0

279− Expecting _ _ -> 0

232+data Theory e

233+ = Failure e

234+ | Expecting Json.Type

280235

281236

282−newtype FailureToReport x =

283− FailureToReport { _failureToReport :: FilePath -> Code.Source -> Context -> A.Region -> x -> Help.Report }

237+flatten :: Json.Error e -> [FlatError e]

238+flatten jsonError =

239+ let

240+ depth (FlatError accesses _ _ _) =

241+ length accesses

242+ in

243+ List.sortOn depth $ flattenTree (toErrorTree jsonError)

284244

285245

286−expectationToReport :: FilePath -> Code.Source -> Context -> A.Region -> DecodeExpectation -> Reason -> Help.Report

287−expectationToReport path source context (A.Region start end) expectation reason =

246+flattenTree :: ErrorTree e -> [FlatError e]

247+flattenTree (ErrorTree theories subTrees) =

288248 let

289− (A.Position sr _) = start

290− (A.Position er _) = end

249+ addAccess access (FlatError accesses json t ts) =

250+ FlatError (access:accesses) json t ts

291251

292− region =

293− if sr == er then region else A.Region start start

252+ toFlats (name, tree) =

253+ map (addAccess name) (flattenTree tree)

254+

255+ subErrors =

256+ concatMap toFlats (Map.toList subTrees)

257+ in

258+ case theories of

259+ [] ->

260+ subErrors

294261

295− introduction =

296− case context of

297− CRoot ->

298− "I ran into some trouble here:"

262+ (json, theory) : rest ->

263+ FlatError [] json theory (map snd rest) : subErrors

299264

300− CField field _ ->

301− "I ran into trouble with the value of the \"" ++ BS_UTF8.toString field ++ "\" field:"

302265

303− CIndex index (CField field _) ->

304− "When looking at the \"" ++ BS_UTF8.toString field ++ "\" field, I ran into trouble with the "

305− ++ D.intToOrdinal index ++ " entry:"

306266

307− CIndex index _ ->

308− "I ran into trouble with the " ++ D.intToOrdinal index ++ " index of this array:"

267+-- TO ERROR TREE

309268

310− toSnippet title aThing =

311− Help.jsonReport title (Just path) $

312− Code.toSnippet source region Nothing

313− ( D.reflow (because reason introduction)

314− , D.fillSep $ ["I","was","expecting","to","run","into"] ++ aThing

315− )

269+

270+data ErrorTree e =

271+ ErrorTree

272+ { _theories :: [(E.Value, Theory e)]

273+ , _subErrors :: Map.Map String (ErrorTree e)

274+ }

275+

276+

277+toErrorTree :: Json.Error e -> ErrorTree e

278+toErrorTree jsonError =

279+ add jsonError empty

280+

281+

282+empty :: ErrorTree e

283+empty =

284+ ErrorTree [] Map.empty

285+

286+

287+add :: Json.Error e -> ErrorTree e -> ErrorTree e

288+add jsonError tree@(ErrorTree theories subErrors) =

289+ case jsonError of

290+ Json.Field field subErr ->

291+ ErrorTree theories (addName (fieldToName field) subErr subErrors)

292+

293+ Json.Index index subErr ->

294+ ErrorTree theories (addName (indexToName index) subErr subErrors)

295+

296+ Json.OneOf errors ->

297+ foldr add tree errors

298+

299+ Json.Expecting json tipe ->

300+ ErrorTree ((json, Expecting tipe) : theories) subErrors

301+

302+ Json.Failure json err ->

303+ ErrorTree ((json, Failure err) : theories) subErrors

304+

305+

306+addName :: String -> Json.Error e -> Map.Map String (ErrorTree e) -> Map.Map String (ErrorTree e)

307+addName name err subErrors =

308+ let

309+ subAdd maybeCrush =

310+ Just (add err (maybe empty id maybeCrush))

316311 in

317− case expectation of

318− TObject ->

319− toSnippet "EXPECTING OBJECT" ["an", D.green "OBJECT" <> "."]

312+ Map.alter subAdd name subErrors

320313

321− TArray ->

322− toSnippet "EXPECTING ARRAY" ["an", D.green "ARRAY" <> "."]

323314

324− TString ->

325− toSnippet "EXPECTING STRING" ["a", D.green "STRING" <> "."]

315+fieldToName :: Text.Text -> String

316+fieldToName field =

317+ case Text.unpack field of

318+ [] ->

319+ "['']"

326320

327− TBool ->

328− toSnippet "EXPECTING BOOL" ["a", D.green "BOOLEAN" <> "."]

321+ string@(char : rest) ->

322+ if Char.isAlpha char && all Char.isAlphaNum rest then

323+ '.' : string

324+ else

325+ "['" ++ string ++ "']"

329326

330− TInt ->

331− toSnippet "EXPECTING INT" ["an", D.green "INT" <> "."]

332327

333− TObjectWith field ->

334− toSnippet "MISSING FIELD"

335− ["an",D.green "OBJECT","with","a"

336− ,D.green ("\"" <> D.fromChars (BS_UTF8.toString field) <> "\"")

337− ,"field."

338− ]

328+indexToName :: Int -> String

329+indexToName index =

330+ "[" ++ show index ++ "]"

339331

340− TArrayPair len ->

341− toSnippet "EXPECTING PAIR"

342− ["an",D.green "ARRAY","with",D.green "TWO","entries."

343− ,"This","array","has",D.fromInt len, if len == 1 then "element." else "elements."

344− ]

332+-}

compiler/src/Reporting/Error/Pattern.hs+4−5

@@ -8,7 +8,6 @@ module Reporting.Error.Pattern

88

99import qualified Data.List as List

1010

11−import qualified Elm.String as ES

1211import qualified Nitpick.PatternMatches as P

1312import Reporting.Doc ((<>))

1413import qualified Reporting.Doc as D

@@ -41,7 +40,7 @@ toReport source err =

4140 Report.Report "UNSAFE PATTERN" region [] $

4241 Code.toSnippet source region Nothing

4342 (

44− "This pattern does not cover all possibilities:"

43+ "This pattern does not cover all possiblities:"

4544 ,

4645 D.stack

4746 [ "Other possibilities include:"

@@ -64,7 +63,7 @@ toReport source err =

6463 , unhandledPatternsToDocBlock unhandled

6564 , D.reflow $

6665 "I would have to crash if I saw one of those! You can use\

67− \ `let` to deconstruct values only if there is ONE possibility.\

66+ \ `let` to deconstruct values only if there is ONE possiblity.\

6867 \ Switch to a `case` expression to account for all possibilities."

6968 , D.toSimpleHint $

7069 "Are you calling a function that definitely returns values\

@@ -118,10 +117,10 @@ patternToDoc context pattern =

118117 NonList (P.Literal literal) ->

119118 case literal of

120119 P.Chr chr ->

121− "'" <> D.fromChars (ES.toChars chr) <> "'"

120+ "'" <> D.fromUtf8 chr <> "'"

122121

123122 P.Str str ->

124− "\"" <> D.fromChars (ES.toChars str) <> "\""

123+ "\"" <> D.fromUtf8 str <> "\""

125124

126125 P.Int int ->

127126 D.fromInt int

compiler/src/Reporting/Error/Syntax.hs+1269−4332

This diff is too big to show here.

compiler/src/Reporting/Error/Type.hs+23−44

This diff is too big to show here.

compiler/src/Reporting/Render/Code.hs+43−70

This diff is too big to show here.

compiler/src/Reporting/Render/Type/Localizer.hs+26−6

This diff is too big to show here.

compiler/src/Reporting/Result.hs−10

This diff is too big to show here.

compiler/src/Type/Error.hs+123−14

This diff is too big to show here.

compiler/src/Type/Solve.hs−7

This diff is too big to show here.

compiler/src/Type/Unify.hs+10−12

This diff is too big to show here.

docs/elm.json/application.md+2−2

This diff is too big to show here.

docs/elm.json/package.md+1−1

This diff is too big to show here.

docs/upgrade-instructions/0.19.1.mddeleted−60

This diff is too big to show here.

elm.cabal+16−34

This diff is too big to show here.

hints/bad-recursion.mddeleted−133

This diff is too big to show here.

hints/comparing-custom-types.mddeleted−98

This diff is too big to show here.

hints/comparing-records.mddeleted−85

This diff is too big to show here.

hints/implicit-casts.mddeleted−50

This diff is too big to show here.

hints/import-cycles.mddeleted−184

This diff is too big to show here.

hints/imports.mddeleted−126

This diff is too big to show here.

hints/infinite-type.mddeleted−42

This diff is too big to show here.

hints/init.mddeleted−55

This diff is too big to show here.

hints/missing-patterns.mddeleted−139

This diff is too big to show here.

hints/optimize.mddeleted−59

This diff is too big to show here.

hints/port-modules.mddeleted−32

This diff is too big to show here.

hints/recursive-alias.mddeleted−162

This diff is too big to show here.

hints/repl.mddeleted−73

This diff is too big to show here.

hints/shadowing.mddeleted−70

This diff is too big to show here.

hints/tuples.mddeleted−19

This diff is too big to show here.

hints/type-annotations.mddeleted−60

This diff is too big to show here.

installers/README.mddeleted−32

This diff is too big to show here.

installers/linux/Dockerfiledeleted−39

This diff is too big to show here.

installers/linux/README.mddeleted−93

This diff is too big to show here.

installers/mac/Distribution.xml+3−5

This diff is too big to show here.

installers/mac/README.mddeleted−93

This diff is too big to show here.

installers/mac/Resources/en.lproj/background.pngnew file

Binary file not shown.

installers/mac/Resources/en.lproj/conclusion.rtf+6−13

This diff is too big to show here.

installers/mac/Resources/en.lproj/welcome.rtf+4−9

This diff is too big to show here.

installers/mac/helper-scripts/elm-startup.sh+1−1

This diff is too big to show here.

installers/mac/make-installer.sh+3−30

This diff is too big to show here.

installers/npm/PUBLISHING.md+141−29

This diff is too big to show here.

installers/npm/README.md+23−30

This diff is too big to show here.

installers/npm/bin/elm+16−42

This diff is too big to show here.

installers/npm/download.js+67−68

This diff is too big to show here.

installers/npm/install.js+7−1

This diff is too big to show here.

installers/npm/package.json+7−6

This diff is too big to show here.

installers/npm/troubleshooting.mddeleted−76

This diff is too big to show here.

installers/win/Nsisfile.nsi+16−16

This diff is too big to show here.

installers/win/README.md+3−18

This diff is too big to show here.

installers/win/file.iconew file

Binary file not shown.

installers/win/inst.dat+2−1

This diff is too big to show here.

installers/win/logo.ico

Binary file not shown.

installers/win/uninst.dat+2−1

This diff is too big to show here.

installers/win/welcome.bmp

Binary file not shown.

reactor/assets/waiting.gifnew file

Binary file not shown.

reactor/elm.json+2−2

This diff is too big to show here.

reactor/src/Index.elm+15−20

This diff is too big to show here.

reactor/src/Index/Navigator.elm+1−1

This diff is too big to show here.

roadmap.mddeleted−29

This diff is too big to show here.

terminal/impl/Terminal/Helpers.hsdeleted−148

This diff is too big to show here.

terminal/src/Bump.hs+8−158

This diff is too big to show here.

terminal/src/Develop.hs+77−70

This diff is too big to show here.

terminal/src/Develop/Generate/Index.hs+74−149

This diff is too big to show here.

terminal/src/Develop/StaticFiles.hs+7−1

This diff is too big to show here.

terminal/src/Develop/StaticFiles/Build.hs+29−46

This diff is too big to show here.

terminal/src/Diff.hs+6−348

This diff is too big to show here.

terminal/src/Init.hs+1−2

This diff is too big to show here.

terminal/src/Install.hs+31−16

This diff is too big to show here.

terminal/src/Main.hs+36−32

This diff is too big to show here.

terminal/src/Make.hs+268−113

This diff is too big to show here.

terminal/src/Publish.hs+8−529

This diff is too big to show here.

terminal/src/Repl.hs+197−522

This diff is too big to show here.

terminal/impl/Terminal.hs → terminal/src/Terminal/Args.hsrenamed+27−33

This diff is too big to show here.

terminal/impl/Terminal/Chomp.hs → terminal/src/Terminal/Args/Chomp.hsrenamed+5−4

This diff is too big to show here.

terminal/impl/Terminal/Error.hs → terminal/src/Terminal/Args/Error.hsrenamed+18−28

This diff is too big to show here.

terminal/src/Terminal/Args/Helpers.hsnew file+125

This diff is too big to show here.

terminal/impl/Terminal/Internal.hs → terminal/src/Terminal/Args/Internal.hsrenamed+8−8

This diff is too big to show here.

docs/upgrade-instructions/0.16.md → upgrade-docs/0.16.mdrenamed

The content is the same.

docs/upgrade-instructions/0.17.md → upgrade-docs/0.17.mdrenamed

The content is the same.

docs/upgrade-instructions/0.18.md → upgrade-docs/0.18.mdrenamed

The content is the same.

docs/upgrade-instructions/0.19.0.md → upgrade-docs/0.19.mdrenamed

The content is the same.

docs/upgrade-instructions/earlier.md → upgrade-docs/earlier.mdrenamed

The content is the same.

worker/elm.cabal+3−25

This diff is too big to show here.

worker/elm.jsondeleted−26

This diff is too big to show here.

worker/nginx.confdeleted−22

This diff is too big to show here.

worker/outlines/compile/elm.jsondeleted−32

This diff is too big to show here.

worker/outlines/repl/elm.jsondeleted−19

This diff is too big to show here.

worker/src/Artifacts.hsdeleted−155

This diff is too big to show here.

worker/src/Cors.hsdeleted−48

This diff is too big to show here.

worker/src/Endpoint/Compile.hsdeleted−323

This diff is too big to show here.

worker/src/Endpoint/Quotes.hsdeleted−114

This diff is too big to show here.

worker/src/Endpoint/Repl.hsdeleted−244

This diff is too big to show here.

worker/src/Errors.elmdeleted−217

This diff is too big to show here.

worker/src/Main.hs+202−37

This diff is too big to show here.