on 6b44d2a help sign in
109 files changed+1614−3281
since splitsnapshots
unifiedsplit
.github/CONTRIBUTING.md+20−18 .github/PULL_REQUEST_TEMPLATE.md−18 .github/workflows/set-issue-expectations.yml−21 .github/workflows/set-pull-expectations.yml−19 .gitignore−1 .travis.yml−28 ContributorAgreement.pdf LICENSE+25−6 README.md+5−10 builder/src/Build.hs+183−204 builder/src/Elm/Details.hs+1−1 builder/src/Elm/Outline.hs+12−96 builder/src/Generate.hs+6−6 builder/src/Http.hs+1−1 builder/src/Reporting.hs+2−2 builder/src/Reporting/Exit.hs+60−44 builder/src/Reporting/Exit/Help.hs+5−5 builder/src/Stuff.hs+1−1 compiler/src/AST/Source.hs+5−5 compiler/src/AST/Utils/Type.hs+1 compiler/src/Canonicalize/Environment.hs+20−50 compiler/src/Canonicalize/Environment/Dups.hs+1−1 compiler/src/Canonicalize/Environment/Foreign.hs+37−49 compiler/src/Canonicalize/Environment/Local.hs+5−5 compiler/src/Canonicalize/Expression.hs+7−6 compiler/src/Canonicalize/Module.hs+7−7 compiler/src/Canonicalize/Pattern.hs+2−3 compiler/src/Data/Name.hs+1−1 compiler/src/Data/Utf8.hs+1−3 compiler/src/Elm/Compiler/Imports.hs+3−3 compiler/src/Elm/Kernel.hs+6−6 compiler/src/Elm/ModuleName.hs+6−2 compiler/src/Generate/Html.hs+8−4 compiler/src/Generate/JavaScript.hs+9−44 compiler/src/Parse/Module.hs+14−21 compiler/src/Parse/Pattern.hs+1−1 compiler/src/Parse/Variable.hs+2−2 compiler/src/Reporting/Error.hs+16−20 compiler/src/Reporting/Error/Canonicalize.hs+16−21 compiler/src/Reporting/Error/Import.hs+1−1 compiler/src/Reporting/Error/Pattern.hs+2−2 compiler/src/Reporting/Error/Syntax.hs+370−466 compiler/src/Reporting/Render/Code.hs+24−35 compiler/src/Reporting/Render/Type/Localizer.hs+5−5 docs/elm.json/application.md+2−2 docs/elm.json/package.md+1−1 docs/upgrade-instructions/0.19.1.md−60 elm.cabal+5−6 hints/bad-recursion.md+1−1 hints/comparing-custom-types.md+2−2 hints/comparing-records.md+3−3 hints/implicit-casts.md+4−1 hints/import-cycles.md+1−1 hints/optimize.md+2−2 hints/recursive-alias.md+2−2 hints/type-annotations.md+3−1 installers/README.md−32 installers/linux/Dockerfile+19−33 installers/linux/README.md−93 installers/mac/Distribution.xml+3−5 installers/mac/README.md−93 installers/mac/Resources/en.lproj/background.png installers/mac/Resources/en.lproj/conclusion.rtf+6−13 installers/mac/Resources/en.lproj/welcome.rtf+4−9 installers/mac/helper-scripts/elm-startup.sh+1−1 installers/mac/make-installer.sh+3−30 installers/npm/PUBLISHING.md+141−29 installers/npm/README.md+23−30 installers/npm/bin/elm+17−42 installers/npm/download.js+68−68 installers/npm/install.js+7−1 installers/npm/package.json+7−6 installers/npm/troubleshooting.md−76 installers/win/Nsisfile.nsi+15−15 installers/win/README.md+3−18 installers/win/file.ico installers/win/inst.dat+2−1 installers/win/logo.ico installers/win/uninst.dat+2−1 installers/win/welcome.bmp roadmap.md−29 terminal/src/Develop.hs+2−2 terminal/src/Develop/StaticFiles/Build.hs+3−3 terminal/src/Init.hs+1−1 terminal/src/Main.hs+19−19 terminal/src/Make.hs+16−16 terminal/src/Publish.hs+5 terminal/src/Repl.hs+3−30 terminal/impl/Terminal.hs → terminal/src/Terminal/Args.hs+27−30 terminal/impl/Terminal/Chomp.hs → terminal/src/Terminal/Args/Chomp.hs+5−4 terminal/impl/Terminal/Error.hs → terminal/src/Terminal/Args/Error.hs+13−12 terminal/impl/Terminal/Helpers.hs → terminal/src/Terminal/Args/Helpers.hs+2−2 terminal/impl/Terminal/Internal.hs → terminal/src/Terminal/Args/Internal.hs+8−8 docs/upgrade-instructions/0.16.md → upgrade-docs/0.16.md docs/upgrade-instructions/0.17.md → upgrade-docs/0.17.md docs/upgrade-instructions/0.18.md → upgrade-docs/0.18.md docs/upgrade-instructions/0.19.0.md → upgrade-docs/0.19.md docs/upgrade-instructions/earlier.md → upgrade-docs/earlier.md worker/elm.cabal−13 worker/elm.json+8−3 worker/outlines/compile/elm.json−32 worker/outlines/repl/elm.json−19 worker/src/Artifacts.hs−155 worker/src/Cors.hs−48 worker/src/Endpoint/Compile.hs−323 worker/src/Endpoint/Quotes.hs−114 worker/src/Endpoint/Repl.hs−244 worker/src/Errors.elm−217 worker/src/Main.hs+264−35
.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 @@
1−Copyright 2012-present Evan Czaplicki
1+Copyright (c) 2012-present, Evan Czaplicki
22
3−Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
3+All rights reserved.
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/Build.hs+183−204
@@ -2,15 +2,15 @@
22{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings #-}
33module Build
44 ( fromExposed
5− , fromPaths
5+ , fromMains
66 , fromRepl
77 , Artifacts(..)
8− , Root(..)
8+ , Main(..)
99 , Module(..)
1010 , CachedInterface(..)
1111 , ReplArtifacts(..)
1212 , DocsGoal(..)
13− , getRootNames
13+ , getMainNames
1414 )
1515 where
1616
@@ -42,7 +42,6 @@ import qualified Elm.Details as Details
4242import qualified Elm.Docs as Docs
4343import qualified Elm.Interface as I
4444import qualified Elm.ModuleName as ModuleName
45−import qualified Elm.Outline as Outline
4645import qualified Elm.Package as Pkg
4746import qualified File
4847import qualified Json.Encode as E
@@ -50,7 +49,6 @@ import qualified Parse.Module as Parse
5049import qualified Reporting
5150import qualified Reporting.Annotation as A
5251import qualified Reporting.Error as Error
53−import qualified Reporting.Error.Docs as EDocs
5452import qualified Reporting.Error.Syntax as Syntax
5553import qualified Reporting.Error.Import as Import
5654import qualified Reporting.Exit as Exit
@@ -67,46 +65,21 @@ data Env =
6765 { _key :: Reporting.BKey
6866 , _root :: FilePath
6967 , _project :: Parse.ProjectType
70− , _srcDirs :: [AbsoluteSrcDir]
68+ , _srcDirs :: [FilePath]
7169 , _buildID :: Details.BuildID
7270 , _locals :: Map.Map ModuleName.Raw Details.Local
7371 , _foreigns :: Map.Map ModuleName.Raw Details.Foreign
7472 }
7573
7674
77−makeEnv :: Reporting.BKey -> FilePath -> Details.Details -> IO Env
75+makeEnv :: Reporting.BKey -> FilePath -> Details.Details -> Env
7876makeEnv key root (Details.Details _ validOutline buildID locals foreigns _) =
7977 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
78+ Details.ValidApp srcDirs ->
79+ Env key root Parse.Application (NE.toList srcDirs) buildID locals foreigns
8380
8481 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
82+ Env key root (Parse.Package pkg) ["src"] buildID locals foreigns
11083
11184
11285
@@ -137,7 +110,7 @@ forkWithKey func dict =
137110fromExposed :: Reporting.Style -> FilePath -> Details.Details -> DocsGoal docs -> NE.List ModuleName.Raw -> IO (Either Exit.BuildProblem docs)
138111fromExposed style root details docsGoal exposed@(NE.List e es) =
139112 Reporting.trackBuild style $ \key ->
140− do env <- makeEnv key root details
113+ do let env = makeEnv key root details
141114 dmvar <- Details.loadInterfaces root details
142115
143116 -- crawl
@@ -160,18 +133,18 @@ fromExposed style root details docsGoal exposed@(NE.List e es) =
160133 putMVar rmvar resultMVars
161134 results <- traverse readMVar resultMVars
162135 writeDetails root details results
163− finalizeExposed root docsGoal exposed results
136+ finalizeExposed docsGoal exposed results
164137
165138
166139
167−-- FROM PATHS
140+-- FROM MAINS
168141
169142
170143data Artifacts =
171144 Artifacts
172145 { _name :: Pkg.Name
173146 , _deps :: Dependencies
174− , _roots :: NE.List Root
147+ , _mains :: NE.List Main
175148 , _modules :: [Module]
176149 }
177150
@@ -185,25 +158,25 @@ type Dependencies =
185158 Map.Map ModuleName.Canonical I.DependencyInterface
186159
187160
188−fromPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)
189−fromPaths style root details paths =
161+fromMains :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> IO (Either Exit.BuildProblem Artifacts)
162+fromMains style root details paths =
190163 Reporting.trackBuild style $ \key ->
191− do env <- makeEnv key root details
164+ do let env = makeEnv key root details
192165
193− elroots <- findRoots env paths
194− case elroots of
166+ elmains <- findMains env paths
167+ case elmains of
195168 Left problem ->
196169 return (Left (Exit.BuildProjectProblem problem))
197170
198− Right lroots ->
171+ Right lmains ->
199172 do -- crawl
200173 dmvar <- Details.loadInterfaces root details
201174 smvar <- newMVar Map.empty
202− srootMVars <- traverse (fork . crawlRoot env smvar) lroots
203− sroots <- traverse readMVar srootMVars
175+ smainMVars <- traverse (fork . crawlMain env smvar) lmains
176+ smains <- traverse readMVar smainMVars
204177 statuses <- traverse readMVar =<< readMVar smvar
205178
206− midpoint <- checkMidpointAndRoots dmvar statuses sroots
179+ midpoint <- checkMainsMidpoint dmvar statuses smains
207180 case midpoint of
208181 Left problem ->
209182 return (Left (Exit.BuildProjectProblem problem))
@@ -213,24 +186,24 @@ fromPaths style root details paths =
213186 rmvar <- newEmptyMVar
214187 resultsMVars <- forkWithKey (checkModule env foreigns rmvar) statuses
215188 putMVar rmvar resultsMVars
216− rrootMVars <- traverse (fork . checkRoot env resultsMVars) sroots
189+ rmainMVars <- traverse (fork . checkMain env resultsMVars) smains
217190 results <- traverse readMVar resultsMVars
218191 writeDetails root details results
219− toArtifacts env foreigns results <$> traverse readMVar rrootMVars
192+ toArtifacts env foreigns results <$> traverse readMVar rmainMVars
220193
221194
222195
223−-- GET ROOT NAMES
196+-- GET MAIN NAMES
224197
225198
226−getRootNames :: Artifacts -> NE.List ModuleName.Raw
227−getRootNames (Artifacts _ _ roots _) =
228− fmap getRootName roots
199+getMainNames :: Artifacts -> NE.List ModuleName.Raw
200+getMainNames (Artifacts _ _ mains _) =
201+ fmap getMainName mains
229202
230203
231−getRootName :: Root -> ModuleName.Raw
232−getRootName root =
233− case root of
204+getMainName :: Main -> ModuleName.Raw
205+getMainName main =
206+ case main of
234207 Inside name -> name
235208 Outside name _ _ -> name
236209
@@ -268,8 +241,9 @@ crawlDeps env mvar deps blockedValue =
268241crawlModule :: Env -> MVar StatusDict -> DocsNeed -> ModuleName.Raw -> IO Status
269242crawlModule env@(Env _ root projectType srcDirs buildID locals foreigns) mvar docsNeed name =
270243 do let fileName = ModuleName.toFilePath name <.> "elm"
244+ let inRoot path = File.exists (root </> path)
271245
272− paths <- filterM File.exists (map (`addRelative` fileName) srcDirs)
246+ paths <- filterM inRoot (map (</> fileName) srcDirs)
273247
274248 case paths of
275249 [path] ->
@@ -289,7 +263,7 @@ crawlModule env@(Env _ root projectType srcDirs buildID locals foreigns) mvar do
289263 else crawlDeps env mvar deps (SCached local)
290264
291265 p1:p2:ps ->
292− return $ SBadImport $ Import.AmbiguousLocal (FP.makeRelative root p1) (FP.makeRelative root p2) (map (FP.makeRelative root) ps)
266+ return $ SBadImport $ Import.AmbiguousLocal p1 p2 ps
293267
294268 [] ->
295269 case Map.lookup name foreigns of
@@ -585,11 +559,11 @@ checkMidpoint dmvar statuses =
585559 return (Left (Exit.BP_Cycle name names))
586560
587561
588−checkMidpointAndRoots :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List RootStatus -> IO (Either Exit.BuildProjectProblem Dependencies)
589−checkMidpointAndRoots dmvar statuses sroots =
562+checkMainsMidpoint :: MVar (Maybe Dependencies) -> Map.Map ModuleName.Raw Status -> NE.List MainStatus -> IO (Either Exit.BuildProjectProblem Dependencies)
563+checkMainsMidpoint dmvar statuses smains =
590564 case checkForCycles statuses of
591565 Nothing ->
592− case checkUniqueRoots statuses sroots of
566+ case checkUniqueMains statuses smains of
593567 Nothing ->
594568 do maybeForeigns <- readMVar dmvar
595569 case maybeForeigns of
@@ -651,14 +625,14 @@ addToGraph name status graph =
651625
652626
653627
654−-- CHECK UNIQUE ROOTS
628+-- CHECK UNIQUE MAINS
655629
656630
657−checkUniqueRoots :: Map.Map ModuleName.Raw Status -> NE.List RootStatus -> Maybe Exit.BuildProjectProblem
658−checkUniqueRoots insides sroots =
631+checkUniqueMains :: Map.Map ModuleName.Raw Status -> NE.List MainStatus -> Maybe Exit.BuildProjectProblem
632+checkUniqueMains insides smains =
659633 let
660634 outsidesDict =
661− Map.fromListWith OneOrMore.more (Maybe.mapMaybe rootStatusToNamePathPair (NE.toList sroots))
635+ Map.fromListWith OneOrMore.more (Maybe.mapMaybe mainStatusToNamePathPair (NE.toList smains))
662636 in
663637 case Map.traverseWithKey checkOutside outsidesDict of
664638 Left problem ->
@@ -670,9 +644,9 @@ checkUniqueRoots insides sroots =
670644 Left problem -> Just problem
671645
672646
673−rootStatusToNamePathPair :: RootStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)
674−rootStatusToNamePathPair sroot =
675− case sroot of
647+mainStatusToNamePathPair :: MainStatus -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore FilePath)
648+mainStatusToNamePathPair smain =
649+ case smain of
676650 SInside _ -> Nothing
677651 SOutsideOk (Details.Local path _ _ _ _ _) _ modul -> Just (Src.getName modul, OneOrMore.one path)
678652 SOutsideErr _ -> Nothing
@@ -682,14 +656,14 @@ checkOutside :: ModuleName.Raw -> OneOrMore.OneOrMore FilePath -> Either Exit.Bu
682656checkOutside name paths =
683657 case OneOrMore.destruct NE.List paths of
684658 NE.List p [] -> Right p
685− NE.List p1 (p2:_) -> Left (Exit.BP_RootNameDuplicate name p1 p2)
659+ NE.List p1 (p2:_) -> Left (Exit.BP_MainNameDuplicate name p1 p2)
686660
687661
688662checkInside :: ModuleName.Raw -> FilePath -> Status -> Either Exit.BuildProjectProblem ()
689663checkInside name p1 status =
690664 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)
665+ SCached (Details.Local p2 _ _ _ _ _) -> Left (Exit.BP_MainNameDuplicate name p1 p2)
666+ SChanged (Details.Local p2 _ _ _ _ _) _ _ _ -> Left (Exit.BP_MainNameDuplicate name p1 p2)
693667 SBadImport _ -> Right ()
694668 SBadSyntax _ _ _ _ -> Right ()
695669 SForeign _ -> Right ()
@@ -707,30 +681,25 @@ compile (Env key root projectType _ buildID _ _) docsNeed (Details.Local path ti
707681 in
708682 case Compile.compile pkg ifaces modul of
709683 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)
684+ do let name = Src.getName modul
685+ let iface = I.fromModule pkg canonical annotations
686+ let docs = makeDocs docsNeed canonical
687+ let elmi = Stuff.elmi root name
688+ File.writeBinary (Stuff.elmo root name) objects
689+ maybeOldi <- File.readBinary elmi
690+ case maybeOldi of
691+ Just oldi | oldi == iface ->
692+ do -- iface should be fully forced by equality check
693+ Reporting.report key Reporting.BDone
694+ let local = Details.Local path time deps main lastChange buildID
695+ return (RSame local iface objects docs)
696+
697+ _ ->
698+ do -- iface may be lazy still
699+ File.writeBinary elmi iface
700+ Reporting.report key Reporting.BDone
701+ let local = Details.Local path time deps main buildID buildID
702+ return (RNew local iface objects docs)
734703
735704 Left err ->
736705 return $ RProblem $
@@ -771,8 +740,8 @@ addNewLocal name result locals =
771740-- FINALIZE EXPOSED
772741
773742
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 =
743+finalizeExposed :: DocsGoal docs -> NE.List ModuleName.Raw -> Map.Map ModuleName.Raw Result -> IO (Either Exit.BuildProblem docs)
744+finalizeExposed docsGoal exposed results =
776745 case foldr (addImportProblems results) [] (NE.toList exposed) of
777746 p:ps ->
778747 return $ Left $ Exit.BuildProjectProblem (Exit.BP_MissingExposed (NE.List p ps))
@@ -780,7 +749,7 @@ finalizeExposed root docsGoal exposed results =
780749 [] ->
781750 case Map.foldr addErrors [] results of
782751 [] -> Right <$> finalizeDocs docsGoal results
783− e:es -> return $ Left $ Exit.BuildBadModules root e es
752+ e:es -> return $ Left $ Exit.BuildBadModules e es
784753
785754
786755addErrors :: Result -> [Error.Module] -> [Error.Module]
@@ -831,14 +800,14 @@ toDocsNeed goal =
831800 KeepDocs -> DocsNeed True
832801
833802
834−makeDocs :: DocsNeed -> Can.Module -> Either EDocs.Error (Maybe Docs.Module)
803+makeDocs :: DocsNeed -> Can.Module -> Maybe Docs.Module
835804makeDocs (DocsNeed isNeeded) modul =
836805 if isNeeded then
837806 case Docs.fromModule modul of
838− Right docs -> Right (Just docs)
839− Left err -> Left err
807+ Right docs -> Just docs
808+ Left _ -> Nothing
840809 else
841− Right Nothing
810+ Nothing
842811
843812
844813finalizeDocs :: DocsGoal docs -> Map.Map ModuleName.Raw Result -> IO docs
@@ -887,33 +856,35 @@ data ReplArtifacts =
887856
888857fromRepl :: FilePath -> Details.Details -> B.ByteString -> IO (Either Exit.Repl ReplArtifacts)
889858fromRepl 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
859+ let
860+ env@(Env _ _ projectType _ _ _ _) = makeEnv Reporting.ignorer root details
861+ in
862+ case Parse.fromByteString projectType source of
863+ Left syntaxError ->
864+ return $ Left $ Exit.ReplBadInput source $ Error.BadSyntax syntaxError
894865
895− Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
896− do dmvar <- Details.loadInterfaces root details
866+ Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
867+ do dmvar <- Details.loadInterfaces root details
897868
898− let deps = map Src.getImportName imports
899− mvar <- newMVar Map.empty
900− crawlDeps env mvar deps ()
869+ let deps = map Src.getImportName imports
870+ mvar <- newMVar Map.empty
871+ crawlDeps env mvar deps ()
901872
902− statuses <- traverse readMVar =<< readMVar mvar
903− midpoint <- checkMidpoint dmvar statuses
873+ statuses <- traverse readMVar =<< readMVar mvar
874+ midpoint <- checkMidpoint dmvar statuses
904875
905− case midpoint of
906− Left problem ->
907− return $ Left $ Exit.ReplProjectProblem problem
876+ case midpoint of
877+ Left problem ->
878+ return $ Left $ Exit.ReplProjectProblem problem
908879
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
880+ Right foreigns ->
881+ do rmvar <- newEmptyMVar
882+ resultMVars <- forkWithKey (checkModule env foreigns rmvar) statuses
883+ putMVar rmvar resultMVars
884+ results <- traverse readMVar resultMVars
885+ writeDetails root details results
886+ depsStatus <- checkDeps root resultMVars deps 0
887+ finalizeReplArtifacts env source modul depsStatus resultMVars results
917888
918889
919890finalizeReplArtifacts :: Env -> B.ByteString -> Src.Module -> DepsStatus -> ResultDict -> Map.Map ModuleName.Raw Result -> IO (Either Exit.Repl ReplArtifacts)
@@ -948,7 +919,7 @@ finalizeReplArtifacts env@(Env _ root projectType _ _ _ _) source modul@(Src.Mod
948919 DepsBlock ->
949920 case Map.foldr addErrors [] results of
950921 [] -> return $ Left $ Exit.ReplBlocked
951− e:es -> return $ Left $ Exit.ReplBadLocalDeps root e es
922+ e:es -> return $ Left $ Exit.ReplBadLocalDeps e es
952923
953924 DepsNotFound problems ->
954925 return $ Left $ Exit.ReplBadInput source $ Error.BadImports $
@@ -964,25 +935,25 @@ finalizeReplArtifacts env@(Env _ root projectType _ _ _ _) source modul@(Src.Mod
964935
965936
966937
967−-- FIND ROOT
938+-- FIND MAIN
968939
969940
970−data RootLocation
941+data MainLocation
971942 = LInside ModuleName.Raw
972943 | LOutside FilePath
973944
974945
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
946+findMains :: Env -> NE.List FilePath -> IO (Either Exit.BuildProjectProblem (NE.List MainLocation))
947+findMains env paths =
948+ do mvars <- traverse (fork . findLocation env) paths
949+ elocs <- traverse readMVar mvars
950+ return $ checkLocations =<< sequence elocs
980951
981952
982−checkRoots :: NE.List RootInfo -> Either Exit.BuildProjectProblem (NE.List RootLocation)
983−checkRoots infos =
953+checkLocations :: NE.List Location -> Either Exit.BuildProjectProblem (NE.List MainLocation)
954+checkLocations locations =
984955 let
985− toOneOrMore loc@(RootInfo absolute _ _) =
956+ toOneOrMore loc@(Location absolute _ _) =
986957 (absolute, OneOrMore.one loc)
987958
988959 fromOneOrMore loc locs =
@@ -990,33 +961,33 @@ checkRoots infos =
990961 [] -> Right ()
991962 loc2:_ -> Left (Exit.BP_MainPathDuplicate (_relative loc) (_relative loc2))
992963 in
993− fmap (\_ -> fmap _location infos) $
964+ fmap (\_ -> fmap _location locations) $
994965 traverse (OneOrMore.destruct fromOneOrMore) $
995− Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList infos)
966+ Map.fromListWith OneOrMore.more $ map toOneOrMore (NE.toList locations)
996967
997968
998969
999−-- ROOT INFO
970+-- LOCATIONS
1000971
1001972
1002−data RootInfo =
1003− RootInfo
973+data Location =
974+ Location
1004975 { _absolute :: FilePath
1005976 , _relative :: FilePath
1006− , _location :: RootLocation
977+ , _location :: MainLocation
1007978 }
1008979
1009980
1010−getRootInfo :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)
1011−getRootInfo env path =
981+findLocation :: Env -> FilePath -> IO (Either Exit.BuildProjectProblem Location)
982+findLocation env path =
1012983 do exists <- File.exists path
1013984 if exists
1014− then getRootInfoHelp env path =<< Dir.canonicalizePath path
985+ then findLoc env path =<< Dir.canonicalizePath path
1015986 else return (Left (Exit.BP_PathUnknown path))
1016987
1017988
1018−getRootInfoHelp :: Env -> FilePath -> FilePath -> IO (Either Exit.BuildProjectProblem RootInfo)
1019−getRootInfoHelp (Env _ _ _ srcDirs _ _ _) path absolutePath =
989+findLoc :: Env -> FilePath -> FilePath -> IO (Either Exit.BuildProjectProblem Location)
990+findLoc (Env _ root _ srcDirs _ _ _) path absolutePath =
1020991 let
1021992 (dirs, file) = FP.splitFileName absolutePath
1022993 (final, ext) = FP.splitExtension file
@@ -1026,39 +997,45 @@ getRootInfoHelp (Env _ _ _ srcDirs _ _ _) path absolutePath =
1026997 return $ Left $ Exit.BP_WithBadExtension path
1027998 else
1028999 let
1029− absoluteSegments = FP.splitDirectories dirs ++ [final]
1000+ roots = FP.splitDirectories root
1001+ segments = FP.splitDirectories dirs ++ [final]
10301002 in
1031− case Maybe.mapMaybe (isInsideSrcDirByPath absoluteSegments) srcDirs of
1032− [] ->
1033− return $ Right $ RootInfo absolutePath path (LOutside path)
1003+ case dropPrefix roots segments of
1004+ Nothing ->
1005+ return $ Right $ Location absolutePath path (LOutside path)
1006+
1007+ Just relativeSegments ->
1008+ case Maybe.mapMaybe (isInsideSrcDirByPath relativeSegments) srcDirs of
1009+ [] ->
1010+ return $ Right $ Location absolutePath path (LOutside path)
10341011
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
1012+ [(_, Right names)] ->
1013+ do let name = Name.fromChars (List.intercalate "." names)
1014+ matchingDirs <- filterM (isInsideSrcDirByName root names) srcDirs
1015+ case matchingDirs of
1016+ d1:d2:_ ->
1017+ do let p1 = d1 </> FP.joinPath names <.> "elm"
1018+ let p2 = d2 </> FP.joinPath names <.> "elm"
1019+ return $ Left $ Exit.BP_MainNameDuplicate name p1 p2
10431020
1044− _ ->
1045− return $ Right $ RootInfo absolutePath path (LInside name)
1021+ _ ->
1022+ return $ Right $ Location absolutePath path (LInside name)
10461023
1047− [(s, Left names)] ->
1048− return $ Left $ Exit.BP_RootNameInvalid path s names
1024+ [(s, Left names)] ->
1025+ return $ Left $ Exit.BP_MainNameInvalid path s names
10491026
1050− (s1,_):(s2,_):_ ->
1051− return $ Left $ Exit.BP_WithAmbiguousSrcDir path s1 s2
1027+ (s1,_):(s2,_):_ ->
1028+ return $ Left $ Exit.BP_WithAmbiguousSrcDir path s1 s2
10521029
10531030
10541031
1055−isInsideSrcDirByName :: [String] -> AbsoluteSrcDir -> IO Bool
1056−isInsideSrcDirByName names srcDir =
1057− File.exists (addRelative srcDir (FP.joinPath names <.> "elm"))
1032+isInsideSrcDirByName :: FilePath -> [String] -> FilePath -> IO Bool
1033+isInsideSrcDirByName root names srcDir =
1034+ File.exists (root </> srcDir </> FP.joinPath names <.> "elm")
10581035
10591036
1060−isInsideSrcDirByPath :: [String] -> AbsoluteSrcDir -> Maybe (FilePath, Either [String] [String])
1061−isInsideSrcDirByPath segments (AbsoluteSrcDir srcDir) =
1037+isInsideSrcDirByPath :: [String] -> FilePath -> Maybe (FilePath, Either [String] [String])
1038+isInsideSrcDirByPath segments srcDir =
10621039 case dropPrefix (FP.splitDirectories srcDir) segments of
10631040 Nothing ->
10641041 Nothing
@@ -1079,33 +1056,35 @@ isGoodName name =
10791056 Char.isUpper char && all (\c -> Char.isAlphaNum c || c == '_') chars
10801057
10811058
1082−-- INVARIANT: Dir.canonicalizePath has been run on both inputs
1083−--
10841059dropPrefix :: [FilePath] -> [FilePath] -> Maybe [FilePath]
10851060dropPrefix roots paths =
10861061 case roots of
10871062 [] ->
10881063 Just paths
10891064
1065+ ".":rs ->
1066+ dropPrefix rs paths
1067+
10901068 r:rs ->
10911069 case paths of
1092− [] -> Nothing
1093− p:ps -> if r == p then dropPrefix rs ps else Nothing
1070+ [] -> Nothing
1071+ ".":ps -> dropPrefix roots ps
1072+ p:ps -> if r == p then dropPrefix rs ps else Nothing
10941073
10951074
10961075
1097−-- CRAWL ROOTS
1076+-- CRAWL MAINS
10981077
10991078
1100−data RootStatus
1079+data MainStatus
11011080 = SInside ModuleName.Raw
11021081 | SOutsideOk Details.Local B.ByteString Src.Module
11031082 | SOutsideErr Error.Module
11041083
11051084
1106−crawlRoot :: Env -> MVar StatusDict -> RootLocation -> IO RootStatus
1107−crawlRoot env@(Env _ _ projectType _ buildID _ _) mvar root =
1108− case root of
1085+crawlMain :: Env -> MVar StatusDict -> MainLocation -> IO MainStatus
1086+crawlMain env@(Env _ _ projectType _ buildID _ _) mvar given =
1087+ case given of
11091088 LInside name ->
11101089 do statusMVar <- newEmptyMVar
11111090 statusDict <- takeMVar mvar
@@ -1128,19 +1107,19 @@ crawlRoot env@(Env _ _ projectType _ buildID _ _) mvar root =
11281107
11291108
11301109
1131−-- CHECK ROOTS
1110+-- CHECK MAINS
11321111
11331112
1134−data RootResult
1113+data MainResult
11351114 = RInside ModuleName.Raw
11361115 | ROutsideOk ModuleName.Raw I.Interface Opt.LocalGraph
11371116 | ROutsideErr Error.Module
11381117 | ROutsideBlocked
11391118
11401119
1141−checkRoot :: Env -> ResultDict -> RootStatus -> IO RootResult
1142−checkRoot env@(Env _ root _ _ _ _ _) results rootStatus =
1143− case rootStatus of
1120+checkMain :: Env -> ResultDict -> MainStatus -> IO MainResult
1121+checkMain env@(Env _ root _ _ _ _ _) results pendingMain =
1122+ case pendingMain of
11441123 SInside name ->
11451124 return (RInside name)
11461125
@@ -1167,7 +1146,7 @@ checkRoot env@(Env _ root _ _ _ _ _) results rootStatus =
11671146 Error.BadImports (toImportErrors env results imports problems)
11681147
11691148
1170−compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO RootResult
1149+compileOutside :: Env -> Details.Local -> B.ByteString -> Map.Map ModuleName.Raw I.Interface -> Src.Module -> IO MainResult
11711150compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _) source ifaces modul =
11721151 let
11731152 pkg = projectTypeToPkg projectType
@@ -1186,35 +1165,35 @@ compileOutside (Env key _ projectType _ _ _ _) (Details.Local path time _ _ _ _)
11861165-- TO ARTIFACTS
11871166
11881167
1189−data Root
1168+data Main
11901169 = Inside ModuleName.Raw
11911170 | Outside ModuleName.Raw I.Interface Opt.LocalGraph
11921171
11931172
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
1173+toArtifacts :: Env -> Dependencies -> Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either Exit.BuildProblem Artifacts
1174+toArtifacts (Env _ _ projectType _ _ _ _) foreigns results mainResults =
1175+ case gatherProblemsOrMains results mainResults of
11971176 Left (NE.List e es) ->
1198− Left (Exit.BuildBadModules root e es)
1177+ Left (Exit.BuildBadModules e es)
11991178
1200− Right roots ->
1201− Right $ Artifacts (projectTypeToPkg projectType) foreigns roots $
1202− Map.foldrWithKey addInside (foldr addOutside [] rootResults) results
1179+ Right mains ->
1180+ Right $ Artifacts (projectTypeToPkg projectType) foreigns mains $
1181+ Map.foldrWithKey addInside (foldr addOutside [] mainResults) results
12031182
12041183
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) =
1184+gatherProblemsOrMains :: Map.Map ModuleName.Raw Result -> NE.List MainResult -> Either (NE.List Error.Module) (NE.List Main)
1185+gatherProblemsOrMains results (NE.List mainResult mainResults) =
12071186 let
1208− addResult result (es, roots) =
1187+ sortMain result (es, mains) =
12091188 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)
1189+ RInside n -> ( es, Inside n : mains)
1190+ ROutsideOk n i o -> ( es, Outside n i o : mains)
1191+ ROutsideErr e -> (e:es, mains)
1192+ ROutsideBlocked -> ( es, mains)
12141193
12151194 errors = Map.foldr addErrors [] results
12161195 in
1217− case (rootResult, foldr addResult (errors, []) rootResults) of
1196+ case (mainResult, foldr sortMain (errors, []) mainResults) of
12181197 (RInside n , ( [], ms)) -> Right (NE.List (Inside n) ms)
12191198 (RInside _ , (e:es, _ )) -> Left (NE.List e es)
12201199 (ROutsideOk n i o, ( [], ms)) -> Right (NE.List (Outside n i o) ms)
@@ -1242,9 +1221,9 @@ badInside name =
12421221 "Error from `" ++ Name.toChars name ++ "` should have been reported already."
12431222
12441223
1245−addOutside :: RootResult -> [Module] -> [Module]
1246−addOutside root modules =
1247− case root of
1224+addOutside :: MainResult -> [Module] -> [Module]
1225+addOutside main modules =
1226+ case main of
12481227 RInside _ -> modules
12491228 ROutsideOk name iface objs -> Fresh name iface objs : modules
12501229 ROutsideErr _ -> modules
builder/src/Elm/Details.hs+1−1
@@ -79,7 +79,7 @@ type BuildID = Word64
7979
8080
8181data ValidOutline
82− = ValidApp (NE.List Outline.SrcDir)
82+ = ValidApp (NE.List FilePath)
8383 | ValidPkg Pkg.Name [ModuleName.Raw] (Map.Map Pkg.Name V.Version {- for docs in reactor -})
8484
8585
builder/src/Elm/Outline.hs+12−96
@@ -5,7 +5,6 @@ module Elm.Outline
55 , AppOutline(..)
66 , PkgOutline(..)
77 , Exposed(..)
8− , SrcDir(..)
98 , read
109 , write
1110 , encode
@@ -17,14 +16,11 @@ module Elm.Outline
1716
1817
1918import Prelude hiding (read)
20−import Control.Monad (filterM, liftM)
21−import Data.Binary (Binary, get, put, getWord8, putWord8)
19+import Control.Monad (filterM)
2220import qualified Data.Map as Map
2321import qualified Data.NonEmptyList as NE
24−import qualified Data.OneOrMore as OneOrMore
2522import Foreign.Ptr (minusPtr)
2623import qualified System.Directory as Dir
27−import qualified System.FilePath as FP
2824import System.FilePath ((</>))
2925
3026import qualified Elm.Constraint as Con
@@ -53,7 +49,7 @@ data Outline
5349data AppOutline =
5450 AppOutline
5551 { _app_elm_version :: V.Version
56− , _app_source_dirs :: NE.List SrcDir
52+ , _app_source_dirs :: NE.List FilePath
5753 , _app_deps_direct :: Map.Map Pkg.Name V.Version
5854 , _app_deps_indirect :: Map.Map Pkg.Name V.Version
5955 , _app_test_direct :: Map.Map Pkg.Name V.Version
@@ -79,11 +75,6 @@ data Exposed
7975 | ExposedDict [(Json.String, [ModuleName.Raw])]
8076
8177
82−data SrcDir
83− = AbsoluteSrcDir FilePath
84− | RelativeSrcDir FilePath
85−
86−
8778
8879-- DEFAULTS
8980
@@ -126,7 +117,7 @@ encode outline =
126117 App (AppOutline elm srcDirs depsDirect depsTrans testDirect testTrans) ->
127118 E.object
128119 [ "type" ==> E.chars "application"
129− , "source-directories" ==> E.list encodeSrcDir (NE.toList srcDirs)
120+ , "source-directories" ==> E.list E.chars (NE.toList srcDirs)
130121 , "elm-version" ==> V.encode elm
131122 , "dependencies" ==>
132123 E.object
@@ -174,13 +165,6 @@ encodeDeps encodeValue deps =
174165 E.dict Pkg.toJsonString encodeValue deps
175166
176167
177−encodeSrcDir :: SrcDir -> E.Value
178−encodeSrcDir srcDir =
179− case srcDir of
180− AbsoluteSrcDir dir -> E.chars dir
181− RelativeSrcDir dir -> E.chars dir
182−
183−
184168
185169-- PARSE AND VERIFY
186170
@@ -208,58 +192,15 @@ read root =
208192 return $ Left Exit.OutlineNoAppJson
209193
210194 | 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)
224−
225−
226−isSrcDirMissing :: FilePath -> SrcDir -> IO Bool
227−isSrcDirMissing root srcDir =
228− not <$> Dir.doesDirectoryExist (toAbsolute root srcDir)
229−
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
195+ do badDirs <- filterM (isBadSrcDir root) (NE.toList srcDirs)
196+ case badDirs of
197+ [] -> return $ Right outline
198+ d:ds -> return $ Left (Exit.OutlineHasBadSrcDirs d ds)
243199
244200
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)
201+isBadSrcDir :: FilePath -> FilePath -> IO Bool
202+isBadSrcDir root dir =
203+ not <$> Dir.doesDirectoryExist (root </> dir)
263204
264205
265206
@@ -337,16 +278,9 @@ depsDecoder valueDecoder =
337278 D.dict (Pkg.keyDecoder Exit.OP_BadDependencyName) valueDecoder
338279
339280
340−dirsDecoder :: Decoder (NE.List SrcDir)
281+dirsDecoder :: Decoder (NE.List FilePath)
341282dirsDecoder =
342− fmap (toSrcDir . Json.toChars) <$> D.nonEmptyList D.string Exit.OP_NoSrcDirs
343−
344−
345−toSrcDir :: FilePath -> SrcDir
346−toSrcDir path =
347− if FP.isRelative path
348− then RelativeSrcDir path
349− else AbsoluteSrcDir path
283+ fmap Json.toChars <$> D.nonEmptyList D.string Exit.OP_NoSrcDirs
350284
351285
352286
@@ -387,21 +321,3 @@ boundParser bound tooLong =
387321 if len < bound
388322 then cok (Json.fromPtr pos end) (P.State src end end indent row newCol)
389323 else cerr row newCol (\_ _ -> tooLong)
390−
391−
392−
393−-- BINARY
394−
395−
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
401−
402− get =
403− do n <- getWord8
404− case n of
405− 0 -> liftM AbsoluteSrcDir get
406− 1 -> liftM RelativeSrcDir get
407− _ -> fail "binary encoding of SrcDir was corrupted"
builder/src/Generate.hs+6−6
@@ -99,18 +99,18 @@ checkForDebugUses (Objects _ locals) =
9999-- GATHER MAINS
100100
101101
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)
102+gatherMains :: Pkg.Name -> Objects -> NE.List Build.Main -> Map.Map ModuleName.Canonical Opt.Main
103+gatherMains pkg (Objects _ locals) buildMains =
104+ Map.fromList $ Maybe.mapMaybe (lookupMain pkg locals) (NE.toList buildMains)
105105
106106
107−lookupMain :: Pkg.Name -> Map.Map ModuleName.Raw Opt.LocalGraph -> Build.Root -> Maybe (ModuleName.Canonical, Opt.Main)
108−lookupMain pkg locals root =
107+lookupMain :: Pkg.Name -> Map.Map ModuleName.Raw Opt.LocalGraph -> Build.Main -> Maybe (ModuleName.Canonical, Opt.Main)
108+lookupMain pkg locals buildMain =
109109 let
110110 toPair name (Opt.LocalGraph maybeMain _ _) =
111111 (,) (ModuleName.Canonical pkg name) <$> maybeMain
112112 in
113− case root of
113+ case buildMain of
114114 Build.Inside name -> toPair name =<< Map.lookup name locals
115115 Build.Outside name _ g -> toPair name g
116116
builder/src/Http.hs+1−1
@@ -241,4 +241,4 @@ jsonPart name filePath value =
241241
242242stringPart :: String -> String -> Multi.Part
243243stringPart name string =
244− Multi.partBS (String.fromString name) (BS.pack string)
244+ Multi.partBS (String.fromString name) (BS.pack string)
builder/src/Reporting.hs+2−2
@@ -364,10 +364,10 @@ toFinalMessage done result =
364364
365365 Left problem ->
366366 case problem of
367− Exit.BuildBadModules _ _ [] ->
367+ Exit.BuildBadModules _ [] ->
368368 "Detected problems in 1 module."
369369
370− Exit.BuildBadModules _ _ (_:ps) ->
370+ Exit.BuildBadModules _ (_:ps) ->
371371 "Detected problems in " ++ show (2 + length ps) ++ " modules."
372372
373373 Exit.BuildProjectProblem _ ->
builder/src/Reporting/Exit.hs+60−44
@@ -8,6 +8,7 @@ module Reporting.Exit
88 , Publish(..), publishToReport
99 , Install(..), installToReport
1010 , Reactor(..), reactorToReport
11+ , Worker(..), workerToReport
1112 , newPackageOverview
1213 --
1314 , Solver(..)
@@ -947,8 +948,7 @@ toSolverReport problem =
947948
948949data Outline
949950 = OutlineHasBadStructure (Decode.Error OutlineProblem)
950− | OutlineHasMissingSrcDirs FilePath [FilePath]
951− | OutlineHasDuplicateSrcDirs FilePath FilePath FilePath
951+ | OutlineHasBadSrcDirs FilePath [FilePath]
952952 | OutlineNoPkgCore
953953 | OutlineNoAppCore
954954 | OutlineNoAppJson
@@ -974,12 +974,12 @@ toOutlineReport problem =
974974 Json.toReport "elm.json" (Json.FailureToReport toOutlineProblemReport) decodeError $
975975 Json.ExplicitReason "I ran into a problem with your elm.json file."
976976
977− OutlineHasMissingSrcDirs dir dirs ->
977+ OutlineHasBadSrcDirs dir dirs ->
978978 case dirs of
979979 [] ->
980980 Help.report "MISSING SOURCE DIRECTORY" (Just "elm.json")
981981 "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
982+ [ D.indent 4 $ D.dullyellow $ D.fromChars dir
983983 , D.reflow $
984984 "I cannot find it though. Is it missing? Is there a typo?"
985985 ]
@@ -987,33 +987,11 @@ toOutlineReport problem =
987987 _:_ ->
988988 Help.report "MISSING SOURCE DIRECTORIES" (Just "elm.json")
989989 "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)
990+ [ D.indent 4 $ D.dullyellow $ D.fromChars dir
992991 , D.reflow $
993992 "I cannot find them though. Are they missing? Are there typos?"
994993 ]
995994
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−
1017995 OutlineNoPkgCore ->
1018996 Help.report "MISSING DEPENDENCY" (Just "elm.json")
1019997 "I need to see an \"elm/core\" dependency your elm.json file. The default imports\
@@ -1282,7 +1260,8 @@ toDetailsReport details =
12821260 "The dependencies in your elm.json are not compatible."
12831261 [ D.fillSep
12841262 ["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" <> "."
1263+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1264+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
12861265 ]
12871266 , D.reflow $
12881267 "Please ask for help on the community forums if you try those paths and are still\
@@ -1299,7 +1278,8 @@ toDetailsReport details =
12991278 \ get access to the registry!"
13001279 , D.toFancyNote
13011280 ["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" <> "."
1281+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1282+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
13031283 ]
13041284 ]
13051285
@@ -1335,7 +1315,8 @@ toDetailsReport details =
13351315 \ party tool) leaving them in an invalid state."
13361316 [ D.fillSep
13371317 ["Try","to","change","them","back","to","what","they","were","before!"
1338− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1318+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1319+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
13391320 ]
13401321 , D.reflow $
13411322 "Please ask for help on the community forums if you try those paths and are still\
@@ -1522,7 +1503,7 @@ toHttpErrorReport title err context =
15221503
15231504 Http.BadHttp url httpExceptionContent ->
15241505 case httpExceptionContent of
1525− HTTP.StatusCodeException response body ->
1506+ HTTP.StatusCodeException response _ ->
15261507 let
15271508 (HTTP.Status code message) = HTTP.responseStatus response
15281509 in
@@ -1530,7 +1511,6 @@ toHttpErrorReport title err context =
15301511 [ D.fillSep $
15311512 ["But","it","came","back","as",D.red (D.fromInt code)]
15321513 ++ map D.fromChars (words (BS_UTF8.toString message))
1533− , D.indent 4 $ D.reflow $ BS_UTF8.toString body
15341514 , D.reflow $
15351515 "This may mean some online endpoint changed in an unexpected way, so if does not\
15361516 \ seem like something on your side is causing this (e.g. firewall) please report\
@@ -1756,7 +1736,7 @@ makeToReport make =
17561736
17571737
17581738data BuildProblem
1759− = BuildBadModules FilePath Error.Module [Error.Module]
1739+ = BuildBadModules Error.Module [Error.Module]
17601740 | BuildProjectProblem BuildProjectProblem
17611741
17621742
@@ -1765,8 +1745,8 @@ data BuildProjectProblem
17651745 | BP_WithBadExtension FilePath
17661746 | BP_WithAmbiguousSrcDir FilePath FilePath FilePath
17671747 | BP_MainPathDuplicate FilePath FilePath
1768− | BP_RootNameDuplicate ModuleName.Raw FilePath FilePath
1769− | BP_RootNameInvalid FilePath FilePath [String]
1748+ | BP_MainNameDuplicate ModuleName.Raw FilePath FilePath
1749+ | BP_MainNameInvalid FilePath FilePath [String]
17701750 | BP_CannotLoadDependencies
17711751 | BP_Cycle ModuleName.Raw [ModuleName.Raw]
17721752 | BP_MissingExposed (NE.List (ModuleName.Raw, Import.Problem))
@@ -1775,8 +1755,8 @@ data BuildProjectProblem
17751755toBuildProblemReport :: BuildProblem -> Help.Report
17761756toBuildProblemReport problem =
17771757 case problem of
1778− BuildBadModules root e es ->
1779− Help.compilerReport root e es
1758+ BuildBadModules e es ->
1759+ Help.compilerReport e es
17801760
17811761 BuildProjectProblem projectProblem ->
17821762 toProjectProblemReport projectProblem
@@ -1833,7 +1813,7 @@ toProjectProblemReport projectProblem =
18331813 \ unstuck!"
18341814 ]
18351815
1836− BP_RootNameDuplicate name outsidePath otherPath ->
1816+ BP_MainNameDuplicate name outsidePath otherPath ->
18371817 Help.report "MODULE NAME CLASH" Nothing
18381818 "These two files are causing a module name clash:"
18391819 [ D.indent 4 $ D.red $ D.vcat $ map D.fromChars [ outsidePath, otherPath ]
@@ -1844,7 +1824,7 @@ toProjectProblemReport projectProblem =
18441824 "Try changing to a different module name in one of them!"
18451825 ]
18461826
1847− BP_RootNameInvalid givenPath srcDir _ ->
1827+ BP_MainNameInvalid givenPath srcDir _ ->
18481828 Help.report "UNEXPECTED FILE NAME" Nothing
18491829 "I am having trouble with this file name:"
18501830 [ D.indent 4 $ D.red $ D.fromChars givenPath
@@ -1968,7 +1948,7 @@ toGenerateReport problem =
19681948 "The issue is that --optimize strips out info needed by `Debug` functions.\
19691949 \ Here are two examples:"
19701950 , D.indent 4 $ D.reflow $
1971− "(1) It shortens record field names. This makes the generated JavaScript\
1951+ "(1) It shortens record field names. This makes the generated JavaScript is\
19721952 \ smaller, but `Debug.toString` cannot know the real field names anymore."
19731953 , D.indent 4 $ D.reflow $
19741954 "(2) Values like `type Height = Height Float` are unboxed. This reduces\
@@ -2037,7 +2017,7 @@ reactorToReport problem =
20372017data Repl
20382018 = ReplBadDetails Details
20392019 | ReplBadInput BS.ByteString Error.Error
2040− | ReplBadLocalDeps FilePath Error.Module [Error.Module]
2020+ | ReplBadLocalDeps Error.Module [Error.Module]
20412021 | ReplProjectProblem BuildProjectProblem
20422022 | ReplBadGenerate Generate
20432023 | ReplBadCache
@@ -2051,10 +2031,10 @@ replToReport problem =
20512031 toDetailsReport details
20522032
20532033 ReplBadInput source err ->
2054− Help.compilerReport "/" (Error.Module N.replModule "REPL" File.zeroTime source err) []
2034+ Help.compilerReport (Error.Module N.replModule "REPL" File.zeroTime source err) []
20552035
2056− ReplBadLocalDeps root e es ->
2057− Help.compilerReport root e es
2036+ ReplBadLocalDeps e es ->
2037+ Help.compilerReport e es
20582038
20592039 ReplProjectProblem projectProblem ->
20602040 toProjectProblemReport projectProblem
@@ -2067,3 +2047,39 @@ replToReport problem =
20672047
20682048 ReplBlocked ->
20692049 corruptCacheReport
2050+
2051+
2052+
2053+-- WORKER
2054+
2055+
2056+data Worker
2057+ = WorkerInputError Error.Module
2058+ | WorkerNoMain
2059+
2060+
2061+workerToReport :: Worker -> Help.Report
2062+workerToReport problem =
2063+ case problem of
2064+ WorkerInputError err ->
2065+ Help.compilerReport err []
2066+
2067+ WorkerNoMain ->
2068+ Help.report "NO MAIN" Nothing
2069+ (
2070+ "Without a `main` value, I do not know what to show on screen!"
2071+ )
2072+ [ D.reflow $
2073+ "Adding a `main` value can be as brief as:"
2074+ , D.vcat
2075+ [ D.fillSep [D.cyan "import","Html"]
2076+ , ""
2077+ , D.fillSep [D.green "main","="]
2078+ , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
2079+ ]
2080+ , D.reflow $
2081+ "Try adding something like that!"
2082+ , D.toSimpleNote $
2083+ "I recommend looking through https://guide.elm-lang.org for more advice on\
2084+ \ how to fill in `main` values."
2085+ ]
builder/src/Reporting/Exit/Help.hs+5−5
@@ -29,7 +29,7 @@ import qualified Reporting.Error as Error
2929
3030
3131data Report
32− = CompilerReport FilePath Error.Module [Error.Module]
32+ = CompilerReport Error.Module [Error.Module]
3333 | Report
3434 { _title :: String
3535 , _path :: Maybe FilePath
@@ -52,7 +52,7 @@ jsonReport =
5252 Report
5353
5454
55−compilerReport :: FilePath -> Error.Module -> [Error.Module] -> Report
55+compilerReport :: Error.Module -> [Error.Module] -> Report
5656compilerReport =
5757 CompilerReport
5858
@@ -64,8 +64,8 @@ compilerReport =
6464reportToDoc :: Report -> D.Doc
6565reportToDoc report_ =
6666 case report_ of
67− CompilerReport root e es ->
68− Error.toDoc root e es
67+ CompilerReport e es ->
68+ Error.toDoc e es
6969
7070 Report title maybePath message ->
7171 let
@@ -94,7 +94,7 @@ reportToDoc report_ =
9494reportToJson :: Report -> E.Value
9595reportToJson report_ =
9696 case report_ of
97− CompilerReport _ e es ->
97+ CompilerReport e es ->
9898 E.object
9999 [ "type" ==> E.chars "compile-errors"
100100 , "errors" ==> E.list Error.toJson (e:es)
builder/src/Stuff.hs+1−1
@@ -62,7 +62,7 @@ prepublishDir root =
6262
6363compilerVersion :: FilePath
6464compilerVersion =
65− V.toChars V.compiler
65+ V.toChars V.compiler ++ "-beta-1"
6666
6767
6868
compiler/src/AST/Source.hs+5−5
@@ -195,15 +195,15 @@ newtype Comment =
195195
196196data Exposing
197197 = Open
198− | Explicit [Exposed]
198+ | Explicit [A.Located Exposed]
199199
200200
201201data Exposed
202− = Lower (A.Located Name)
203− | Upper (A.Located Name) Privacy
204− | Operator A.Region Name
202+ = Lower Name
203+ | Upper Name Privacy
204+ | Operator Name
205205
206206
207207data Privacy
208− = Public A.Region
208+ = Public
209209 | Private
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.insertWith Map.union 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/Name.hs+1−1
@@ -304,7 +304,7 @@ fromManyNames names =
304304 case names of
305305 [] ->
306306 blank
307− -- NOTE: this case is needed for (let _ = Debug.log "x" x in ...)
307+ -- this case is needed for (let _ = Debug.log "x" x in ...)
308308 -- but maybe unused patterns should be stripped out instead
309309
310310 Utf8.Utf8 ba# : _ ->
compiler/src/Data/Utf8.hs+1−3
@@ -261,9 +261,7 @@ instance Eq (Utf8 t) where
261261
262262
263263-- COMPARE
264−--
265−-- TODO: is it fine to sort by length and only compare bytes on length ties?
266−--
264+
267265
268266instance Ord (Utf8 t) where
269267 compare (Utf8 ba1#) (Utf8 ba2#) =
compiler/src/Elm/Compiler/Imports.hs+3−3
@@ -49,14 +49,14 @@ closed =
4949
5050typeOpen :: Name.Name -> Src.Exposing
5151typeOpen name =
52− Src.Explicit [ Src.Upper (A.At A.zero name) (Src.Public A.zero) ]
52+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Public) ]
5353
5454
5555typeClosed :: Name.Name -> Src.Exposing
5656typeClosed name =
57− Src.Explicit [ Src.Upper (A.At A.zero name) Src.Private ]
57+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Private) ]
5858
5959
6060operator :: Name.Name -> Src.Exposing
6161operator op =
62− Src.Explicit [ Src.Operator A.zero op ]
62+ Src.Explicit [ A.At A.zero (Src.Operator op) ]
compiler/src/Elm/Kernel.hs+6−6
@@ -319,19 +319,19 @@ toNames exposing =
319319 map toName exposedList
320320
321321
322−toName :: Src.Exposed -> Name.Name
323−toName exposed =
322+toName :: A.Located Src.Exposed -> Name.Name
323+toName (A.At _ exposed) =
324324 case exposed of
325− Src.Lower (A.At _ name) ->
325+ Src.Lower name ->
326326 name
327327
328− Src.Upper (A.At _ name) Src.Private ->
328+ Src.Upper name Src.Private ->
329329 name
330330
331− Src.Upper _ (Src.Public _) ->
331+ Src.Upper _ Src.Public ->
332332 error "cannot have Maybe(..) syntax in kernel code header"
333333
334− Src.Operator _ _ ->
334+ Src.Operator _ ->
335335 error "cannot use binops in kernel code"
336336
337337
compiler/src/Elm/ModuleName.hs+6−2
@@ -7,13 +7,12 @@ module Elm.ModuleName
77 --
88 , encode
99 , decoder
10− , parser
1110 --
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
@@ -226,6 +225,11 @@ debug :: Canonical
226225debug = Canonical Pkg.core Name.debug
227226
228227
228+{-# NOINLINE bitwise #-}
229+bitwise :: Canonical
230+bitwise = Canonical Pkg.core Name.bitwise
231+
232+
229233
230234-- HTML
231235
compiler/src/Generate/Html.hs+8−4
@@ -29,16 +29,20 @@ 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>
3541try {
3642|] <> javascript <> [r|
3743
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)
4347 var header = document.createElement("h1");
4448 header.style.fontFamily = "monospace";
compiler/src/Generate/JavaScript.hs+9−44
@@ -2,7 +2,6 @@
22module Generate.JavaScript
33 ( generate
44 , generateForRepl
5− , generateForReplEndpoint
65 )
76 where
87
@@ -86,8 +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
88+ Functions.functions
9189 <> stateToBuilder evalState
9290 <> print ansi localizer home name tipe
9391
@@ -100,47 +98,14 @@ print ansi localizer home name tipe =
10098 tipeDoc = RT.canToDoc localizer RT.None tipe
10199 bool = if ansi then "true" else "false"
102100 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"
101+ "var _value = " <> toString <> "(" <> bool <> ", " <> value <> ");\n\
102+ \var _type = " <> B.stringUtf8 (show (D.toString tipeDoc)) <> ";\n\
103+ \function _print(t) { console.log(_value + (" <> bool <> " ? '\x1b[90m' + t + '\x1b[0m' : t)); }\n\
104+ \if (_value.length + 3 + _type.length >= 80 || _type.indexOf('\\n') >= 0) {\n\
105+ \ _print('\\n : ' + _type.split('\\n').join('\\n '));\n\
106+ \} else {\n\
107+ \ _print(' : ' + _type);\n\
108+ \}\n"
144109
145110
146111
compiler/src/Parse/Module.hs+14−21
@@ -434,18 +434,18 @@ exposing =
434434 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
435435 word1 0x29 {-)-} E.ExposingEnd
436436 return Src.Open
437− , do exposed <- chompExposed
437+ , do exposed <- addLocation chompExposed
438438 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
439439 exposingHelp [exposed]
440440 ]
441441
442442
443−exposingHelp :: [Src.Exposed] -> Parser E.Exposing Src.Exposing
443+exposingHelp :: [A.Located Src.Exposed] -> Parser E.Exposing Src.Exposing
444444exposingHelp revExposed =
445445 oneOf E.ExposingEnd
446446 [ do word1 0x2C {-,-} E.ExposingEnd
447447 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentValue
448− exposed <- chompExposed
448+ exposed <- addLocation chompExposed
449449 Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
450450 exposingHelp (exposed:revExposed)
451451 , do word1 0x29 {-)-} E.ExposingEnd
@@ -455,21 +455,16 @@ exposingHelp revExposed =
455455
456456chompExposed :: Parser E.Exposing Src.Exposed
457457chompExposed =
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− ]
458+ oneOf E.ExposingValue
459+ [ Src.Lower <$> Var.lower E.ExposingValue
460+ , do word1 0x28 {-(-} E.ExposingValue
461+ op <- Symbol.operator E.ExposingOperator E.ExposingOperatorReserved
462+ word1 0x29 {-)-} E.ExposingOperatorRightParen
463+ return (Src.Operator op)
464+ , do name <- Var.upper E.ExposingValue
465+ Space.chompAndCheckIndent E.ExposingSpace E.ExposingIndentEnd
466+ Src.Upper name <$> privacy
467+ ]
473468
474469
475470privacy :: Parser E.Exposing Src.Privacy
@@ -477,11 +472,9 @@ privacy =
477472 oneOfWithFallback
478473 [ do word1 0x28 {-(-} E.ExposingTypePrivacy
479474 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
480− start <- getPosition
481475 word2 0x2E 0x2E {-..-} E.ExposingTypePrivacy
482− end <- getPosition
483476 Space.chompAndCheckIndent E.ExposingSpace E.ExposingTypePrivacy
484477 word1 0x29 {-)-} E.ExposingTypePrivacy
485− return $ Src.Public (A.Region start end)
478+ return Src.Public
486479 ]
487480 Src.Private
compiler/src/Parse/Pattern.hs+1−1
@@ -129,7 +129,7 @@ recordHelp start vars =
129129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd
130130 recordHelp start (var:vars)
131131 , do word1 0x7D {-}-} E.PRecordEnd
132− addEnd start (Src.PRecord (reverse vars))
132+ addEnd start (Src.PRecord vars)
133133 ]
134134
135135
compiler/src/Parse/Variable.hs+2−2
@@ -149,14 +149,14 @@ foreignUpper toError =
149149 let
150150 !newState = P.State src upperEnd end indent row newCol
151151 !name = Name.fromPtr upperStart upperEnd
152− !upperName =
152+ !foreign =
153153 if upperStart == pos then
154154 Unqualified name
155155 else
156156 let !home = Name.fromPtr pos (plusPtr upperStart (-1)) in
157157 Qualified home name
158158 in
159− cok upperName newState
159+ cok foreign newState
160160
161161
162162foreignUpperHelp :: Ptr Word8 -> Ptr Word8 -> Col -> (# Ptr Word8, Ptr Word8, Col #)
compiler/src/Reporting/Error.hs+16−20
@@ -12,7 +12,6 @@ module Reporting.Error
1212import qualified Data.ByteString as B
1313import qualified Data.NonEmptyList as NE
1414import qualified Data.OneOrMore as OneOrMore
15−import qualified System.FilePath as FP
1615
1716import qualified Elm.ModuleName as ModuleName
1817import qualified File
@@ -39,8 +38,8 @@ import qualified Reporting.Report as Report
3938data Module =
4039 Module
4140 { _name :: ModuleName.Raw
42− , _absolutePath :: FilePath
43− , _modificationTime :: File.Time
41+ , _path :: FilePath
42+ , _time :: File.Time
4443 , _source :: B.ByteString
4544 , _error :: Error
4645 }
@@ -93,26 +92,26 @@ toReports source err =
9392-- TO DOC
9493
9594
96−toDoc :: FilePath -> Module -> [Module] -> D.Doc
97−toDoc root err errs =
95+toDoc :: Module -> [Module] -> D.Doc
96+toDoc err errs =
9897 let
99− (NE.List m ms) = NE.sortBy _modificationTime (NE.List err errs)
98+ (NE.List m ms) = NE.sortBy _time (NE.List err errs)
10099 in
101− D.vcat (toDocHelp root m ms)
100+ D.vcat (toDocHelp m ms)
102101
103102
104−toDocHelp :: FilePath -> Module -> [Module] -> [D.Doc]
105−toDocHelp root module1 modules =
103+toDocHelp :: Module -> [Module] -> [D.Doc]
104+toDocHelp module1 modules =
106105 case modules of
107106 [] ->
108− [moduleToDoc root module1
107+ [moduleToDoc module1
109108 ,""
110109 ]
111110
112111 module2 : otherModules ->
113− moduleToDoc root module1
112+ moduleToDoc module1
114113 : toSeparator module1 module2
115− : toDocHelp root module2 otherModules
114+ : toDocHelp module2 otherModules
116115
117116
118117toSeparator :: Module -> Module -> D.Doc
@@ -134,22 +133,19 @@ toSeparator beforeModule afterModule =
134133-- MODULE TO DOC
135134
136135
137−moduleToDoc :: FilePath -> Module -> D.Doc
138−moduleToDoc root (Module _ absolutePath _ source err) =
136+moduleToDoc :: Module -> D.Doc
137+moduleToDoc (Module _ path _ source err) =
139138 let
140139 reports =
141140 toReports (Code.toSource source) err
142−
143− relativePath =
144− FP.makeRelative root absolutePath
145141 in
146− D.vcat $ map (reportToDoc relativePath) (NE.toList reports)
142+ D.vcat $ map (reportToDoc path) (NE.toList reports)
147143
148144
149145reportToDoc :: FilePath -> Report.Report -> D.Doc
150−reportToDoc relativePath (Report.Report title _ _ message) =
146+reportToDoc path (Report.Report title _ _ message) =
151147 D.vcat
152− [ toMessageBar title relativePath
148+ [ toMessageBar title path
153149 , ""
154150 , message
155151 , ""
compiler/src/Reporting/Error/Canonicalize.hs+16−21
@@ -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
@@ -679,7 +677,7 @@ toReport source err =
679677 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
680678 ,
681679 D.stack
682− [ makeTheory "Are you trying to mutate a variable?" $
680+ [ makeTheory "Are you are trying to mutate a variable?" $
683681 "Elm does not have mutation, so when I see " ++ Name.toChars name
684682 ++ " defined in terms of " ++ Name.toChars name
685683 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -725,7 +723,7 @@ toReport source err =
725723 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
726724 ,
727725 D.stack
728− [ makeTheory "Are you trying to mutate a variable?" $
726+ [ makeTheory "Are you are trying to mutate a variable?" $
729727 "Elm does not have mutation, so when I see " ++ Name.toChars name
730728 ++ " defined in terms of " ++ Name.toChars name
731729 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -976,11 +974,8 @@ nameClash source r1 r2 messageThatEndsWithPunctuation =
976974-- AMBIGUOUS NAME
977975
978976
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
977+ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> [ModuleName.Canonical] -> String -> Report.Report
978+ambiguousName source region maybePrefix name possibleHomes thing =
984979 Report.Report "AMBIGUOUS NAME" region [] $
985980 Code.toSnippet source region Nothing $
986981 case maybePrefix of
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/Pattern.hs+2−2
@@ -41,7 +41,7 @@ toReport source err =
4141 Report.Report "UNSAFE PATTERN" region [] $
4242 Code.toSnippet source region Nothing
4343 (
44− "This pattern does not cover all possibilities:"
44+ "This pattern does not cover all possiblities:"
4545 ,
4646 D.stack
4747 [ "Other possibilities include:"
@@ -64,7 +64,7 @@ toReport source err =
6464 , unhandledPatternsToDocBlock unhandled
6565 , D.reflow $
6666 "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.\
67+ \ `let` to deconstruct values only if there is ONE possiblity.\
6868 \ Switch to a `case` expression to account for all possibilities."
6969 , D.toSimpleHint $
7070 "Are you calling a function that definitely returns values\
compiler/src/Reporting/Error/Syntax.hs+370−466
@@ -649,9 +649,156 @@ toParseErrorReport source modul =
649649 toSpaceReport source space row col
650650
651651 ModuleBadEnd row col ->
652− if col == 1
653− then toDeclStartReport source row col
654− else toWeirdEndReport source row col
652+ case Code.whatIsNext source row col of
653+ Code.Keyword keyword ->
654+ let
655+ region = toKeywordRegion row col keyword
656+ in
657+ Report.Report "RESERVED WORD" region [] $
658+ Code.toSnippet source region Nothing
659+ (
660+ D.reflow $
661+ "I got stuck on this reserved word:"
662+ ,
663+ D.reflow $
664+ "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
665+ )
666+
667+ Code.Operator op ->
668+ let
669+ region = toKeywordRegion row col op
670+ in
671+ Report.Report "UNEXPECTED SYMBOL" region [] $
672+ Code.toSnippet source region Nothing
673+ (
674+ D.reflow $
675+ "I ran into an unexpected symbol:"
676+ ,
677+ D.reflow $
678+ "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
679+ \ I can give a better hint from there?"
680+ )
681+
682+ Code.Close term bracket ->
683+ let
684+ region = toRegion row col
685+ in
686+ Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
687+ Code.toSnippet source region Nothing
688+ (
689+ D.reflow $
690+ "I ran into an unexpected " ++ term ++ ":"
691+ ,
692+ D.reflow $
693+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
694+ )
695+
696+ Code.Other maybeChar ->
697+ let
698+ region = toRegion row col
699+ in
700+ case maybeChar of
701+ Just ';' ->
702+ Report.Report "UNEXPECTED SEMICOLON" region [] $
703+ Code.toSnippet source region Nothing
704+ (
705+ D.reflow $
706+ "I got stuck on this semicolon:"
707+ ,
708+ D.stack
709+ [ D.reflow $ "Try removing it?"
710+ , D.toSimpleNote $
711+ "Some languages require semicolons at the end of each statement. These are\
712+ \ often called C-like languages, and they usually share a lot of language design\
713+ \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
714+ \ and subscriptions instead, so there is no special syntax for \"statements\" and\
715+ \ therefore no need to use semicolons to separate them. I think this will make\
716+ \ more sense as you work through <https://guide.elm-lang.org> though!"
717+ ]
718+ )
719+
720+ Just ',' ->
721+ Report.Report "UNEXPECTED COMMA" region [] $
722+ Code.toSnippet source region Nothing
723+ (
724+ D.reflow $
725+ "I got stuck on this comma:"
726+ ,
727+ D.stack
728+ [ D.reflow $
729+ "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
730+ , D.toSimpleNote $
731+ "If this is supposed to be part of a list, the problem may be a bit earlier.\
732+ \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
733+ \ closing ] that is making me think the list ended earlier? The same kinds of\
734+ \ things could be going wrong if this is supposed to be a tuple."
735+ ]
736+ )
737+
738+ Just '`' ->
739+ Report.Report "UNEXPECTED CHARACTER" region [] $
740+ Code.toSnippet source region Nothing
741+ (
742+ D.reflow $
743+ "I got stuck on this character:"
744+ ,
745+ D.stack
746+ [ D.reflow $
747+ "It is not used for anything in Elm syntax. It is used for multi-line strings in\
748+ \ some languages though, so if you want a string that spans multiple lines, you\
749+ \ can use Elm's multi-line string syntax like this:"
750+ , D.vcat
751+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
752+ , mempty
753+ , D.dullyellow "# Multi-line Strings"
754+ , mempty
755+ , D.dullyellow "- start with triple double quotes"
756+ , D.dullyellow "- write whatever you want"
757+ , D.dullyellow "- no need to escape newlines or double quotes"
758+ , D.dullyellow "- end with triple double quotes"
759+ , mempty
760+ , D.dullyellow "\"\"\""
761+ ]
762+ , D.reflow $
763+ "Otherwise I do not know what is going on! Try removing the character?"
764+ ]
765+ )
766+
767+ Just '$' ->
768+ Report.Report "UNEXPECTED SYMBOL" region [] $
769+ Code.toSnippet source region Nothing
770+ (
771+ D.reflow $
772+ "I got stuck on this dollar sign:"
773+ ,
774+ D.reflow $
775+ "It is not used for anything in Elm syntax. Are you coming from a language where\
776+ \ dollar signs can be used in variable names? If so, try a name that (1) starts\
777+ \ with a letter and (2) only contains letters, numbers, and underscores."
778+ )
779+
780+ Just c | elem c ['#','@','!','%','~'] ->
781+ Report.Report "UNEXPECTED SYMBOL" region [] $
782+ Code.toSnippet source region Nothing
783+ (
784+ D.reflow $
785+ "I got stuck on this symbol:"
786+ ,
787+ D.reflow $
788+ "It is not used for anything in Elm syntax. Try removing it?"
789+ )
790+
791+ _ ->
792+ Report.Report "SYNTAX PROBLEM" region [] $
793+ Code.toSnippet source region Nothing
794+ (
795+ D.reflow $
796+ "I got stuck here:"
797+ ,
798+ D.reflow $
799+ "Whatever I am running into is confusing me a lot! Normally I can give fairly\
800+ \ specific hints, but something is really tripping me up this time."
801+ )
655802
656803 ModuleProblem row col ->
657804 let
@@ -797,11 +944,11 @@ toParseErrorReport source modul =
797944 [ D.reflow $
798945 "I am not sure what is going on, but I recommend starting an Elm\
799946 \ file with the following lines:"
800− , D.indent 4 $ D.vcat $
947+ , D.vcat
801948 [ D.fillSep [D.cyan "import","Html"]
802949 , ""
803− , "main ="
804− , " Html.text " <> D.dullyellow "\"Hello!\""
950+ , D.fillSep [D.green "main","="]
951+ , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
805952 ]
806953 , D.reflow $
807954 "You should be able to copy those lines directly into your file. Check out the\
@@ -830,12 +977,11 @@ toParseErrorReport source modul =
830977 , D.indent 4 $ D.vcat $
831978 [ D.fillSep [D.cyan "import","Dict"]
832979 , D.fillSep [D.cyan "import","Maybe"]
833− , D.fillSep [D.cyan "import","Html.Attributes",D.cyan "as","A"]
834− , D.fillSep [D.cyan "import","Json.Decode",D.cyan "exposing","(..)"]
980+ , D.fillSep [D.cyan "import","Html.Attributes"]
981+ , D.fillSep [D.cyan "import","Json.Decode"]
835982 ]
836983 , D.reflow $
837984 "Notice that the module names all start with capital letters. That is required!"
838− , D.reflowLink "Read" "imports" "to learn more."
839985 ]
840986 )
841987
@@ -862,7 +1008,6 @@ toParseErrorReport source modul =
8621008 ]
8631009 , D.reflow $
8641010 "Notice that the alias always starts with a capital letter. That is required!"
865− , D.reflowLink "Read" "imports" "to learn more."
8661011 ]
8671012 )
8681013
@@ -925,192 +1070,6 @@ toParseErrorReport source modul =
9251070
9261071
9271072
928−-- WEIRD END
929−
930−
931−toWeirdEndReport :: Code.Source -> Row -> Col -> Report.Report
932−toWeirdEndReport source row col =
933− case Code.whatIsNext source row col of
934− Code.Keyword keyword ->
935− let
936− region = toKeywordRegion row col keyword
937− in
938− Report.Report "RESERVED WORD" region [] $
939− Code.toSnippet source region Nothing
940− (
941− D.reflow $
942− "I got stuck on this reserved word:"
943− ,
944− D.reflow $
945− "The name `" ++ keyword ++ "` is reserved, so try using a different name?"
946− )
947−
948− Code.Operator op ->
949− let
950− region = toKeywordRegion row col op
951− in
952− Report.Report "UNEXPECTED SYMBOL" region [] $
953− Code.toSnippet source region Nothing
954− (
955− D.reflow $
956− "I ran into an unexpected symbol:"
957− ,
958− D.reflow $
959− "I was not expecting to see a " ++ op ++ " here. Try deleting it? Maybe\
960− \ I can give a better hint from there?"
961− )
962−
963− Code.Close term bracket ->
964− let
965− region = toRegion row col
966− in
967− Report.Report ("UNEXPECTED " ++ map Char.toUpper term) region [] $
968− Code.toSnippet source region Nothing
969− (
970− D.reflow $
971− "I ran into an unexpected " ++ term ++ ":"
972− ,
973− D.reflow $
974− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
975− )
976−
977− Code.Lower c cs ->
978− let
979− region = toKeywordRegion row col (c:cs)
980− in
981− Report.Report "UNEXPECTED NAME" region [] $
982− Code.toSnippet source region Nothing
983− (
984− D.reflow $
985− "I got stuck on this name:"
986− ,
987− D.reflow $
988− "It is confusing me a lot! Normally I can give fairly specific hints, but\
989− \ something is really tripping me up this time."
990− )
991−
992− Code.Upper c cs ->
993− let
994− region = toKeywordRegion row col (c:cs)
995− in
996− Report.Report "UNEXPECTED NAME" region [] $
997− Code.toSnippet source region Nothing
998− (
999− D.reflow $
1000− "I got stuck on this name:"
1001− ,
1002− D.reflow $
1003− "It is confusing me a lot! Normally I can give fairly specific hints, but\
1004− \ something is really tripping me up this time."
1005− )
1006−
1007− Code.Other maybeChar ->
1008− let
1009− region = toRegion row col
1010− in
1011− case maybeChar of
1012− Just ';' ->
1013− Report.Report "UNEXPECTED SEMICOLON" region [] $
1014− Code.toSnippet source region Nothing
1015− (
1016− D.reflow $
1017− "I got stuck on this semicolon:"
1018− ,
1019− D.stack
1020− [ D.reflow $ "Try removing it?"
1021− , D.toSimpleNote $
1022− "Some languages require semicolons at the end of each statement. These are\
1023− \ often called C-like languages, and they usually share a lot of language design\
1024− \ choices. (E.g. side-effects, for loops, etc.) Elm manages effects with commands\
1025− \ and subscriptions instead, so there is no special syntax for \"statements\" and\
1026− \ therefore no need to use semicolons to separate them. I think this will make\
1027− \ more sense as you work through <https://guide.elm-lang.org> though!"
1028− ]
1029− )
1030−
1031− Just ',' ->
1032− Report.Report "UNEXPECTED COMMA" region [] $
1033− Code.toSnippet source region Nothing
1034− (
1035− D.reflow $
1036− "I got stuck on this comma:"
1037− ,
1038− D.stack
1039− [ D.reflow $
1040− "I do not think I am parsing a list or tuple right now. Try deleting the comma?"
1041− , D.toSimpleNote $
1042− "If this is supposed to be part of a list, the problem may be a bit earlier.\
1043− \ Perhaps the opening [ is missing? Or perhaps some value in the list has an extra\
1044− \ closing ] that is making me think the list ended earlier? The same kinds of\
1045− \ things could be going wrong if this is supposed to be a tuple."
1046− ]
1047− )
1048−
1049− Just '`' ->
1050− Report.Report "UNEXPECTED CHARACTER" region [] $
1051− Code.toSnippet source region Nothing
1052− (
1053− D.reflow $
1054− "I got stuck on this character:"
1055− ,
1056− D.stack
1057− [ D.reflow $
1058− "It is not used for anything in Elm syntax. It is used for multi-line strings in\
1059− \ some languages though, so if you want a string that spans multiple lines, you\
1060− \ can use Elm's multi-line string syntax like this:"
1061− , D.dullyellow $ D.indent 4 $ D.vcat $
1062− [ "\"\"\""
1063− , "# Multi-line Strings"
1064− , ""
1065− , "- start with triple double quotes"
1066− , "- write whatever you want"
1067− , "- no need to escape newlines or double quotes"
1068− , "- end with triple double quotes"
1069− , "\"\"\""
1070− ]
1071− , D.reflow $
1072− "Otherwise I do not know what is going on! Try removing the character?"
1073− ]
1074− )
1075−
1076− Just '$' ->
1077− Report.Report "UNEXPECTED SYMBOL" region [] $
1078− Code.toSnippet source region Nothing
1079− (
1080− D.reflow $
1081− "I got stuck on this dollar sign:"
1082− ,
1083− D.reflow $
1084− "It is not used for anything in Elm syntax. Are you coming from a language where\
1085− \ dollar signs can be used in variable names? If so, try a name that (1) starts\
1086− \ with a letter and (2) only contains letters, numbers, and underscores."
1087− )
1088−
1089− Just c | elem c ['#','@','!','%','~'] ->
1090− Report.Report "UNEXPECTED SYMBOL" region [] $
1091− Code.toSnippet source region Nothing
1092− (
1093− D.reflow $
1094− "I got stuck on this symbol:"
1095− ,
1096− D.reflow $
1097− "It is not used for anything in Elm syntax. Try removing it?"
1098− )
1099−
1100− _ ->
1101− Report.Report "SYNTAX PROBLEM" region [] $
1102− Code.toSnippet source region Nothing
1103− (
1104− D.reflow $
1105− "I got stuck here:"
1106− ,
1107− D.reflow $
1108− "Whatever I am running into is confusing me a lot! Normally I can give fairly\
1109− \ specific hints, but something is really tripping me up this time."
1110− )
1111−
1112−
1113−
11141073-- IMPORTS
11151074
11161075
@@ -1136,7 +1095,6 @@ toImportReport source row col =
11361095 ]
11371096 , D.reflow $
11381097 "You are probably trying to import a different module, but try to make it look like one of these examples!"
1139− , D.reflowLink "Read" "imports" "to learn more."
11401098 ]
11411099 )
11421100
@@ -1443,7 +1401,114 @@ toDeclarationsReport :: Code.Source -> Decl -> Report.Report
14431401toDeclarationsReport source decl =
14441402 case decl of
14451403 DeclStart row col ->
1446− toDeclStartReport source row col
1404+ case Code.whatIsNext source row col of
1405+ Code.Close term bracket ->
1406+ let
1407+ region = toRegion row col
1408+ in
1409+ Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1410+ Code.toSnippet source region Nothing
1411+ (
1412+ D.reflow $
1413+ "I was not expecting to see a " ++ term ++ " here:"
1414+ , D.reflow $
1415+ "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1416+ )
1417+
1418+ Code.Keyword keyword ->
1419+ let
1420+ region = toKeywordRegion row col keyword
1421+ in
1422+ Report.Report "RESERVED WORD" region [] $
1423+ Code.toSnippet source region Nothing
1424+ (
1425+ D.reflow $
1426+ "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1427+ ,
1428+ case keyword of
1429+ "import" ->
1430+ D.reflow $
1431+ "It is reserved for declaring imports at the top of your module. If you want\
1432+ \ another import, try moving it up top with the other imports. If you want to\
1433+ \ define a value or function, try changing the name to something else!"
1434+
1435+ "case" ->
1436+ D.stack
1437+ [ D.reflow $
1438+ "It is reserved for writing `case` expressions. Try using a different name?"
1439+ , D.toSimpleNote $
1440+ "If you are trying to write a `case` expression, it needs to be part of a\
1441+ \ definition. So you could write something like this instead:"
1442+ , D.vcat $
1443+ [ D.indent 0 $ D.fillSep [D.green "getWidth","maybeWidth","="]
1444+ , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1445+ , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1446+ , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1447+ , ""
1448+ , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1449+ , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1450+ ]
1451+ , D.reflow $
1452+ "This defines a `getWidth` function that we can use elsewhere in our program."
1453+ ]
1454+
1455+ "if" ->
1456+ D.stack
1457+ [ D.reflow $
1458+ "It is reserved for writing `if` expressions. Try using a different name?"
1459+ , D.toSimpleNote $
1460+ "If you are trying to write an `if` expression, it needs to be part of a\
1461+ \ definition. So you could write something like this instead:"
1462+ , D.vcat $
1463+ [ D.indent 0 $ D.fillSep [D.green "reviewPowerLevel","powerLevel","="]
1464+ , D.indent 2 $ D.fillSep $
1465+ [D.cyan "if","powerLevel",">",D.dullyellow "9000"
1466+ ,D.cyan "then",D.dullyellow "\"OVER 9000!!!\""
1467+ ,D.cyan "else",D.dullyellow "\"not bad\""
1468+ ]
1469+ ]
1470+ , D.reflow $
1471+ "This defines a `reviewPowerLevel` function that we can use elsewhere in our program."
1472+ ]
1473+
1474+ _ ->
1475+ D.reflow $
1476+ "It is a reserved word. Try changing the name to something else?"
1477+ )
1478+
1479+ _ ->
1480+ let
1481+ region = toRegion row col
1482+ in
1483+ Report.Report "SYNTAX PROBLEM" region [] $
1484+ Code.toSnippet source region Nothing
1485+ (
1486+ D.reflow $
1487+ "I was expecting to see a declaration, but I am getting stuck here:"
1488+ ,
1489+ D.stack
1490+ [ case Code.whatIsNext source row col of
1491+ Code.Other (Just char) | Char.isUpper char ->
1492+ D.reflow $
1493+ "All declarations start with lower-case letters in Elm, so maybe this letter can\
1494+ \ be changed to lower-case?"
1495+
1496+ _ ->
1497+ D.reflow $
1498+ "Declarations normally start with a lower-case name or the `type` keyword."
1499+ , D.toSimpleHint $
1500+ "Here are a couple valid declarations for reference:"
1501+ , D.vcat
1502+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
1503+ , D.fillSep [D.green "add","x","y","="]
1504+ , D.fillSep [" ","x","+","y"]
1505+ ]
1506+ , D.fillSep [D.cyan "type",D.green "User","=","Anonymous","|","LoggedIn String"]
1507+ , D.reflow $
1508+ "Notice that these declarations start with lower-case letters. Capitalization\
1509+ \ makes a difference in Elm!"
1510+ ]
1511+ )
14471512
14481513 DeclSpace space row col ->
14491514 toSpaceReport source space row col
@@ -1473,165 +1538,6 @@ toDeclarationsReport source decl =
14731538 )
14741539
14751540
1476−toDeclStartReport :: Code.Source -> Row -> Col -> Report.Report
1477−toDeclStartReport source row col =
1478− case Code.whatIsNext source row col of
1479− Code.Close term bracket ->
1480− let
1481− region = toRegion row col
1482− in
1483− Report.Report ("STRAY " ++ map Char.toUpper term) region [] $
1484− Code.toSnippet source region Nothing
1485− (
1486− D.reflow $
1487− "I was not expecting to see a " ++ term ++ " here:"
1488− , D.reflow $
1489− "This " ++ bracket : " does not match up with an earlier open " ++ term ++ ". Try deleting it?"
1490− )
1491−
1492− Code.Keyword keyword ->
1493− let
1494− region = toKeywordRegion row col keyword
1495− in
1496− Report.Report "RESERVED WORD" region [] $
1497− Code.toSnippet source region Nothing
1498− (
1499− D.reflow $
1500− "I was not expecting to run into the `" ++ keyword ++ "` keyword here:"
1501− ,
1502− case keyword of
1503− "import" ->
1504− D.reflow $
1505− "It is reserved for declaring imports at the top of your module. If you want\
1506− \ another import, try moving it up top with the other imports. If you want to\
1507− \ define a value or function, try changing the name to something else!"
1508−
1509− "case" ->
1510− D.stack
1511− [ D.reflow $
1512− "It is reserved for writing `case` expressions. Try using a different name?"
1513− , D.toSimpleNote $
1514− "If you are trying to write a `case` expression, it needs to be part of a\
1515− \ definition. So you could write something like this instead:"
1516− , D.indent 4 $ D.vcat $
1517− [ D.indent 0 $ D.fillSep ["getWidth","maybeWidth","="]
1518− , D.indent 2 $ D.fillSep [D.cyan "case","maybeWidth",D.cyan "of"]
1519− , D.indent 4 $ D.fillSep [D.blue "Just","width","->"]
1520− , D.indent 6 $ D.fillSep ["width","+",D.dullyellow "200"]
1521− , ""
1522− , D.indent 4 $ D.fillSep [D.blue "Nothing","->"]
1523− , D.indent 6 $ D.fillSep [D.dullyellow "400"]
1524− ]
1525− , D.reflow $
1526− "This defines a `getWidth` function that you can use elsewhere in your program."
1527− ]
1528−
1529− "if" ->
1530− D.stack
1531− [ D.reflow $
1532− "It is reserved for writing `if` expressions. Try using a different name?"
1533− , D.toSimpleNote $
1534− "If you are trying to write an `if` expression, it needs to be part of a\
1535− \ definition. So you could write something like this instead:"
1536− , D.indent 4 $ D.vcat $
1537− [ "greet name ="
1538− , D.fillSep $
1539− [" "
1540− ,D.cyan "if","name","==",D.dullyellow "\"Abraham Lincoln\""
1541− ,D.cyan "then",D.dullyellow "\"Greetings Mr. President.\""
1542− ,D.cyan "else",D.dullyellow "\"Hey!\""
1543− ]
1544− ]
1545− , D.reflow $
1546− "This defines a `reviewPowerLevel` function that you can use elsewhere in your program."
1547− ]
1548−
1549− _ ->
1550− D.reflow $
1551− "It is a reserved word. Try changing the name to something else?"
1552− )
1553−
1554− Code.Upper c cs ->
1555− let
1556− region = toRegion row col
1557− in
1558− Report.Report "UNEXPECTED CAPITAL LETTER" region [] $
1559− Code.toSnippet source region Nothing
1560− (
1561− D.reflow $
1562− "Declarations always start with a lower-case letter, so I am getting stuck here:"
1563− ,
1564− D.stack
1565− [ D.fillSep $
1566− ["Try","a","name","like"
1567− ,D.green (D.fromChars (Char.toLower c : cs))
1568− ,"instead?"
1569− ]
1570− , D.toSimpleNote $
1571− "Here are a couple valid declarations for reference:"
1572− , D.indent 4 $ D.vcat $
1573− [ "greet : String -> String"
1574− , "greet name ="
1575− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1576− , ""
1577− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1578− ]
1579− , D.reflow $
1580− "Notice that they always start with a lower-case letter. Capitalization matters!"
1581− ]
1582− )
1583−
1584− Code.Other (Just char) | elem char ['(', '{', '[', '+', '-', '*', '/', '^', '&', '|', '"', '\'', '!', '@', '#', '$', '%'] ->
1585− let
1586− region = toRegion row col
1587− in
1588− Report.Report "UNEXPECTED SYMBOL" region [] $
1589− Code.toSnippet source region Nothing
1590− (
1591− D.reflow $
1592− "I am getting stuck because this line starts with the " ++ [char] ++ " symbol:"
1593− ,
1594− D.stack
1595− [ D.reflow $
1596− "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1597− , D.indent 4 $ D.vcat $
1598− [ "greet : String -> String"
1599− , "greet name ="
1600− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1601− , ""
1602− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1603− ]
1604− , D.reflow $
1605− "If this is not supposed to be a declaration, try adding some spaces before it?"
1606− ]
1607− )
1608−
1609− _ ->
1610− let
1611− region = toRegion row col
1612− in
1613− Report.Report "WEIRD DECLARATION" region [] $
1614− Code.toSnippet source region Nothing
1615− (
1616− D.reflow $
1617− "I am trying to parse a declaration, but I am getting stuck here:"
1618− ,
1619− D.stack
1620− [ D.reflow $
1621− "When a line has no spaces at the beginning, I expect it to be a declaration like one of these:"
1622− , D.indent 4 $ D.vcat $
1623− [ "greet : String -> String"
1624− , "greet name ="
1625− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
1626− , ""
1627− , D.cyan "type" <> " User = Anonymous | LoggedIn String"
1628− ]
1629− , D.reflow $
1630− "Try to make your declaration look like one of those? Or if this is not\
1631− \ supposed to be a declaration, try adding some spaces before it?"
1632− ]
1633− )
1634−
16351541
16361542-- PORT
16371543
@@ -1758,7 +1664,7 @@ toPortReport source port_ startRow startCol =
17581664 [ D.reflow $
17591665 "I was expecting to see a type next. Here are examples of outgoing and\
17601666 \ incoming ports for reference:"
1761− , D.indent 4 $ D.vcat $
1667+ , D.vcat
17621668 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
17631669 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
17641670 ]
@@ -1777,7 +1683,7 @@ portNote =
17771683 D.stack
17781684 [ D.toSimpleNote $
17791685 "Here are some example `port` declarations for reference:"
1780− , D.indent 4 $ D.vcat $
1686+ , D.vcat
17811687 [ D.fillSep [D.cyan "port","send",":","String -> Cmd msg"]
17821688 , D.fillSep [D.cyan "port","receive",":","(String -> msg) -> Sub msg"]
17831689 ]
@@ -1960,8 +1866,8 @@ typeAliasNote =
19601866 [ D.toSimpleNote $
19611867 "Here is an example of a valid `type alias` for reference:"
19621868 , D.vcat $
1963− [ D.indent 4 $ D.fillSep [D.cyan "type",D.cyan "alias","Person","="]
1964− , D.indent 6 $ D.vcat $
1869+ [ D.indent 0 $ D.fillSep [D.cyan "type",D.cyan "alias",D.green "Person","="]
1870+ , D.indent 2 $ D.vcat $
19651871 ["{ name : String"
19661872 ,", age : Int"
19671873 ,", height : Float"
@@ -2161,10 +2067,10 @@ customTypeNote =
21612067 [ D.toSimpleNote $
21622068 "Here is an example of a valid `type` declaration for reference:"
21632069 , D.vcat $
2164− [ D.indent 4 $ D.fillSep [D.cyan "type","Status"]
2165− , D.indent 6 $ D.fillSep ["=","Failure"]
2166− , D.indent 6 $ D.fillSep ["|","Waiting"]
2167− , D.indent 6 $ D.fillSep ["|","Success","String"]
2070+ [ D.indent 0 $ D.fillSep [D.cyan "type",D.green "Status"]
2071+ , D.indent 2 $ D.fillSep ["=","Failure"]
2072+ , D.indent 2 $ D.fillSep ["|","Waiting"]
2073+ , D.indent 2 $ D.fillSep ["|","Success","String"]
21682074 ]
21692075 , D.reflow $
21702076 "This defines a new `Status` type with three variants. This could be useful if\
@@ -2236,10 +2142,10 @@ toDeclDefReport source name declDef startRow startCol =
22362142 ,"a","type","annotation.","It","could","be","something","else","though,","so"
22372143 ,"here","is","a","valid","definition","for","reference:"
22382144 ]
2239− , D.indent 4 $ D.vcat $
2240− [ "greet : String -> String"
2241− , "greet name ="
2242− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2145+ , D.vcat
2146+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2147+ , D.fillSep [D.green "add","x","y","="]
2148+ , D.fillSep [" ","x","+","y"]
22432149 ]
22442150 , D.reflow $
22452151 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2261,10 +2167,10 @@ toDeclDefReport source name declDef startRow startCol =
22612167 [ D.reflow $
22622168 "I am not sure what is going wrong exactly, so here is a valid\
22632169 \ definition (with an optional type annotation) for reference:"
2264− , D.indent 4 $ D.vcat $
2265− [ "greet : String -> String"
2266− , "greet name ="
2267− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2170+ , D.vcat
2171+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2172+ , D.fillSep [D.green "add","x","y","="]
2173+ , D.fillSep [" ","x","+","y"]
22682174 ]
22692175 , D.reflow $
22702176 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -2286,10 +2192,10 @@ toDeclDefReport source name declDef startRow startCol =
22862192 [ D.reflow $
22872193 "I am not sure what is going wrong exactly, so here is a valid\
22882194 \ definition (with an optional type annotation) for reference:"
2289− , D.indent 4 $ D.vcat $
2290− [ "greet : String -> String"
2291− , "greet name ="
2292− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2195+ , D.vcat
2196+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2197+ , D.fillSep [D.green "add","x","y","="]
2198+ , D.fillSep [" ","x","+","y"]
22932199 ]
22942200 , D.reflow $
22952201 "Try to use that format!"
@@ -2404,10 +2310,10 @@ declDefNote =
24042310 D.stack
24052311 [ D.reflow $
24062312 "Here is a valid definition (with a type annotation) for reference:"
2407− , D.indent 4 $ D.vcat $
2408− [ "greet : String -> String"
2409− , "greet name ="
2410− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
2313+ , D.vcat
2314+ [ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
2315+ , D.fillSep [D.green "add","x","y","="]
2316+ , D.fillSep [" ","x","+","y"]
24112317 ]
24122318 , D.reflow $
24132319 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -2591,7 +2497,7 @@ toExprReport source context expr startRow startCol =
25912497 ,"give","a","more","specific","hint!"
25922498 ]
25932499 , D.toSimpleNote $
2594− "This can also happen if I run into reserved words like `let` or `as` unexpectedly.\
2500+ "This can also happen if run into reserved words like `let` or `as` unexpectedly.\
25952501 \ Or if I run into operators in unexpected spots. Point is, there are a\
25962502 \ couple ways I can get confused and give sort of weird advice!"
25972503 ]
@@ -2740,15 +2646,17 @@ toStringReport source string row col =
27402646 , D.toSimpleNote $
27412647 "For a string that spans multiple lines, you can use the multi-line string\
27422648 \ syntax like this:"
2743− , D.dullyellow $ D.indent 4 $ D.vcat $
2744− [ "\"\"\""
2745− , "# Multi-line Strings"
2746− , ""
2747− , "- start with triple double quotes"
2748− , "- write whatever you want"
2749− , "- no need to escape newlines or double quotes"
2750− , "- end with triple double quotes"
2751− , "\"\"\""
2649+ , D.vcat
2650+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2651+ , mempty
2652+ , D.dullyellow "# Multi-line Strings"
2653+ , mempty
2654+ , D.dullyellow "- start with triple double quotes"
2655+ , D.dullyellow "- write whatever you want"
2656+ , D.dullyellow "- no need to escape newlines or double quotes"
2657+ , D.dullyellow "- end with triple double quotes"
2658+ , mempty
2659+ , D.dullyellow "\"\"\""
27522660 ]
27532661 ]
27542662 )
@@ -2767,15 +2675,17 @@ toStringReport source string row col =
27672675 [ D.reflow "Add a \"\"\" somewhere after this to end the string."
27682676 , D.toSimpleNote $
27692677 "Here is a valid multi-line string for reference:"
2770− , D.dullyellow $ D.indent 4 $ D.vcat $
2771− [ "\"\"\""
2772− , "# Multi-line Strings"
2773− , ""
2774− , "- start with triple double quotes"
2775− , "- write whatever you want"
2776− , "- no need to escape newlines or double quotes"
2777− , "- end with triple double quotes"
2778− , "\"\"\""
2678+ , D.vcat
2679+ [ D.fillSep [D.green "markdown","=",D.dullyellow "\"\"\""]
2680+ , mempty
2681+ , D.dullyellow "# Multi-line Strings"
2682+ , mempty
2683+ , D.dullyellow "- start with triple double quotes"
2684+ , D.dullyellow "- write whatever you want"
2685+ , D.dullyellow "- no need to escape newlines or double quotes"
2686+ , D.dullyellow "- end with triple double quotes"
2687+ , mempty
2688+ , D.dullyellow "\"\"\""
27792689 ]
27802690 ]
27812691 )
@@ -3240,8 +3150,8 @@ toUnfinishLetReport source row col startRow startCol message =
32403150 [ message
32413151 , D.toSimpleNote $
32423152 "Here is an example with a valid `let` expression for reference:"
3243− , D.indent 4 $ D.vcat $
3244− [ D.indent 0 $ D.fillSep ["viewPerson","person","="]
3153+ , D.vcat $
3154+ [ D.indent 0 $ D.fillSep [D.green "viewPerson","person","="]
32453155 , D.indent 2 $ D.fillSep [D.cyan "let"]
32463156 , D.indent 4 $ D.fillSep ["fullName","="]
32473157 , D.indent 6 $ D.fillSep ["person.firstName","++",D.dullyellow "\" \"","++","person.lastName"]
@@ -3359,10 +3269,10 @@ toLetDefReport source name def startRow startCol =
33593269 ,"a","type","annotation.","It","could","be","something","else","though,","so"
33603270 ,"here","is","a","valid","definition","for","reference:"
33613271 ]
3362− , D.indent 4 $ D.vcat $
3363− [ "greet : String -> String"
3364− , "greet name ="
3365− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3272+ , D.vcat
3273+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3274+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3275+ , D.indent 6 $ D.fillSep ["x","+","y"]
33663276 ]
33673277 , D.reflow $
33683278 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3384,10 +3294,10 @@ toLetDefReport source name def startRow startCol =
33843294 [ D.reflow $
33853295 "I am not sure what is going wrong exactly, so here is a valid\
33863296 \ definition (with an optional type annotation) for reference:"
3387− , D.indent 4 $ D.vcat $
3388− [ "greet : String -> String"
3389− , "greet name ="
3390− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3297+ , D.vcat
3298+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3299+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3300+ , D.indent 6 $ D.fillSep ["x","+","y"]
33913301 ]
33923302 , D.reflow $
33933303 "Try to use that format with your `" ++ Name.toChars name ++ "` definition!"
@@ -3409,10 +3319,10 @@ toLetDefReport source name def startRow startCol =
34093319 [ D.reflow $
34103320 "I am not sure what is going wrong exactly, so here is a valid\
34113321 \ definition (with an optional type annotation) for reference:"
3412− , D.indent 4 $ D.vcat $
3413− [ "greet : String -> String"
3414− , "greet name ="
3415− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3322+ , D.vcat
3323+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3324+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3325+ , D.indent 4 $ D.fillSep ["x","+","y"]
34163326 ]
34173327 , D.reflow $
34183328 "Try to use that format!"
@@ -3502,10 +3412,10 @@ defNote =
35023412 D.stack
35033413 [ D.reflow $
35043414 "Here is a valid definition (with a type annotation) for reference:"
3505− , D.indent 4 $ D.vcat $
3506− [ "greet : String -> String"
3507− , "greet name ="
3508− , " " <> D.dullyellow "\"Hello \"" <> " ++ name ++ " <> D.dullyellow "\"!\""
3415+ , D.vcat
3416+ [ D.indent 4 $ D.fillSep [D.green "add",":","Int","->","Int","->","Int"]
3417+ , D.indent 4 $ D.fillSep [D.green "add","x","y","="]
3418+ , D.indent 6 $ D.fillSep ["x","+","y"]
35093419 ]
35103420 , D.reflow $
35113421 "The top line (called a \"type annotation\") is optional. You can leave it off\
@@ -4146,13 +4056,11 @@ toRecordReport source context record startRow startCol =
41464056 D.reflow $
41474057 "I just saw the opening curly brace of a record, but then I got stuck here:"
41484058 ,
4149− D.stack
4150− [ D.fillSep $
4151− ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
4152− ,"Try","defining","some","fields","of","your","own?"
4153− ]
4154− , noteForRecordIndentError
4155− ]
4059+ addNoteForRecordIndentError $
4060+ D.fillSep $
4061+ ["I","am","expecting","a","record","like",D.dullyellow "{ x = 3, y = 4 }","here."
4062+ ,"Try","defining","some","fields","of","your","own?"
4063+ ]
41564064 )
41574065
41584066 RecordIndentEnd row col ->
@@ -4186,13 +4094,11 @@ toRecordReport source context record startRow startCol =
41864094 D.reflow $
41874095 "I was partway through parsing a record, but I got stuck here:"
41884096 ,
4189− D.stack
4190− [ D.fillSep $
4191− ["I","was","expecting","to","see","a","closing","curly","brace","next."
4192− ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
4193− ]
4194− , noteForRecordIndentError
4195− ]
4097+ addNoteForRecordIndentError $
4098+ D.fillSep $
4099+ ["I","was","expecting","to","see","a","closing","curly","brace","next."
4100+ ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
4101+ ]
41964102 )
41974103
41984104 RecordIndentField row col ->
@@ -4227,12 +4133,10 @@ toRecordReport source context record startRow startCol =
42274133 "I am partway through parsing a record. I just saw a record\
42284134 \ field, so I was expecting to see an equals sign next:"
42294135 ,
4230− D.stack
4231− [ D.fillSep $
4232− ["Try","putting","an",D.green "=","followed","by","an","expression?"
4233− ]
4234− , noteForRecordIndentError
4235− ]
4136+ addNoteForRecordIndentError $
4137+ D.fillSep $
4138+ ["Try","putting","an",D.green "=","followed","by","an","expression?"
4139+ ]
42364140 )
42374141
42384142 RecordIndentExpr row col ->
@@ -4246,13 +4150,11 @@ toRecordReport source context record startRow startCol =
42464150 D.reflow $
42474151 "I am partway through parsing a record, and I was expecting to run into an expression next:"
42484152 ,
4249− D.stack
4250− [ D.fillSep $
4251− ["Try","putting","something","like"
4252− ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4253− ]
4254− , noteForRecordIndentError
4255− ]
4153+ addNoteForRecordIndentError $
4154+ D.fillSep $
4155+ ["Try","putting","something","like"
4156+ ,D.dullyellow "42","or",D.dullyellow"\"hello\"","for","now?"
4157+ ]
42564158 )
42574159
42584160
@@ -4262,9 +4164,9 @@ noteForRecordError =
42624164 [ D.toSimpleNote
42634165 "If you are trying to define a record across multiple lines, I recommend using this format:"
42644166 , D.indent 4 $ D.vcat $
4265− [ "{ name = " <> D.dullyellow "\"Alice\""
4266− , ", age = " <> D.dullyellow "42"
4267− , ", height = " <> D.dullyellow "1.75"
4167+ [ "{ name = \"Alice\""
4168+ , ", age = 42"
4169+ , ", height = 1.75"
42684170 , "}"
42694171 ]
42704172 , D.reflow $
@@ -4273,16 +4175,18 @@ noteForRecordError =
42734175 ]
42744176
42754177
4276−noteForRecordIndentError :: D.Doc
4277−noteForRecordIndentError =
4278− D.stack
4178+addNoteForRecordIndentError :: D.Doc -> D.Doc
4179+addNoteForRecordIndentError normalRecommendation =
4180+ D.stack $
4181+ normalRecommendation
4182+ :
42794183 [ D.toSimpleNote
42804184 "I may be confused by indentation. For example, if you are trying to define\
42814185 \ a record across multiple lines, I recommend using this format:"
42824186 , D.indent 4 $ D.vcat $
4283− [ "{ name = " <> D.dullyellow "\"Alice\""
4284− , ", age = " <> D.dullyellow "42"
4285− , ", height = " <> D.dullyellow "1.75"
4187+ [ "{ name = \"Alice\""
4188+ , ", age = 42"
4189+ , ", height = 1.75"
42864190 , "}"
42874191 ]
42884192 , D.reflow $
@@ -4476,9 +4380,9 @@ toListReport source context list startRow startCol =
44764380 , D.toSimpleNote
44774381 "I recommend using the following format for lists that span multiple lines:"
44784382 , D.indent 4 $ D.vcat $
4479− [ "[ " <> D.dullyellow "\"Alice\""
4480− , ", " <> D.dullyellow "\"Bob\""
4481− , ", " <> D.dullyellow "\"Chuck\""
4383+ [ "[ \"Alice\""
4384+ , ", \"Bob\""
4385+ , ", \"Chuck\""
44824386 , "]"
44834387 ]
44844388 , D.reflow $
@@ -4536,9 +4440,9 @@ toListReport source context list startRow startCol =
45364440 "I may be confused by indentation. For example, if you are trying to define\
45374441 \ a list across multiple lines, I recommend using this format:"
45384442 , D.indent 4 $ D.vcat $
4539− [ "[ " <> D.dullyellow "\"Alice\""
4540− , ", " <> D.dullyellow "\"Bob\""
4541− , ", " <> D.dullyellow "\"Chuck\""
4443+ [ "[ \"Alice\""
4444+ , ", \"Bob\""
4445+ , ", \"Chuck\""
45424446 , "]"
45434447 ]
45444448 , D.reflow $
@@ -4567,9 +4471,9 @@ toListReport source context list startRow startCol =
45674471 "I may be confused by indentation. For example, if you are trying to define\
45684472 \ a list across multiple lines, I recommend using this format:"
45694473 , D.indent 4 $ D.vcat $
4570− [ "[ " <> D.dullyellow "\"Alice\""
4571− , ", " <> D.dullyellow "\"Bob\""
4572− , ", " <> D.dullyellow "\"Chuck\""
4474+ [ "[ \"Alice\""
4475+ , ", \"Bob\""
4476+ , ", \"Chuck\""
45734477 , "]"
45744478 ]
45754479 , D.reflow $
@@ -4595,9 +4499,9 @@ toListReport source context list startRow startCol =
45954499 , D.toSimpleNote
45964500 "I recommend using the following format for lists that span multiple lines:"
45974501 , D.indent 4 $ D.vcat $
4598− [ "[ " <> D.dullyellow "\"Alice\""
4599− , ", " <> D.dullyellow "\"Bob\""
4600− , ", " <> D.dullyellow "\"Chuck\""
4502+ [ "[ \"Alice\""
4503+ , ", \"Bob\""
4504+ , ", \"Chuck\""
46014505 , "]"
46024506 ]
46034507 , D.reflow $
compiler/src/Reporting/Render/Code.hs+24−35
@@ -122,7 +122,7 @@ makeUnderline width realEndLine (A.Region (A.Position start c1) (A.Position end
122122 spaces = replicate (fromIntegral c1 + width + 1) ' '
123123 zigzag = replicate (max 1 (fromIntegral (c2 - c1))) '^'
124124 in
125− Just (D.fromChars spaces <> D.red (D.fromChars zigzag))
125+ Just (D.fromChars spaces <> D.dullred (D.fromChars zigzag))
126126
127127
128128drawLines :: Bool -> Int -> A.Region -> [(Word16, String)] -> Doc -> Doc
@@ -148,7 +148,7 @@ addLineNumber addZigZag width start end n line =
148148
149149 spacer =
150150 if addZigZag && start <= n && n <= end then
151− D.red ">"
151+ D.dullred ">"
152152 else
153153 " "
154154 in
@@ -183,8 +183,8 @@ renderPair source@(Source sourceLines) region1 region2 =
183183 OneLine $
184184 D.vcat
185185 [ D.fromChars lineNumber <> "| " <> D.fromChars line
186− , D.fromChars spaces1 <> D.red (D.fromChars zigzag1) <>
187− D.fromChars spaces2 <> D.red (D.fromChars zigzag2)
186+ , D.fromChars spaces1 <> D.dullred (D.fromChars zigzag1) <>
187+ D.fromChars spaces2 <> D.dullred (D.fromChars zigzag2)
188188 ]
189189
190190 else
@@ -201,8 +201,6 @@ data Next
201201 = Keyword [Char]
202202 | Operator [Char]
203203 | Close [Char] Char
204− | Upper Char [Char]
205− | Lower Char [Char]
206204 | Other (Maybe Char)
207205
208206
@@ -213,34 +211,25 @@ whatIsNext (Source sourceLines) row col =
213211 Other Nothing
214212
215213 Just line ->
216− case drop (fromIntegral col - 1) line of
217− [] ->
218− Other Nothing
219−
220− c:cs
221− | Char.isUpper c -> Upper c (takeWhile isInner cs)
222− | Char.isLower c -> detectKeywords c cs
223− | isSymbol c -> Operator (c : takeWhile isSymbol cs)
224− | c == ')' -> Close "parenthesis" ')'
225− | c == ']' -> Close "square bracket" ']'
226− | c == '}' -> Close "curly brace" '}'
227− | otherwise -> Other (Just c)
228−
229−
230−detectKeywords :: Char -> [Char] -> Next
231−detectKeywords c rest =
232− let
233− cs = takeWhile isInner rest
234− name = c : cs
235− in
236− if Set.member (Name.fromChars name) reservedWords
237− then Keyword name
238− else Lower c name
239−
240−
241−isInner :: Char -> Bool
242−isInner char =
243− Char.isAlphaNum char || char == '_'
214+ let
215+ chars = drop (fromIntegral col - 1) line
216+ keywords = map Name.toChars (Set.toList reservedWords)
217+ in
218+ case List.find (startsWithKeyword chars) keywords of
219+ Just keyword ->
220+ Keyword keyword
221+
222+ Nothing ->
223+ case chars of
224+ [] ->
225+ Other Nothing
226+
227+ c:cs
228+ | isSymbol c -> Operator (c : takeWhile isSymbol cs)
229+ | c == ')' -> Close "parenthesis" ')'
230+ | c == ']' -> Close "square bracket" ']'
231+ | c == '}' -> Close "curly brace" '}'
232+ | otherwise -> Other (Just c)
244233
245234
246235isSymbol :: Char -> Bool
@@ -257,7 +246,7 @@ startsWithKeyword restOfLine keyword =
257246 True
258247
259248 c:_ ->
260− not (isInner c)
249+ not (Char.isAlphaNum c || c == '_')
261250
262251
263252nextLineStartsWithKeyword :: [Char] -> Source -> Row -> Maybe (Row, Col)
compiler/src/Reporting/Render/Type/Localizer.hs+5−5
@@ -112,9 +112,9 @@ toExposing exposing =
112112 Only (foldr addType Set.empty exposedList)
113113
114114
115−addType :: Src.Exposed -> Set.Set Name.Name -> Set.Set Name.Name
116−addType exposed types =
115+addType :: A.Located Src.Exposed -> Set.Set Name.Name -> Set.Set Name.Name
116+addType (A.At _ exposed) types =
117117 case exposed of
118− Src.Lower _ -> types
119− Src.Upper (A.At _ name) _ -> Set.insert name types
120− Src.Operator _ _ -> types
118+ Src.Lower _ -> types
119+ Src.Upper name _ -> Set.insert name types
120+ Src.Operator _ -> types
docs/elm.json/application.md+2−2
@@ -8,7 +8,7 @@ This is a decent baseline for pretty much any applications made with Elm. You wi
88 "source-directories": [
99 "src"
1010 ],
11− "elm-version": "0.19.1",
11+ "elm-version": "0.19.0",
1212 "dependencies": {
1313 "direct": {
1414 "elm/browser": "1.0.0",
@@ -48,7 +48,7 @@ A list of directories where Elm code lives. Most projects just use `"src"` for e
4848
4949## `"elm-version"`
5050
51−The exact version of Elm this builds with. Should be `"0.19.1"` for most people!
51+The exact version of Elm this builds with. Should be `"0.19.0"` for most people!
5252
5353<br>
5454
docs/elm.json/package.md+1−1
@@ -49,7 +49,7 @@ A short summary that will appear on [`package.elm-lang.org`](https://package.elm
4949
5050## `"license"`
5151
52−An OSI approved SPDX code like `"BSD-3-Clause"` or `"MIT"`. These are the two most common licenses in the Elm ecosystem, and BSD-3-Clause is a good default. But you can see the full list of options [here](https://spdx.org/licenses/).
52+An OSI approved SPDX code like `"BSD-3-Clause"` or `"MIT"`. These are the two most common licenses in the Elm ecosystem, but you can see the full list of options [here](https://spdx.org/licenses/).
5353
5454<br>
5555
docs/upgrade-instructions/0.19.1.mddeleted−60
@@ -1,60 +0,0 @@
1−# Upgrading to 0.19.1
2−
3−**There are no language changes**, so once you swap to `"elm-version": "0.19.1"` in your `elm.json`, most users should be able to proceed without any further code changes. **You may run into a handful of bugfixes though!** These cases are outlined below!
4−
5−
6−<br>
7−
8−## Improvements
9−
10−- Parse error message quality (like [this](https://github.com/elm/error-message-catalog/issues/255) and [this](https://github.com/elm/error-message-catalog/issues/225))
11−- Faster compilation, especially for incremental compiles
12−- Uses filelocks so that cached files are not corrupted when plugins run `elm make` multiple times on the same project at the same time. (Still worth avoiding that though!)
13−- More intuitive multiline declarations in REPL
14−- Various bug fixes (e.g. `--debug`, `x /= 0`, `type Height = Height Float` in `--optimize`)
15−
16−
17−<br>
18−
19−## Detectable Bug Fixes
20−
21−There are three known cases where code that compiled with 0.19.0 will not compile with 0.19.1 due to bug fixes:
22−
23−
24−### 1. Ambiguous Imports
25−
26−Say you have an import like this:
27−
28−```elm
29−import Html exposing (min)
30−import Regex exposing (never)
31−
32−x = min
33−y = never
34−```
35−
36−These should be reported as ambiguous usages since the names are also exposed by `Basics`, but there was a regression in 0.19.0 described [here](https://github.com/elm/compiler/issues/1945) such that they weren't caught in specific circumstances.
37−
38−The fix is to use a qualified name like `Html.min` or `Regex.never` to make it unambiguous.
39−
40−We found a couple instances of this in packages and have submitted PRs to the relevant authors in August 2019. You may run into this in your own code as well.
41−
42−For more details on why this is considered a regression, check out the details [here](https://github.com/elm/compiler/issues/1945#issuecomment-507871919) or try it in 0.18.0 to see how it worked before.
43−
44−
45−### 2. Tabs in Comments
46−
47−The 0.19.0 binaries did not catch tab characters in comments. The new parser is better at checking for tabs, so it will object when it finds these.
48−
49−Again, we found this in some packages and reached out to the relevant authors with PRs so patches would be published before the 0.19.1 release.
50−
51−
52−### 3. Port Module with no Ports
53−
54−If you have any files that start with:
55−
56−```elm
57−port module Main exposing (..)
58−```
59−
60−But they do not actually have any `port` declarations, the 0.19.1 binary will ask you to switch to a normal module declaration like `module Main exposing (..)`
elm.cabal+5−6
@@ -45,7 +45,6 @@ Executable elm
4545 Hs-Source-Dirs:
4646 compiler/src
4747 builder/src
48− terminal/impl
4948 terminal/src
5049
5150 other-extensions:
@@ -65,11 +64,11 @@ Executable elm
6564 Repl
6665
6766 -- terminal args
68− Terminal
69− Terminal.Chomp
70− Terminal.Error
71− Terminal.Helpers
72− Terminal.Internal
67+ Terminal.Args
68+ Terminal.Args.Chomp
69+ Terminal.Args.Error
70+ Terminal.Args.Helpers
71+ Terminal.Args.Internal
7372
7473 -- from terminal/
7574 Develop.Generate.Help
hints/bad-recursion.md+1−1
@@ -10,7 +10,7 @@ There are two problems that will lead you here, both of them pretty tricky:
1010
1111## No Mutation
1212
13−Languages like JavaScript let you “reassign” variables. When you say `x = x + 1` it means: whatever `x` was pointing to, have it point to `x + 1` instead. This is called *mutating* a variable. All values are immutable in Elm, so reassigning variables does not make any sense! Okay, so what *should* `x = x + 1` mean in Elm?
13+Languages like JavaScript let you “reassign” variables. When you say `x = x + 1` it means: whatever `x` was pointing to, have it point to `x + 1` instead. This called *mutating* a variable. All values are immutable in Elm, so reassigning variables does not make any sense! Okay, so what *should* `x = x + 1` mean in Elm?
1414
1515Well, what does it mean with functions? In Elm, we write recursive functions like this:
1616
hints/comparing-custom-types.md+2−2
@@ -50,11 +50,11 @@ get (Id id) (Table _ dict) =
5050add : info -> Table info -> (Table info, Id)
5151add info (Table nextId dict) =
5252 ( Table (nextId + 1) (Dict.insert nextId info dict)
53− , Id nextId
53+ , nextId
5454 )
5555```
5656
57−There are a couple nice things about this approach:
57+There are a couple nice thing about this approach:
5858
59591. The only way to get a new `User.Id` is to `add` information to a `User.Table`.
60602. All the operations on a `User.Table` are explicit. Does it make sense to remove users? To merge two tables together? Are there any special details to consider in those cases? This will always be captured explicitly in the interface of the `User` module.
hints/comparing-records.md+3−3
@@ -7,7 +7,7 @@ This page aims to catalog these scenarios and offer alternative paths that can g
77
88## Sorting Records
99
10−Say we want a `view` function that can show a list of students sorted by different characteristics.
10+Say we want a `view` function that can show a list of students sorted by different characterists.
1111
1212We could create something like this:
1313
@@ -23,7 +23,7 @@ type alias Student =
2323type Order = Name | Age | GPA
2424
2525viewStudents : Order -> List Student -> Html msg
26−viewStudents order students =
26+viewStudents order studentns =
2727 let
2828 orderlyStudents =
2929 case order of
@@ -54,7 +54,7 @@ type alias Student =
5454 }
5555
5656viewStudents : Order -> List Student -> Html msg
57−viewStudents order students =
57+viewStudents order studentns =
5858 let
5959 orderlyStudents =
6060 case order of
hints/implicit-casts.md+4−1
@@ -16,6 +16,9 @@ Languages that will add in implicit casts for addition include:
1616
1717These languages generally agree that an `Int` may be implicitly cast to a `Float` when necessary. So everyone is doing it, why not Elm?!
1818
19+> **Note:** Ruby does not follow the trend. They implicitly cast a `Float` to an `Int`, truncating all the decimal points!
20+
21+
1922## Type Inference + Implicit Casts
2023
2124Elm comes from the ML-family of languages. Languages in the ML-family that **never** do implicit casts include:
@@ -38,7 +41,7 @@ So for any ML-family language designed before Scala, it is safe to assume that i
3841
3942 2. Based on experience reports from Scala users, it seemed like the convenience was not worth the hidden cost. Yes, you can convert `n` in `(n + 1.5)` and everything is nice, but when you are in larger programs that are sparsely annotated, it can be quite difficult to figure out what is going on.
4043
41−This user data may be confounded by the fact that Scala allows quite extensive conversions, not just from `Int` to `Float`, but I think it is worth taking seriously nonetheless. So it is _possible_, but it has tradeoffs.
44+This user data may be confounded by the fact that Scala allows quite extensive conversions, not just from `Int` to `Float`, but I think it is worth taking seriously nonetheless. So it is _possible_, but it is has tradeoffs.
4245
4346
4447## Conclusion
hints/import-cycles.md+1−1
@@ -55,7 +55,7 @@ type alias User =
5555 }
5656```
5757
58−Notice that the `Comment` type alias is defined in terms of the `User` type alias and vice versa. Having recursive type aliases like this does not work! That problem is described in depth [here](recursive-alias.md), but the quick takeaway is that one `type alias` needs to become a `type` to break the recursion. So let’s try again:
58+Notice that the `Comment` type alias is defined in terms of the `User` type alias and vice versa. Having recursive type aliases like this does not work! That problem is described in depth [here](recursive-alias), but the quick takeaway is that one `type alias` needs to become a `type` to break the recursion. So let’s try again:
5959
6060```elm
6161module BadCombination2 exposing (..)
hints/optimize.md+2−2
@@ -21,7 +21,7 @@ Putting those together, here is how I would optimize `src/Main.elm` with two ter
2121
2222```bash
2323elm make src/Main.elm --optimize --output=elm.js
24−uglifyjs elm.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output elm.min.js
24+uglifyjs elm.js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output=elm.min.js
2525```
2626
2727After this you will have an `elm.js` and a significantly smaller `elm.min.js` file!
@@ -46,7 +46,7 @@ min="elm.min.js"
4646
4747elm make --optimize --output=$js $@
4848
49−uglifyjs $js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output $min
49+uglifyjs $js --compress "pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe" | uglifyjs --mangle --output=$min
5050
5151echo "Initial size: $(cat $js | wc -c) bytes ($js)"
5252echo "Minified size:$(cat $min | wc -c) bytes ($min)"
hints/recursive-alias.md+2−2
@@ -39,7 +39,7 @@ It is much easier to write down `Person` in a type, and then it will just expand
3939
4040## Recursive type aliases?
4141
42−Okay, so let's say you have some type that may contain itself. In Elm, a common example of this is a comment that might have subcomments:
42+Okay, so lets say you have some type that may contain itself. In Elm, a common example of this is a comment that might have subcomments:
4343
4444```elm
4545type alias Comment =
@@ -102,7 +102,7 @@ type Comment =
102102 }
103103```
104104
105−Now let's say you want to register an upvote on a comment:
105+Now lets say you want to register an upvote on a comment:
106106
107107```elm
108108upvote : Comment -> Comment
hints/type-annotations.md+3−1
@@ -8,7 +8,7 @@ This document is going to outline the various things that can go wrong and show
88
99## Annotation vs. Definition
1010
11−The most common issue is with user-defined type variables that are too general. So let's say you have defined a function like this:
11+The most common issue is with user-defined type variables that are too general. So lets say you have defined a function like this:
1212
1313```elm
1414addPair : (a, a) -> a
@@ -58,3 +58,5 @@ filter isOkay list =
5858This case is very unfortunate because all the type annotations are correct, but there is a detail of how type inference works right now that **user-defined type variables are not shared between annotations**. This can lead to probably the worst type error messages we have because the problem here is that `a` in the outer annotation does not equal `a` in the inner annotation.
5959
6060For now the best route is to leave off the inner annotation. It is unfortunate, and hopefully we will be able to do a nicer thing in future releases.
61+
62+"""
installers/README.mddeleted−32
@@ -1,32 +0,0 @@
1−# Installing Elm
2−
3−The normal path is to work through [the guide](https://guide.elm-lang.org/) until you need to install, but you can skip to installation directly by going [here](https://guide.elm-lang.org/install/terminal.html).
4−
5−
6−<br/>
7−
8−## Installing Multiple Versions
9−
10−The secret is that Elm is just a single executable file. If you are developing a project in `~/Desktop/project/` you can download this file into that directory and run commands like `~/Desktop/project/elm make src/Main.elm` or `./elm make src/Main.elm`. You just run the local copy of the executable file!
11−
12−The instructions for [Mac][mac] and [Linux][lin] explain how to do this in more detail. You can follow the same steps on Windows, but you need to do each step by hand. (E.g. download the file through your browser rather than with a terminal command.)
13−
14−[mac]: https://github.com/elm/compiler/blob/master/installers/mac/README.md
15−[lin]: https://github.com/elm/compiler/blob/master/installers/linux/README.md
16−
17−<br/>
18−
19−## Installing Previous Versions
20−
21−The past binaries for Mac, Linux, and Windows are hosted [here](https://github.com/elm/compiler/releases).
22−
23−You can download the executable files directly and use them locally.
24−
25−
26−<br/>
27−
28−## Uninstall
29−
30−- [Mac](https://github.com/elm/compiler/blob/master/installers/mac/README.md#uninstall)
31−- [Linux](https://github.com/elm/compiler/blob/master/installers/linux/README.md#uninstall)
32−- [Windows](https://github.com/elm/compiler/blob/master/installers/win/README.md#uninstall)
installers/linux/Dockerfile+19−33
@@ -1,39 +1,25 @@
1−# Based initially on https://gist.github.com/rlefevre/1523f47e75310e28eee243c9c5651ac9
2−#
3−# Build Linux x64 binary from elm compiler top-level directory:
4−# $ docker build -t elm -f installers/linux/Dockerfile .
5−#
6−# Retrieve elm Linux binary:
7−# $ docker cp $(docker create elm):/usr/local/bin/elm DESTINATION_DIRECTORY
8−#
9−# Delete docker elm image:
10−# $ docker rmi elm
11−#
12−# Display all images:
13−# $ docker images -a
14−#
15−# Delete all unused docker images:
16−# $ docker system prune -a
1+# Create: https://gist.github.com/rlefevre/1523f47e75310e28eee243c9c5651ac9
2+# Delete: docker system prune -a ; docker images -a
173
18−# Use Alpine 3.11 with GHC 8.6.5
19−FROM alpine:3.11
4+FROM alpine:3.10
205
21−# Install packages required to build elm
22−RUN apk add --no-cache ghc cabal wget musl-dev zlib-dev zlib-static ncurses-dev ncurses-static
6+# branch
7+ARG branch=master
8+# commit or tag
9+ARG commit=HEAD
2310
24−WORKDIR /elm
11+# Install required packages
12+RUN apk add --update ghc cabal git musl-dev zlib-dev ncurses-dev ncurses-static wget
2513
26−# Import source code
27−COPY builder builder
28−COPY compiler compiler
29−COPY reactor reactor
30−COPY terminal terminal
31−COPY cabal.config elm.cabal LICENSE ./
14+# Checkout elm compiler
15+WORKDIR /tmp
16+RUN git clone -b $branch https://github.com/elm/compiler.git
3217
33−# Build statically linked elm binary
18+# Build a statically linked elm binary
19+WORKDIR /tmp/compiler
20+RUN git checkout $commit
21+RUN rm worker/elm.cabal
3422RUN cabal new-update
35−RUN cabal new-build --ghc-option=-optl=-static --ghc-option=-split-sections
36−RUN cp ./dist-newstyle/build/x86_64-linux/ghc-*/elm-*/x/elm/build/elm/elm /usr/local/bin/elm
37−
38−# Remove debug symbols to optimize the binary size
39−RUN strip -s /usr/local/bin/elm
23+RUN cabal new-configure --disable-executable-dynamic --ghc-option=-optl=-static --ghc-option=-optl=-pthread
24+RUN cabal new-build
25+RUN strip -s ./dist-newstyle/build/x86_64-linux/ghc-8.4.3/elm-0.19.1/x/elm/build/elm/elm
installers/linux/README.mddeleted−93
@@ -1,93 +0,0 @@
1−# Install Instructions
2−
3−The pre-compiled binary for Linux works on a very wide range of distributions.
4−
5−It should be possible to install it by running the following commands in your terminal:
6−
7−```bash
8−# Move to your Desktop so you can see what is going on easier.
9−#
10−cd ~/Desktop/
11−
12−# Download the 0.19.1 binary for Linux.
13−#
14−# +-----------+----------------------+
15−# | FLAG | MEANING |
16−# +-----------+----------------------+
17−# | -L | follow redirects |
18−# | -o elm.gz | name the file elm.gz |
19−# +-----------+----------------------+
20−#
21−curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
22−
23−# There should now be a file named `elm.gz` on your Desktop.
24−#
25−# The downloaded file is compressed to make it faster to download.
26−# This next command decompresses it, replacing `elm.gz` with `elm`.
27−#
28−gunzip elm.gz
29−
30−# There should now be a file named `elm` on your Desktop!
31−#
32−# Every file has "permissions" about whether it can be read, written, or executed.
33−# So before we use this file, we need to mark this file as executable:
34−#
35−chmod +x elm
36−
37−# The `elm` file is now executable. That means running `~/Desktop/elm --help`
38−# should work. Saying `./elm --help` works the same.
39−#
40−# But we want to be able to say `elm --help` without specifying the full file
41−# path every time. We can do this by moving the `elm` binary to one of the
42−# directories listed in your `PATH` environment variable:
43−#
44−sudo mv elm /usr/local/bin/
45−
46−# Now it should be possible to run the `elm` binary just by saying its name!
47−#
48−elm --help
49−```
50−
51−<br/>
52−
53−## Wait, what is the `PATH` variable?
54−
55−When you run a command like `elm make src/Main.elm`, your computer starts by trying to find an executable file called `elm`.
56−
57−The `PATH` is the list of directories that get searched. You can see these directories by running:
58−
59−```bash
60−echo $PATH
61−```
62−
63−This prints `/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin` on my computer. The directories are separated by a `:` so there are five possibilities listed here.
64−
65−When I run `elm make src/Main.elm`, my terminal starts by searching these five directories for an executable file named `elm`. It finds `/usr/local/bin/elm` and then runs `/usr/local/bin/elm make src/Main.elm` with whatever arguments I gave.
66−
67−So the `PATH` environment variable is a convention that allows you to refer to a specific executable file without knowing exactly where it lives on your computer. This is actually how all "terminal commands" work! Commands like `ls` are really executable files that live in directories listed in your `PATH` variable.
68−
69−So the point of running `sudo mv elm /usr/local/bin/` is to turn the `elm` binary into a terminal command, allowing us to call it just like `ls` and `cd`.
70−
71−**Note:** Why do we need to use `sudo` for that one command? Imagine if some program was able to add executables named `ls` or `cd` to `/usr/local/bin` that did something tricky and unexpected. That would be a security problem! Many distributions make this scenario less likely by requiring special permissions to modify the `/usr/local/bin/` directory.
72−
73−
74−<br/>
75−
76−## Uninstall
77−
78−The following commands should remove everything:
79−
80−```bash
81−# Remove the `elm` executable.
82−#
83−sudo rm /usr/local/bin/elm
84−
85−# Remove any cached files. The files here reduce compile times when
86−# starting new projects and make it possible to work offline in more
87−# cases. No need to keep it around if you are uninstalling though!
88−#
89−rm -r ~/.elm/
90−```
91−
92−If you have any Elm projects still on your computer, you can remove their `elm-stuff/` directories as well.
93−
installers/mac/Distribution.xml+3−5
@@ -1,6 +1,6 @@
11<?xml version="1.0" encoding="utf-8" standalone="no"?>
22<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.6" authoringToolBuild="201">
3− <title>Elm</title>
3+ <title>Elm Platform</title>
44 <options customize="allow" allow-external-scripts="no"/>
55 <domains enable_localSystem="true"/>
66 <volume-check script="pm_volume_check();"/>
@@ -10,7 +10,7 @@
1010function pm_volume_check() {
1111 if(!(my.target.systemVersion &amp;&amp; /* >= */ system.compareVersions(my.target.systemVersion.ProductVersion, '10.6.0') >= 0)) {
1212 my.result.title = 'Failure';
13− my.result.message = 'This version of Elm requires Mac OS X 10.6 or later.';
13+ my.result.message = 'This version of Elm Platform requires Mac OS X 10.6 or later.';
1414 my.result.type = 'Fatal';
1515 return false;
1616 }
@@ -18,15 +18,13 @@ function pm_volume_check() {
1818}
1919
2020</script>
21− <!--
2221 <background file="background.png" alignment="bottomleft" scaling="none" mime-type="image/png"/>
23− -->
2422 <welcome mime-type="text/rtf" file="welcome.rtf" />
2523 <conclusion mime-type="text/rtf" file="conclusion.rtf" />
2624 <choices-outline>
2725 <line choice="choice2"/>
2826 </choices-outline>
29− <choice id="choice2" title="Elm">
27+ <choice id="choice2" title="Elm Platform ">
3028 <pkg-ref id="org.elm-lang.binaries.pkg"/>
3129 </choice>
3230 <pkg-ref id="org.elm-lang.binaries.pkg" installKBytes="19444" version="1" auth="Root">binaries.pkg</pkg-ref>
installers/mac/README.mddeleted−93
@@ -1,93 +0,0 @@
1−# Install Instructions
2−
3−The easiest way to install is to to use [the Mac installer](https://github.com/elm/compiler/releases/download/0.19.1/installer-for-mac.pkg)!
4−
5−But it is also possible to install by running the following commands in your terminal:
6−
7−```bash
8−# Move to your Desktop so you can see what is going on easier.
9−#
10−cd ~/Desktop/
11−
12−# Download the 0.19.1 binary for Linux.
13−#
14−# +-----------+----------------------+
15−# | FLAG | MEANING |
16−# +-----------+----------------------+
17−# | -L | follow redirects |
18−# | -o elm.gz | name the file elm.gz |
19−# +-----------+----------------------+
20−#
21−curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-mac-64-bit.gz
22−
23−# There should now be a file named `elm.gz` on your Desktop.
24−#
25−# The downloaded file is compressed to make it faster to download.
26−# This next command decompresses it, replacing `elm.gz` with `elm`.
27−#
28−gunzip elm.gz
29−
30−# There should now be a file named `elm` on your Desktop!
31−#
32−# Every file has "permissions" about whether it can be read, written, or executed.
33−# So before we use this file, we need to mark this file as executable:
34−#
35−chmod +x elm
36−
37−# The `elm` file is now executable. That means running `~/Desktop/elm --help`
38−# should work. Saying `./elm --help` works the same.
39−#
40−# But we want to be able to say `elm --help` without specifying the full file
41−# path every time. We can do this by moving the `elm` binary to one of the
42−# directories listed in your `PATH` environment variable:
43−#
44−sudo mv elm /usr/local/bin/
45−
46−# Now it should be possible to run the `elm` binary just by saying its name!
47−#
48−elm --help
49−```
50−
51−<br/>
52−
53−## What is the `PATH` variable?
54−
55−When you run a command like `elm make src/Main.elm`, your computer starts by trying to find an executable file called `elm`.
56−
57−The `PATH` is the list of directories that get searched. You can see these directories by running:
58−
59−```bash
60−echo $PATH
61−```
62−
63−This prints `/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin` on my computer. The directories are separated by a `:` so there are five possibilities listed here.
64−
65−When I run `elm make src/Main.elm`, my terminal starts by searching these five directories for an executable file named `elm`. It finds `/usr/local/bin/elm` and then runs `/usr/local/bin/elm make src/Main.elm` with whatever arguments I gave.
66−
67−So the `PATH` environment variable is a convention that allows you to refer to a specific executable file without knowing exactly where it lives on your computer. This is actually how all "terminal commands" work! Commands like `ls` are really executable files that live in directories listed in your `PATH` variable.
68−
69−So the point of running `sudo mv elm /usr/local/bin/` is to turn the `elm` binary into a terminal command, allowing us to call it just like `ls` and `cd`.
70−
71−**Note:** Why do we need to use `sudo` for that one command? Imagine if some program was able to add executables named `ls` or `cd` to `/usr/local/bin` that did something tricky and unexpected. That would be a security problem! Many distributions make this scenario less likely by requiring special permissions to modify the `/usr/local/bin/` directory.
72−
73−
74−<br/>
75−
76−## Uninstall
77−
78−The following commands should remove everything:
79−
80−```bash
81−# Remove the `elm` executable.
82−#
83−sudo rm /usr/local/bin/elm
84−
85−# Remove any cached files. The files here reduce compile times when
86−# starting new projects and make it possible to work offline in more
87−# cases. No need to keep it around if you are uninstalling though!
88−#
89−rm -r ~/.elm/
90−```
91−
92−If you have any Elm projects still on your computer, you can remove their `elm-stuff/` directories as well.
93−
installers/mac/Resources/en.lproj/background.pngnew file

Binary file not shown.

installers/mac/Resources/en.lproj/conclusion.rtf+6−13
@@ -1,16 +1,9 @@
1−{\rtf1\ansi\ansicpg1252\cocoartf2509
2−\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
1+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
2+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
33{\colortbl;\red255\green255\blue255;}
4−{\*\expandedcolortbl;;}
5−\paperw11900\paperh16840\margl1440\margr1440\vieww11180\viewh8400\viewkind0
6−\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
4+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
5+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
76
8−\f0\fs28 \cf0 Try opening the terminal and running commands like:\
7+\f0\fs26 \cf0 A bunch of useful programs were just placed in /usr/local/bin/\
98\
10−
11−\f1 elm init\
12−elm make src/Main.elm --optimize\
13−elm repl
14−\f0 \
15−\
16−Check out {\field{\*\fldinst{HYPERLINK "https://guide.elm-lang.org/"}}{\fldrslt this tutorial}} for more advice!}
9+Check out {\field{\*\fldinst HYPERLINK "http://elm-lang.org/Get-Started.elm"}{\fldrslt this tutorial}} to learn how to use them!}
installers/mac/Resources/en.lproj/welcome.rtf+4−9
@@ -1,12 +1,7 @@
1−{\rtf1\ansi\ansicpg1252\cocoartf2509
2−\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
1+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
2+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
33{\colortbl;\red255\green255\blue255;}
4−{\*\expandedcolortbl;;}
54\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
6−\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
5+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
76
8−\f0\fs28 \cf0 Thank you for trying out Elm!\
9−\
10−This installer makes
11−\f1 elm
12−\f0 available in your terminal.}
7+\f0\fs28 \cf0 This package will install Elm on your machine.}
installers/mac/helper-scripts/elm-startup.sh+1−1
@@ -1,3 +1,3 @@
11#!/bin/sh
22
3−open 'http://guide.elm-lang.org'
3+open 'http://elm-lang.org'
installers/mac/make-installer.sh+3−30
@@ -29,8 +29,7 @@ cp $(pwd)/preinstall $pkg_scripts
2929cp $(pwd)/postinstall $pkg_scripts
3030
3131pkgbuild \
32− --sign "Developer ID Installer: <NAME>" \
33− --identifier org.elm-lang.binary \
32+ --identifier org.elm-lang.binaries.pkg \
3433 --install-location $usr_binaries \
3534 --scripts $pkg_scripts \
3635 --filter 'Scripts.*' \
@@ -40,42 +39,16 @@ pkgbuild \
4039
4140#### BUNDLE ASSETS ####
4241
43−rm -f installer-for-mac.pkg
42+rm -f Elm.pkg
4443
4544productbuild \
46− --sign "Developer ID Installer: <NAME>" \
47− --identifier org.elm-lang.installer \
4845 --distribution Distribution.xml \
4946 --package-path . \
5047 --resources Resources \
51− installer-for-mac.pkg
48+ Elm.pkg
5249
5350
5451#### CLEAN UP ####
5552
5653rm binaries.pkg
5754rm -rf $pkg_root
58−
59−
60−#### BEGIN NOTARIZATION ####
61−
62−xcrun altool \
63− --notarize-app \
64− --primary-bundle-id "org.elm-lang.installer" \
65− --username "<EMAIL>" \
66− --password "@keychain:Developer-altool" \
67− --file "installer-for-mac.pkg"
68−
69−# From https://scriptingosx.com/2019/09/notarize-a-command-line-tool/
70−#
71−#### Check on notarization:
72−#
73−# xcrun altool \
74−# --notarization-info "<RequestUUID>" \
75−# --username "<EMAIL>" \
76−# --password "@keychain:Developer-altool"
77−#
78−#
79−#### Staple Notarization:
80−#
81−# xcrun stapler staple installer-for-mac.pkg
installers/npm/PUBLISHING.md+141−29
@@ -1,59 +1,171 @@
1−# Publishing
1+# Publishing a new release
22
3−Here's how to update the `npm` installer.
3+A new version of Elm came out. Huzzah! Here's how to update the `npm` installer.
44
5+## 1. Create tarballs of binaries
56
6−## 1. GitHub Release
7+You can find a list of what binaries we'll need to tar up in `index.js`.
78
8−Create a [GitHub Release](https://github.com/elm/compiler/releases) with the following files:
9+For example:
910
10−1. `binary-for-mac-64-bit.gz`
11−2. `binary-for-windows-64-bit.gz`
12−3. `binary-for-linux-64-bit.gz`
11+```javascript
12+var root =
13+ "https://github.com/elm/compiler/releases/download/" +
14+ binVersion +
15+ "/binaries-for-";
1316
14−Create each of these by running the `elm` executable for each platform through `gzip elm`.
17+module.exports = binwrap({
18+ binaries: ["elm"],
19+ urls: {
20+ "darwin-x64": root + "mac.tar.gz",
21+ "win32-x64": root + "windows.tar.gz",
22+ "win32-ia32": root + "windows.tar.gz",
23+ "linux-x64": root + "linux.tar.gz"
24+ }
25+});
26+```
27+
28+If this is the end of your `index.js`, you'll need to create these files:
1529
30+1. `binaries-for-mac.tar.gz`
31+2. `binaries-for-windows.tar.gz`
32+3. `binaries-for-linux.tar.gz`
1633
17−## 2. Try a beta release
34+Each of these tarballs should have **only the Elm binary** inside them - no
35+directories!
1836
19−In `package.json`, bump the version to `"0.19.2-beta"`.
37+So create them by making a directory, putting all the binaries in it, `cd`-ing
38+into that directory, and then running something like this:
2039
21−```bash
22−npm publish --tag beta
40+```shell
41+$ tar cvzf binaries-for-linux.tar.gz elm
2342```
2443
25−To test that it works, run these commands:
44+Make sure each tarball contains all the binaries listed in that `binaries:` list
45+in `index.js`. (The Windows ones should have `.exe` at the end; `binwrap`
46+expects that they will, for Windows only.)
47+
48+## 2. Update the `bin/` binary wrappers
49+
50+Inside the npm installer's `bin/` directory, there should be a file for each of
51+the binaries that will be included in this release.
52+
53+Each of these must be executable! If you're not sure whether they are,
54+run `chmod +x` on them just to be sure.
55+
56+Their paths must also must all be listed in `package.json` in two places:
57+
58+1. The `"files":` field
59+2. The `"bin":` field
60+
61+If the executables are the same as they were for the last release, great!
62+You can proceed to the next step. If any binaries were removed, make sure to
63+remove them from these lists!
64+
65+## 3. Update `package.json` for a beta release
66+
67+In `package.json`, bump the version to the next applicable release, and add
68+a `"-beta"` suffix to it.
69+
70+For example, if it was on `"0.18.0"` you might bump it to `"0.19.0-beta"`.
71+The version number should match the release of Elm, such that if people do
72+`npm install elm@0.19.0@beta` they get what they would expect.
73+
74+## 4. Tag the beta release
75+
76+Commit this change and tag it with the name of the release **without** the
77+`-beta` suffix. (We will overwrite this tag later.)
78+
79+For example:
2680
27−```bash
28−npm dist-tags ls elm
29−npm install elm@beta --ignore-scripts
81+```shell
82+$ git tag 0.19.0
83+$ git push origin 0.19.0
3084```
3185
32−The `latest` tag should not be changed, and there should be an additional `beta` tag.
86+Now this tag should exist on GitHub, allowing us to upload binaries to it.
3387
34−Try this on Windows, Linux, and Mac.
88+## 5. Upload binaries
3589
90+Visit the [Create a New Release](https://github.com/elm-lang/elm-platform/releases/new)
91+page and use the `Tag version` dropdown to select the tag you just pushed. Give
92+it a title like `0.19.0`. Don't mention the `-beta` in it. The "beta" concept
93+is for `npm` only.
3694
37−## 3. Publish final release
95+Upload the tarballs you created in step 1.
3896
39−Remove the `-beta` suffix from the version in `package.json`. Then run:
97+## 6. Publish beta release
4098
41−```bash
42−npm publish
99+Run this to publish the beta release. The `--tag beta` is **crucial** here.
100+Without it, `npm` will by default publish a new top-level release, which would
101+mean that what you just published would become what everyone gets when they
102+`npm install -g elm` without any additional qualifiers.
103+
104+```shell
105+$ npm publish --tag beta
43106```
44107
108+Afterwards you should be able to do `npm info elm | less` and see something
109+like this in the JSON:
110+
111+```
112+'dist-tags': { latest: '0.18.0', beta: '0.19.0-beta' }
113+```
45114
46−## 4. Tag the `latest-0.19.1` version
115+If you messed this up, and the `latest` tag now points to the beta you just
116+published, don't panic - it's fixable! `dist-tags` can always be modified after
117+the fact. Read up on `npm` [dist-tags](https://docs.npmjs.com/cli/dist-tag)
118+to learn how to fix things.
47119
48−Many compiler releases have needed multiple `npm` publications. Maybe something does not work on Windows or some dependency becomes insecure. Normal `npm` problems.
120+## 7. Verify beta installer
49121
50−The convention for each Elm release is to create a tag the latest one.
122+Make an empty directory and run `npm init` inside it.
51123
52−```bash
53−npm dist-tag add elm@0.19.1-3 latest-0.19.1
124+Then run this:
125+
126+```shell
127+$ npm install elm@beta --ignore-scripts
54128```
55129
56−That way people who want a specific version can point to `latest-0.19.1` or `latest-0.18.0` instead of knowing the particular names of all the various publications.
130+This should succeed with an exit code of `0`.
131+If it did, look in `node_modules/.bin/` for the binaries you expect.
132+They should be present, and they should also work as expected when you run them.
133+Because you installed them with `--ignore-scripts`, the first thing they should
134+do is to download themselves and then execute whatever command you requested
135+(e.g. `node_modules/.bin/elm make Main.elm`). If you run the same command a
136+second time, it should run faster because it doesn't have to download the binary
137+first.
138+
139+Now try it again with `--ignore-scripts` turned off:
140+
141+```shell
142+$ rm -r node_modules
143+$ npm install elm@beta --ignore-scripts=false
144+```
145+
146+This time it should download the binaries during the installation phase. Once
147+again you should be able to run the binaries from `node_modules/.bin/`, and
148+this time they should be fast from the first run because they're already
149+downloaded.
150+
151+## 8. Publish for real
152+
153+It's a good idea to ask others to try out the beta installer before doing this!
154+Especially on multiple operating systems.
155+
156+To publish the real version:
157+
158+1. Edit `package.json` to remove the `-beta` suffix from the version.
159+2. Commit that change and push it.
160+3. Use `git tag --force` to overwrite the previous tag (e.g. `0.19.0` - whatever you used before).
161+4. Force push the tag, e.g. `git push origin 0.19.0 --force-with-lease`.
162+5. `npm publish`
57163
58−You can read more about dist-tags [here](https://docs.npmjs.com/cli/dist-tag).
164+You're done! Now whenever anyone does `npm install -g elm` they'll get the
165+version you just uploaded.
59166
167+The reason we only used the `-beta` suffix for `npm` was so that when we ran
168+tests on the beta version, it was all against the same (non-beta) URLs we'd end
169+up using for the real version. This means there's no opportunity for us to
170+introduce some sort of mismatch between the beta that we verified and the real
171+version.
installers/npm/README.md+23−30
@@ -1,45 +1,38 @@
1−# Elm Installer
1+npm install elm [![Travis build Status](https://travis-ci.org/elm-lang/elm-platform.svg?branch=master)](http://travis-ci.org/elm-lang/elm-platform) [![AppVeyor build status](https://ci.appveyor.com/api/projects/status/6mcub79i04ianpm9/branch/master?svg=true)](https://ci.appveyor.com/project/rtfeldman/elm-platform/branch/master)
2+===============
23
3−[Elm](https://elm-lang.org) is a functional programming language that compiles to JavaScript.
4+Install the [Elm Platform](https://github.com/elm-lang/elm-platform) via [`npm`](https://www.npmjs.com).
45
5−Head over to [The Official Guide](https://guide.elm-lang.org/) to start learning Elm!
6+## Installing
67
8+Run this to get the binaries:
79
8−<br/>
9−
10−## What is this package for?
11−
12−**Normal installs** ❌
13−
14−Use the instructions [here](https://guide.elm-lang.org/install/elm.html) instead.
15−
16−**Multiple versions** ✅
17−
18−People using Elm at work may use different versions of Elm in different projects. They can run `npm install elm@latest-0.19.1` in each project and use the binary at `./node_modules/.bin/elm` for compilation.
19−
20−**Continuous integration** ⚠️
21−
22−This works, but there are usually faster and more reliable options:
23−
24−1. You can download `elm` directly from GitHub with [this script](https://github.com/elm/compiler/blob/master/installers/linux/README.md). This is all the `npm` installer does, but with extra HTTP requests to `npmjs.com` servers, making it slower and adding more failure points.
25−2. Many continuous integration have ways to cache files ([example](https://docs.travis-ci.com/user/caching/)) to make builds faster and more reliable.
26−
27−That said, it will definitely work to use the `npm` installer on CI if you prefer that option.
10+```
11+$ npm install -g elm
12+```
2813
14+## Installing behind a proxy server
2915
30−<br/>
16+If you are behind a proxy server, set the environment variable "HTTPS_PROXY".
3117
32−## Install Locally
18+```
19+$ export HTTPS_PROXY=$YourProxyServer$
20+$ npm install -g elm
21+```
3322
34−The following command should download the latest Elm 0.19.1 binary:
23+Or on Windows:
3524
3625```
37−npm install elm@latest-0.19.1
26+$ set HTTPS_PROXY=$YourProxyServer$
27+$ npm install -g elm
3828```
3929
40−You should be able to run `./node_modules/bin/elm --version` within your project and see `0.19.1`. Now you can compile with `./node_modules/bin/elm make src/Main.elm` and not disrupt other packages.
30+## Troubleshooting
4131
42−Use `npm install elm@latest-0.19.0` or `npm install elm@latest-0.18.0` for earlier versions.
32+1. [Troubleshooting npm](https://github.com/npm/npm/wiki/Troubleshooting)
33+2. On Debian/Ubuntu systems, you may have to install the nodejs-legacy package: `apt-get install nodejs-legacy`.
34+3. If the installer says that it cannot find any usable binaries for your operating system and architecture, check the [Build from Source](https://github.com/elm-lang/elm-platform/blob/master/README.md#build-from-source) documentation.
4335
44−**Note:** The `latest-X.Y.Z` convention is used in case we need to publish patches for the `npm` installer within a given Elm release. For example, say `npm` decides that some transitive dependency is not secure. Nothing is changing about Elm or the binaries, but we need to publish a new `npm` installer that fixes this issue.
36+## Getting Started
4537
38+Once everything has installed successfully, head over to the [Get Started](http://elm-lang.org/Get-Started.elm) page!
installers/npm/bin/elm+17−42
@@ -1,54 +1,29 @@
11#!/usr/bin/env node
22
33var child_process = require('child_process');
4−var path = require('path');
4+var download = require('../download.js');
55var fs = require('fs');
66
77
8−// Some npm users enable --ignore-scripts (a good security measure) so
9−// they do not run the post-install hook and install.js does not run.
10−// Instead they will run this script.
8+// Some npm users enable --ignore-scripts (a good security measure)
119//
12−// On Mac and Linux, we download the elm executable into the exact same
13−// location as this file. Since npm uses symlinks on these platforms,
14−// that means that the first run will invoke this file and subsequent
15−// runs will call the elm binary directly.
10+// They do not run the post-install hook, so install.js does not run.
1611//
17−// On Windows, we must download a file named elm.exe for it to run properly.
18−// Instead of symlinks, npm creates two files:
19−//
20−// - node_modules/.bin/elm (a bash file)
21−// - node_modules/.bin/elm.cmd (a batch file)
22−//
23−// Both files specifically invoke `node` to run the file listed at package.bin,
24−// so there is no way around instantiating node for no reason on Windows. So
25−// the existsSync check is needed so that it is not downloaded more than once.
12+// This file pretends to be the downloaded binary. It then downloads
13+// the real binary over itself. So in that case, the first run would
14+// also make an HTTPS request to fetch the real binary. From there,
15+// it calls the binary it downloaded on each run.
2616
2717
28−// figure out where to put the binary (calls path.resolve() to get path separators right on Windows)
29−//
30−var binaryPath = path.resolve(__dirname, 'elm') + (process.platform === 'win32' ? '.exe' : '');
31−
32−// Run the command directly if possible, otherwise download and then run.
33−// This check is important for Windows where this file will be run all the time.
34−//
35−if (process.platform === 'win32')
36−{
37− fs.existsSync(binaryPath)
38− ? runCommand()
39− : require('../download.js')(runCommand);
40−}
41−else
42−{
43− require('../download.js')(runCommand);
44−}
4518
19+// Make sure we get the right path even if we're executing from the symlinked
20+// node_modules/.bin/ executable
21+var pathToThisFile = fs.realpathSync(process.argv[1]);
4622
47−function runCommand()
48−{
49− // Need double quotes and { shell: true } when there are spaces in the path on windows:
50− // https://github.com/nodejs/node/issues/7367#issuecomment-229721296
51− child_process
52− .spawn('"' + binaryPath + '"', process.argv.slice(2), { stdio: 'inherit', shell: true })
53− .on('exit', process.exit);
54−}
23+download(pathToThisFile, function() {
24+ // Need double quotes and { shell: true } when there are spaces in the path on windows:
25+ // https://github.com/nodejs/node/issues/7367#issuecomment-229721296
26+ child_process
27+ .spawn('"' + pathToThisFile + '"', process.argv.slice(2), { stdio: 'inherit', shell: true })
28+ .on('exit', process.exit);
29+});
installers/npm/download.js+68−68
@@ -1,7 +1,7 @@
11var fs = require('fs');
22var package = require('./package.json');
3−var path = require('path');
4−var request = require('request');
3+var URL = require('url').URL;
4+var https = require('https');
55var zlib = require('zlib');
66
77
@@ -12,72 +12,88 @@ var zlib = require('zlib');
1212// called when --ignore-scripts is enabled. That's why install.js is so weird.
1313
1414
15−module.exports = function(callback)
15+module.exports = function(destinationPath, callback)
1616{
17− // figure out URL of binary
1817 var version = package.version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); // turn '1.2.3-alpha' into '1.2.3'
18+ var os = { 'darwin': 'mac', 'win32': 'windows', 'linux': 'linux' }[process.platform];
19+ var arch = { 'x64': '64-bit', 'ia32': '32-bit' }[process.arch];
20+ var path = process.platform === 'win32' ? destinationPath + '.exe' : destinationPath;
21+ var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + os + '-' + arch + '.gz';
1922
20− var platform = {
21− darwin_x64: 'mac-64-bit',
22− darwin_arm64: 'mac-64-bit',
23− win32_x64: 'windows-64-bit',
24− linux_x64: 'linux-64-bit'
25− }[process.platform + '_' + process.arch];
23+ // check if exists for bin/elm running for the Nth time on Windows
24+ fs.existsSync(path)
25+ ? callback()
26+ : download(path, url, callback);
27+};
2628
27− verifyPlatform(version, platform);
2829
29− var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + platform + '.gz';
3030
31− reportDownload(version, url);
31+// DOWNLOAD
3232
33− // figure out where to put the binary (calls path.resolve() to get path separators right on Windows)
34− var binaryPath = path.resolve(__dirname, package.bin.elm) + (process.platform === 'win32' ? '.exe' : '');
3533
36− // set up handler for request failure
37− function reportDownloadFailure(error)
38− {
39− exitFailure(url,'Something went wrong while fetching the following URL:\n\n' + url + '\n\nIt is saying:\n\n' + error);
40− }
41−
42− // set up decompression pipe
43− var gunzip = zlib.createGunzip().on('error', function(error) {
44− exitFailure(url, 'I ran into trouble decompressing the downloaded binary. It is saying:\n\n' + error);
45− });
46−
47− // set up file write pipe
48− var write = fs.createWriteStream(binaryPath, {
49− encoding: 'binary',
50− mode: 0o755
51− }).on('finish', callback).on('error', function(error) {
52− exitFailure(url, 'I had some trouble writing file to disk. It is saying:\n\n' + error);
53− });
54−
55− // put it all together
56− request(url).on('error', reportDownloadFailure).pipe(gunzip).pipe(write);
34+function download(destinationPath, url, callback)
35+{
36+ requestWithRedirects(url, 10,
37+ function(error) {
38+ exitFailure(url, 'I ran into trouble while fetching ' + url + '\n\n' + error);
39+ },
40+ function(response) {
41+ if (response.statusCode == 404)
42+ {
43+ exitFailure(url, 'I got a "404 Not Found" trying to download from the following URL:\n'
44+ + url
45+ + '\n\nThis may mean you are trying to install on an unsupported platform. (e.g. some 32-bit systems?)'
46+ );
47+ }
48+
49+ response.on('error', function() {
50+ exitFailure(url, 'Something went wrong while receiving the following URL:\n\n' + url);
51+ });
52+
53+ var gunzip = zlib.createGunzip().on('error', function(error) {
54+ exitFailure(url, 'I ran into trouble decompressing the downloaded binary. It is saying:\n\n' + error);
55+ });
56+ var write = fs.createWriteStream(destinationPath, {
57+ encoding: 'binary',
58+ mode: 0o755
59+ }).on('finish', callback).on('error', function(error) {
60+ exitFailure(url, 'I had some trouble writing file to disk. It is saying:\n\n' + error);
61+ });
62+
63+ response.pipe(gunzip).pipe(write);
64+ }
65+ );
5766}
5867
5968
6069
61−// VERIFY PLATFORM
70+// HANDLE REDIRECTS
6271
6372
64−function verifyPlatform(version, platform)
73+function requestWithRedirects(url, maxRedirects, failure, success)
6574{
66− if (platform) return;
75+ var req = https.request(url);
76+
77+ req.on('response', function(response) {
78+ // Check for redirects
79+
80+ var redirectUrl = new URL(response.headers['location'], new URL(url).origin).href;
81+
82+ if (typeof redirectUrl === 'string' && response.statusCode >= 300 && response.statusCode < 400)
83+ {
84+ return (maxRedirects <= 0)
85+ ? failure(new Error('followed 10 redirects and gave up'))
86+ : requestWithRedirects(redirectUrl, maxRedirects - 1, failure, success);
87+ }
88+ else
89+ {
90+ return success(response);
91+ }
92+ });
6793
68− var situation = process.platform + '_' + process.arch;
69− console.error(
70− '-- ERROR -----------------------------------------------------------------------\n\n'
71− + 'I am detecting that your computer (' + situation + ') may not be compatible with any\n'
72− + 'of the official pre-built binaries.\n\n'
73− + 'I recommend against using the npm installer for your situation. Check out the\n'
74− + 'alternative installers at https://github.com/elm/compiler/releases/tag/' + version + '\n'
75− + 'to see if there is something that will work better for you.\n\n'
76− + 'From there I recommend asking for guidance on Slack or Discourse to find someone\n'
77− + 'who can help with your specific situation.\n\n'
78− + '--------------------------------------------------------------------------------\n'
79− );
80− process.exit(1);
94+ req.on('error', failure);
95+
96+ req.end();
8197}
8298
8399
@@ -96,19 +112,3 @@ function exitFailure(url, message)
96112 );
97113 process.exit(1);
98114}
99−
100−
101−
102−// REPORT DOWNLOAD
103−
104−
105−function reportDownload(version, url)
106−{
107− console.log(
108− '--------------------------------------------------------------------------------\n\n'
109− + 'Downloading Elm ' + version + ' from GitHub.'
110− + '\n\nNOTE: You can avoid npm entirely by downloading directly from:\n'
111− + url + '\nAll this package does is download that file and put it somewhere.\n\n'
112− + '--------------------------------------------------------------------------------\n'
113− );
114−}
installers/npm/install.js+7−1
@@ -1,4 +1,10 @@
11
22var download = require('./download.js');
3+var package = require('./package.json');
4+var path = require('path');
35
4−download(function() {});
6+
7+// get slashes right for Windows
8+var targetPath = path.resolve(__dirname, Object.values(package.bin)[0]);
9+
10+download(targetPath, function() {});
installers/npm/package.json+7−6
@@ -1,6 +1,6 @@
11{
22 "name": "elm",
3− "version": "0.19.1-5",
3+ "version": "0.19.0-no-deps",
44 "description": "Installer for Elm: just downloads the binary into node_modules",
55 "preferGlobal": true,
66 "license": "BSD-3-Clause",
@@ -11,9 +11,9 @@
1111 "homepage": "https://github.com/elm/compiler/tree/master/installers/npm",
1212 "bugs": "https://github.com/elm/compiler/issues",
1313 "author": {
14− "name": "Evan Czaplicki",
15− "email": "evan@elm-lang.org",
16− "url": "https://github.com/evancz"
14+ "name": "Richard Feldman",
15+ "email": "richard.t.feldman@gmail.com",
16+ "url": "https://github.com/rtfeldman"
1717 },
1818 "engines": {
1919 "node": ">=7.0.0"
@@ -35,8 +35,9 @@
3535 "install",
3636 "installer"
3737 ],
38− "bin": { "elm": "bin/elm" },
38+ "bin": {
39+ "elm": "bin/elm"
40+ },
3941 "dependencies": {
40− "request": "^2.88.0"
4142 }
4243}
installers/npm/troubleshooting.mddeleted−76
@@ -1,76 +0,0 @@
1−# Troubleshooting
2−
3−I very highly recommend asking for help on [the Elm slack](https://elmlang.herokuapp.com).
4−
5−There are a lot of things that can go wrong when installing software, and it can really help to have a second pair of eyes on your situation!
6−
7−This document goes through a couple options that may help you out.
8−
9−<br/>
10−
11−
12−## Can you skip npm entirely?
13−
14−The most reliable way to get Elm installed using the official installers for Mac and Windows [here][download].
15−
16−You can also download the binaries directly. On Linux, you could do it in the terminal like this:
17−
18−```bash
19−cd ~/Desktop/
20−curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
21−gunzip elm.gz # unzip the file
22−chmod +x elm # make the file executable
23−sudo mv elm /usr/local/bin/ # put the executable in a directory likely to be listed in your PATH variable
24−```
25−
26−If these exact commands do not work for you, you can try to do the same thing by hand.
27−
28−Read the section below on `PATH` variables if you are not sure what that is!
29−
30−[download]: https://github.com/elm/compiler/releases/tag/0.19.1
31−
32−<br/>
33−
34−
35−## Do you need to use npm for some reason?
36−
37−The company running npm has a list of common troubleshooting situations [here](https://npm.community/c/support/troubleshooting), but it may be better to just try to find your specific case on Stack Overflow. Often there are permissions issues where you may need to use `sudo` with some command.
38−
39−### Firewalls
40−
41−Some companies have a firewall.
42−
43−These companies usually have set the `HTTP_PROXY` or `HTTPS_PROXY` environment variable on your computer. This is more common with Windows computers.
44−
45−The result is that the request for `https://github.com/elm/compiler/releases/download/0.19.1/binary-for-windows-64-bit.gz` is being sent to a "proxy server" where they monitor traffic. Maybe they rule out certain domains, maybe they check data when it comes back from the actual URL, etc.
46−
47−It is probably best to ask someone about the situation on this, but you can test things out by temporarily using an alternate `HTTPS_PROXY` value with something like this:
48−
49−```
50−# Mac and Linux
51−HTTPS_PROXY=http://proxy.example.com npm install -g elm
52−
53−# Windows
54−set HTTPS_PROXY=http://proxy.example.com
55−npm install -g elm
56−```
57−
58−Check out [this document](https://www.npmjs.com/package/request#controlling-proxy-behaviour-using-environment-variables) for more information on how environment variables like `NO_PROXY`, `HTTP_PROXY`, and `HTTPS_PROXY` are handled by the npm.
59−
60−<br/>
61−
62−
63−## Do you know what a `PATH` variable is?
64−
65−When you run a command like `elm make src/Main.elm`, your computer starts by trying to find a file called `elm`.
66−
67−The `PATH` is a list of directories to search within. On Mac and Linux, you can see these directories by running:
68−
69−```
70−$ echo $PATH
71−/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin
72−```
73−
74−The are separated by `:` for some reason. So running `elm make src/Main.elm` starts by searching the `PATH` for files named `elm`. On my computer, it finds `/usr/local/bin/elm` and then can actually run the command.
75−
76−Is `elm` in one of the directories listed in your `PATH` variable? I recommend asking for help if you are in this scenario and unsure how to proceed.
installers/win/Nsisfile.nsi+15−15
@@ -75,7 +75,7 @@ Function un.onInit
7575FunctionEnd
7676
7777Function LaunchLink
78− ExecShell "open" "https://guide.elm-lang.org"
78+ ExecShell "open" "https://elm-lang.org/get-started"
7979FunctionEnd
8080
8181;--------------------------------
@@ -135,20 +135,20 @@ SectionEnd
135135
136136SectionGroup "Update system settings" SecGr
137137
138−;Section "Associate with .elm files" SecAssoc
139−;
140−; SectionIn 1
141−;
142−; ; File associations
143−; WriteRegStr HKCR ".elm" "" "elm"
144−; WriteRegStr HKCR "elm" "" "Elm Source File"
145−; WriteRegStr HKCR "elm\DefaultIcon" "" "$INSTDIR\file.ico"
146−; WriteRegStr HKCR "elm\shell\open\command" "" '"$INSTDIR\bin\elm.exe" "%1"'
147−;
148−; ;Remember that we registered associations
149−; WriteRegDWORD HKLM "${PRODUCT_DIR_REG_KEY}" Assocs 0x1
150−;
151−;SectionEnd
138+Section "Associate with .elm files" SecAssoc
139+
140+ SectionIn 1
141+
142+ ; File associations
143+ WriteRegStr HKCR ".elm" "" "elm"
144+ WriteRegStr HKCR "elm" "" "Elm Source File"
145+ WriteRegStr HKCR "elm\DefaultIcon" "" "$INSTDIR\file.ico"
146+ ;WriteRegStr HKCR "elm\shell\open\command" "" '"$INSTDIR\bin\elm.exe" "%1"'
147+
148+ ;Remember that we registered associations
149+ WriteRegDWORD HKLM "${PRODUCT_DIR_REG_KEY}" Assocs 0x1
150+
151+SectionEnd
152152
153153Section "Update the PATH environment variable" SecPath
154154
installers/win/README.md+3−18
@@ -1,24 +1,9 @@
1−# Installing on Windows
2−
3−The installer for Windows is available [here](https://guide.elm-lang.org/install.html).
4−
5−
6−<br/>
7−
8−## Uninstall
9−
10−First run the `C:\Program Files (x86)\Elm\0.19\uninstall.exe` file. This will remove Elm stuff from your `PATH`.
11−
12−Then remove the whole `C:\Users\<username>\AppData\Roaming\elm` directory. Elm caches some packages and build artifacts to reduce compile times and to help you work offline. Getting rid of this directory will clear that information out!
13−
14−<br/>
15−
16−## Building the Windows installer
1+# Building Windows installer
172
183You will need the [NSIS installer](http://nsis.sourceforge.net/Download) to be installed.
194
205Once everything is installed, run something like this command:
216
22− make_installer.cmd 0.19.0
7+ make_installer.cmd 0.19
238
24−It will build an installer called `Elm-0.19.0-setup.exe`.
9+It will build an installer called `Elm-0.19-setup.exe`.
installers/win/file.iconew file

Binary file not shown.

installers/win/inst.dat+2−1
@@ -2,5 +2,6 @@ SetOutPath "$INSTDIR\bin"
22File "${FILES_SOURCE_PATH}\bin\elm.exe"
33
44SetOutPath "$INSTDIR"
5+File "file.ico"
56File "updatepath.vbs"
6−File "removefrompath.vbs"
7+File "removefrompath.vbs"
installers/win/logo.ico

Binary file not shown.

installers/win/uninst.dat+2−1
@@ -1,6 +1,7 @@
11Delete "$INSTDIR\bin\elm.exe"
22RmDir "$INSTDIR\bin"
33
4+Delete "$INSTDIR\file.ico"
45Delete "$INSTDIR\updatepath.vbs"
56Delete "$INSTDIR\removefrompath.vbs"
6−RmDir "$INSTDIR"
7+RmDir "$INSTDIR"
installers/win/welcome.bmp

Binary file not shown.

roadmap.mddeleted−29
@@ -1,29 +0,0 @@
1−# Roadmap
2−
3−If you like what you see now, that's pretty much what Elm is going to be for a while.
4−
5−I'm currently doing some exploratory work with compiler techniques and targets, but it is still too early to tell which parts of that might work out. I know many readers take "exploring X" as a promise that "X will definitely happen", so I want to be careful in setting expectations low since there is still so much uncertainty in the work. So while there is no real news to share at this point, I can give some expectations about future stability of Elm:
6−
7−**If this exploratory work goes well**, even in the wildest version of success, I wouldn't expect the language or core packages to change very much. Maybe two or three years down the line it could reveal something that'd be good to fix up, but I don't really foresee notable changes right now.
8−
9−**If this exploratory work does not work out**, I have some more conservative projects that are good ideas that I want to circle back to at some point. Things like:
10−
11−- add a constrained type variable `eq` to get rid of the runtime error for `(==)` on functions
12−- try to integrate `elm test` so it can run only tests that changed
13−- try to get `elm format` using the latest parsing infrastructure so it's not a perf bottleneck during development anymore
14−- do another round on perf because I have one last idea that can squeeze out a bit more speed
15−
16−These are all nice quality of life things, but with 0.19.0 and 0.19.1 taking so long, I got pretty burnt out on "incremental improvements that are good ideas, but take a very long time and aren't very exciting to non-Elm users." Without getting too into the details, I really needed to change things up before returning to these particular ideas.
17−
18−If someone has a security issue from the compiler or core libraries, please DM me about it on the Elm Slack. Outside of security issues, I think capacity for more discretionary changes will increase once the lessons from the compiler explorations become more clear. Hopefully the discussion [here](https://discourse.elm-lang.org/t/costs-funding-in-open-source-languages/5722) clarifies the thinking on these capacity questions a bit.
19−
20−<br>
21−<br>
22−
23−**Taking a step back**, I have found that working in this looser style has produced a high baseline of quality, and I think that is an important part of Elm. For example, all the error message work in Elm began as a project to implement the `--report=json` flag. That work happened to reveal some cool ideas on improving error messages, and if I had been using a rigid roadmap, I might have skipped those ideas to meet the publicly-stated arbitrary deadline. We'd have a clearer roadmap, but error messages no different than other type-inferred languages.
24−
25−So I think having more flexibility in planning is a competitive advantage for Elm in certain ways, but it is obviously a trade off that does not work for everyone. If someone needs more certainty, I generally recommend looking into other languages to see if they have a balance that works better for their needs. For example, languages made by big corporations are generally "less risky" on things like this, but I think you see the fruits of that kind of process in the design decisions as well. Trade offs!
26−
27−Anyway, like I said at the beginning, if you like what you see now, that's what it's going to be for a while. Even in the best case scenario with my current explorations!
28−
29−I hope this is helpful information, and I hope you have a good experience with Elm, even if you ultimately find a different language that works better for you!
terminal/src/Develop.hs+2−2
@@ -159,9 +159,9 @@ compile path =
159159 Just root ->
160160 BW.withScope $ \scope -> Stuff.withRootLock root $ Task.run $
161161 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
162− artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromPaths Reporting.silent root details (NE.List path [])
162+ artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromMains Reporting.silent root details (NE.List path [])
163163 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.dev root details artifacts
164− let (NE.List name _) = Build.getRootNames artifacts
164+ let (NE.List name _) = Build.getMainNames artifacts
165165 return $ Html.sandwich name javascript
166166
167167
terminal/src/Develop/StaticFiles/Build.hs+3−3
@@ -42,13 +42,13 @@ buildReactorFrontEnd =
4242 do root <- Dir.getCurrentDirectory
4343 runTaskUnsafe $
4444 do details <- Task.eio Exit.ReactorBadDetails $ Details.load Reporting.silent scope root
45− artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromPaths Reporting.silent root details paths
45+ artifacts <- Task.eio Exit.ReactorBadBuild $ Build.fromMains Reporting.silent root details mains
4646 javascript <- Task.mapError Exit.ReactorBadGenerate $ Generate.prod root details artifacts
4747 return (LBS.toStrict (B.toLazyByteString javascript))
4848
4949
50−paths :: NE.List FilePath
51−paths =
50+mains :: NE.List FilePath
51+mains =
5252 NE.List
5353 ("src" </> "NotFound.elm")
5454 [ "src" </> "Errors.elm"
terminal/src/Init.hs+1−1
@@ -90,7 +90,7 @@ init =
9090 in
9191 do Dir.createDirectoryIfMissing True "src"
9292 Outline.write "." $ Outline.App $
93− Outline.AppOutline V.compiler (NE.List (Outline.RelativeSrcDir "src") []) directs indirects Map.empty Map.empty
93+ Outline.AppOutline V.compiler (NE.List "src" []) directs indirects Map.empty Map.empty
9494 putStrLn "Okay, I created it. Now read that link!"
9595 return (Right ())
9696
terminal/src/Main.hs+19−19
@@ -12,8 +12,8 @@ import Text.PrettyPrint.ANSI.Leijen ((<>))
1212import Text.Read (readMaybe)
1313
1414import qualified Elm.Version as V
15−import Terminal
16−import Terminal.Helpers
15+import Terminal.Args
16+import Terminal.Args.Helpers
1717
1818import qualified Bump
1919import qualified Develop
@@ -31,7 +31,7 @@ import qualified Repl
3131
3232main :: IO ()
3333main =
34− Terminal.app intro outro
34+ complex intro outro
3535 [ repl
3636 , init
3737 , reactor
@@ -72,7 +72,7 @@ outro =
7272-- INIT
7373
7474
75−init :: Terminal.Command
75+init :: Interface
7676init =
7777 let
7878 summary =
@@ -87,14 +87,14 @@ init =
8787 "It will ask permission to create an elm.json file, the one thing common\
8888 \ to all Elm projects. It also provides a link explaining what to do from there."
8989 in
90− Terminal.Command "init" (Common summary) details example noArgs noFlags Init.run
90+ Interface "init" (Common summary) details example noArgs noFlags Init.run
9191
9292
9393
9494-- REPL
9595
9696
97−repl :: Terminal.Command
97+repl :: Interface
9898repl =
9999 let
100100 summary =
@@ -115,7 +115,7 @@ repl =
115115 |-- flag "interpreter" interpreter "Path to a alternate JS interpreter, like node or nodejs."
116116 |-- onOff "no-colors" "Turn off the colors in the REPL. This can help if you are having trouble reading the values. Some terminals use a custom color scheme that diverges significantly from the standard ANSI colors, so another path may be to pick a more standard color scheme."
117117 in
118− Terminal.Command "repl" (Common summary) details example noArgs replFlags Repl.run
118+ Interface "repl" (Common summary) details example noArgs replFlags Repl.run
119119
120120
121121interpreter :: Parser String
@@ -133,7 +133,7 @@ interpreter =
133133-- REACTOR
134134
135135
136−reactor :: Terminal.Command
136+reactor :: Interface
137137reactor =
138138 let
139139 summary =
@@ -154,7 +154,7 @@ reactor =
154154 flags Develop.Flags
155155 |-- flag "port" port_ "The port of the server (default: 8000)"
156156 in
157− Terminal.Command "reactor" (Common summary) details example noArgs reactorFlags Develop.run
157+ Interface "reactor" (Common summary) details example noArgs reactorFlags Develop.run
158158
159159
160160port_ :: Parser Int
@@ -172,7 +172,7 @@ port_ =
172172-- MAKE
173173
174174
175−make :: Terminal.Command
175+make :: Interface
176176make =
177177 let
178178 details =
@@ -196,14 +196,14 @@ make =
196196 |-- flag "report" Make.reportType "You can say --report=json to get error messages as JSON. This is only really useful if you are an editor plugin. Humans should avoid it!"
197197 |-- flag "docs" Make.docsFile "Generate a JSON file of documentation for a package. Eventually it will be possible to preview docs with `reactor` because it is quite hard to deal with these JSON files directly."
198198 in
199− Terminal.Command "make" Uncommon details example (zeroOrMore elmFile) makeFlags Make.run
199+ Interface "make" Uncommon details example (zeroOrMore elmFile) makeFlags Make.run
200200
201201
202202
203203-- INSTALL
204204
205205
206−install :: Terminal.Command
206+install :: Interface
207207install =
208208 let
209209 details =
@@ -232,14 +232,14 @@ install =
232232 , require1 Install.Install package
233233 ]
234234 in
235− Terminal.Command "install" Uncommon details example installArgs noFlags Install.run
235+ Interface "install" Uncommon details example installArgs noFlags Install.run
236236
237237
238238
239239-- PUBLISH
240240
241241
242−publish :: Terminal.Command
242+publish :: Interface
243243publish =
244244 let
245245 details =
@@ -269,14 +269,14 @@ publish =
269269 "Check out <https://package.elm-lang.org/help/design-guidelines> for guidance on how to create great packages!"
270270 ]
271271 in
272− Terminal.Command "publish" Uncommon details example noArgs noFlags Publish.run
272+ Interface "publish" Uncommon details example noArgs noFlags Publish.run
273273
274274
275275
276276-- BUMP
277277
278278
279−bump :: Terminal.Command
279+bump :: Interface
280280bump =
281281 let
282282 details =
@@ -289,14 +289,14 @@ bump =
289289 \ it is a MAJOR change, and bump your version number to 2.0.0. I do this with\
290290 \ all packages, so there cannot be MAJOR changes hiding in PATCH releases in Elm!"
291291 in
292− Terminal.Command "bump" Uncommon details example noArgs noFlags Bump.run
292+ Interface "bump" Uncommon details example noArgs noFlags Bump.run
293293
294294
295295
296296-- DIFF
297297
298298
299−diff :: Terminal.Command
299+diff :: Interface
300300diff =
301301 let
302302 details =
@@ -321,7 +321,7 @@ diff =
321321 , require3 Diff.GlobalInquiry package version version
322322 ]
323323 in
324− Terminal.Command "diff" Uncommon details example diffArgs noFlags Diff.run
324+ Interface "diff" Uncommon details example diffArgs noFlags Diff.run
325325
326326
327327
terminal/src/Make.hs+16−16
@@ -29,7 +29,7 @@ import qualified Reporting
2929import qualified Reporting.Exit as Exit
3030import qualified Reporting.Task as Task
3131import qualified Stuff
32−import Terminal (Parser(..))
32+import Terminal.Args (Parser(..))
3333
3434
3535
@@ -107,7 +107,7 @@ runHelp root paths style (Flags debug optimize maybeOutput _ maybeDocs) =
107107 case getNoMains artifacts of
108108 [] ->
109109 do builder <- toBuilder root details desiredMode artifacts
110− generate style target builder (Build.getRootNames artifacts)
110+ generate style target builder (Build.getMainNames artifacts)
111111
112112 name:names ->
113113 Task.throw (Exit.MakeNonMainFilesIntoJavaScript name names)
@@ -166,7 +166,7 @@ buildExposed style root details maybeDocs exposed =
166166buildPaths :: Reporting.Style -> FilePath -> Details.Details -> NE.List FilePath -> Task Build.Artifacts
167167buildPaths style root details paths =
168168 Task.eio Exit.MakeCannotBuild $
169− Build.fromPaths style root details paths
169+ Build.fromMains style root details paths
170170
171171
172172
@@ -174,13 +174,13 @@ buildPaths style root details paths =
174174
175175
176176getMains :: Build.Artifacts -> [ModuleName.Raw]
177−getMains (Build.Artifacts _ _ roots modules) =
178− Maybe.mapMaybe (getMain modules) (NE.toList roots)
177+getMains (Build.Artifacts _ _ mains modules) =
178+ Maybe.mapMaybe (getMain modules) (NE.toList mains)
179179
180180
181−getMain :: [Build.Module] -> Build.Root -> Maybe ModuleName.Raw
182−getMain modules root =
183− case root of
181+getMain :: [Build.Module] -> Build.Main -> Maybe ModuleName.Raw
182+getMain modules main =
183+ case main of
184184 Build.Inside name ->
185185 if any (isMain name) modules
186186 then Just name
@@ -207,9 +207,9 @@ isMain targetName modul =
207207
208208
209209hasOneMain :: Build.Artifacts -> Task ModuleName.Raw
210−hasOneMain (Build.Artifacts _ _ roots modules) =
211− case roots of
212− NE.List root [] -> Task.mio Exit.MakeNoMain (return $ getMain modules root)
210+hasOneMain (Build.Artifacts _ _ mains modules) =
211+ case mains of
212+ NE.List main [] -> Task.mio Exit.MakeNoMain (return $ getMain modules main)
213213 NE.List _ (_:_) -> Task.throw Exit.MakeMultipleFilesIntoHtml
214214
215215
@@ -218,13 +218,13 @@ hasOneMain (Build.Artifacts _ _ roots modules) =
218218
219219
220220getNoMains :: Build.Artifacts -> [ModuleName.Raw]
221−getNoMains (Build.Artifacts _ _ roots modules) =
222− Maybe.mapMaybe (getNoMain modules) (NE.toList roots)
221+getNoMains (Build.Artifacts _ _ mains modules) =
222+ Maybe.mapMaybe (getNoMain modules) (NE.toList mains)
223223
224224
225−getNoMain :: [Build.Module] -> Build.Root -> Maybe ModuleName.Raw
226−getNoMain modules root =
227− case root of
225+getNoMain :: [Build.Module] -> Build.Main -> Maybe ModuleName.Raw
226+getNoMain modules main =
227+ case main of
228228 Build.Inside name ->
229229 if any (isMain name) modules
230230 then Nothing
terminal/src/Publish.hs+5
@@ -380,6 +380,11 @@ verifyBump (Env _ cache manager _ _) pkg vsn newDocs knownVersions@(Registry.Kno
380380
381381register :: Http.Manager -> Pkg.Name -> V.Version -> Docs.Documentation -> String -> Http.Sha -> Task.Task Exit.Publish ()
382382register manager pkg vsn docs commitHash sha =
383+ if True then
384+ Task.io $ putStrLn $
385+ "Publishing is disabled in the 0.19.1-beta-1 release.\n\
386+ \Publish with 0.19.0 for now.\n"
387+ else
383388 let
384389 url =
385390 Website.route "/register"
terminal/src/Repl.hs+3−30
@@ -3,16 +3,6 @@
33module Repl
44 ( Flags(..)
55 , run
6− --
7− , Lines(..)
8− , Input(..)
9− , Prefill(..)
10− , CategorizedInput(..)
11− , categorize
12− --
13− , State(..)
14− , Output(..)
15− , toByteString
166 )
177 where
188
@@ -179,9 +169,9 @@ read =
179169 Nothing ->
180170 return Exit
181171
182− Just chars ->
172+ Just line ->
183173 let
184− lines = Lines (stripLegacyBackslash chars) []
174+ lines = Lines line []
185175 in
186176 case categorize lines of
187177 Done input -> return input
@@ -197,30 +187,13 @@ readMore previousLines prefill =
197187
198188 Just chars ->
199189 let
200− lines = addLine (stripLegacyBackslash chars) previousLines
190+ lines = addLine chars previousLines
201191 in
202192 case categorize lines of
203193 Done input -> return input
204194 Continue p -> readMore lines p
205195
206196
207−-- For compatibility with 0.19.0 such that readers of "Programming Elm" by @jfairbank
208−-- can get through the REPL section successfully.
209−--
210−-- TODO: remove stripLegacyBackslash in next MAJOR release
211−--
212−stripLegacyBackslash :: [Char] -> [Char]
213−stripLegacyBackslash chars =
214− case chars of
215− [] ->
216− []
217−
218− _:_ ->
219− if last chars == '\\'
220− then init chars
221− else chars
222−
223−
224197data Prefill
225198 = Indent
226199 | DefStart N.Name
terminal/impl/Terminal.hs → terminal/src/Terminal/Args.hsrenamed+27−30
@@ -1,7 +1,8 @@
1−module Terminal
2− ( app
3− , Command(..)
1+module Terminal.Args
2+ ( simple
3+ , Interface(..)
44 , Summary(..)
5+ , complex
56 , Flags, noFlags, flags, (|--)
67 , Flag, flag, onOff
78 , Parser(..)
@@ -25,22 +26,22 @@ import qualified Text.PrettyPrint.ANSI.Leijen as P
2526import qualified Text.Read as Read
2627
2728import qualified Elm.Version as V
28−import Terminal.Internal
29−import qualified Terminal.Chomp as Chomp
30−import qualified Terminal.Error as Error
29+import Terminal.Args.Internal
30+import qualified Terminal.Args.Chomp as Chomp
31+import qualified Terminal.Args.Error as Error
3132
3233
3334
34−-- COMMAND
35+-- GET
3536
3637
37−_command :: String -> P.Doc -> Args args -> Flags flags -> (args -> flags -> IO ()) -> IO ()
38−_command details example args_ flags_ callback =
38+simple :: String -> P.Doc -> Args args -> Flags flags -> (args -> flags -> IO ()) -> IO ()
39+simple details example args_ flags_ callback =
3940 do setLocaleEncoding utf8
4041 argStrings <- Env.getArgs
4142 case argStrings of
4243 ["--version"] ->
43− do hPutStrLn stdout (V.toChars V.compiler)
44+ do hPutStrLn stdout (V.toChars V.compiler ++ "-beta-1")
4445 Exit.exitSuccess
4546
4647 chunks ->
@@ -56,38 +57,34 @@ _command details example args_ flags_ callback =
5657 Error.exitWithError err
5758
5859
59−
60−-- APP
61−
62−
63−app :: P.Doc -> P.Doc -> [Command] -> IO ()
64−app intro outro commands =
60+complex :: P.Doc -> P.Doc -> [Interface] -> IO ()
61+complex intro outro interfaces =
6562 do setLocaleEncoding utf8
6663 argStrings <- Env.getArgs
6764 case argStrings of
6865 [] ->
69− Error.exitWithOverview intro outro commands
66+ Error.exitWithOverview intro outro interfaces
7067
7168 ["--help"] ->
72− Error.exitWithOverview intro outro commands
69+ Error.exitWithOverview intro outro interfaces
7370
7471 ["--version"] ->
75− do hPutStrLn stdout (V.toChars V.compiler)
72+ do hPutStrLn stdout (V.toChars V.compiler ++ "-beta-1")
7673 Exit.exitSuccess
7774
7875 command : chunks ->
79− do case List.find (\cmd -> toName cmd == command) commands of
76+ do case List.find (\iface -> toName iface == command) interfaces of
8077 Nothing ->
81− Error.exitWithUnknown command (map toName commands)
78+ Error.exitWithUnknown command (map toName interfaces)
8279
83− Just (Command _ _ details example args_ flags_ callback) ->
80+ Just (Interface _ _ details example args_ flags_ callback) ->
8481 if elem "--help" chunks then
8582 Error.exitWithHelp (Just command) details example args_ flags_
8683
8784 else
8885 case snd $ Chomp.chomp Nothing chunks args_ flags_ of
89− Right (argsValue, flagsValue) ->
90− callback argsValue flagsValue
86+ Right (argsValue, flagValue) ->
87+ callback argsValue flagValue
9188
9289 Left err ->
9390 Error.exitWithError err
@@ -162,21 +159,21 @@ findIndex index point chunks =
162159 findIndex (index + 1) point cs
163160
164161
165−_complexSuggest :: [Command] -> Int -> [String] -> IO [String]
166−_complexSuggest commands index strings =
162+_complexSuggest :: [Interface] -> Int -> [String] -> IO [String]
163+_complexSuggest interfaces index strings =
167164 case strings of
168165 [] ->
169− return (map toName commands)
166+ return (map toName interfaces)
170167
171168 command : chunks ->
172169 if index == 1 then
173− return (filter (List.isPrefixOf command) (map toName commands))
170+ return (filter (List.isPrefixOf command) (map toName interfaces))
174171 else
175− case List.find (\cmd -> toName cmd == command) commands of
172+ case List.find (\iface -> toName iface == command) interfaces of
176173 Nothing ->
177174 return []
178175
179− Just (Command _ _ _ _ args_ flags_ _) ->
176+ Just (Interface _ _ _ _ args_ flags_ _) ->
180177 fst $ Chomp.chomp (Just (index-1)) chunks args_ flags_
181178
182179
terminal/impl/Terminal/Chomp.hs → terminal/src/Terminal/Args/Chomp.hsrenamed+5−4
@@ -1,5 +1,6 @@
1−{-# LANGUAGE GADTs, Rank2Types #-}
2−module Terminal.Chomp
1+{-# LANGUAGE GADTs #-}
2+{-# LANGUAGE Rank2Types #-}
3+module Terminal.Args.Chomp
34 ( chomp
45 )
56 where
@@ -7,8 +8,8 @@ module Terminal.Chomp
78
89import qualified Data.List as List
910
10−import Terminal.Error
11−import Terminal.Internal
11+import Terminal.Args.Error
12+import Terminal.Args.Internal
1213
1314
1415
terminal/impl/Terminal/Error.hs → terminal/src/Terminal/Args/Error.hsrenamed+13−12
@@ -1,5 +1,6 @@
1−{-# LANGUAGE GADTs, OverloadedStrings #-}
2−module Terminal.Error
1+{-# LANGUAGE GADTs #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+module Terminal.Args.Error
34 ( Error(..)
45 , ArgError(..)
56 , FlagError(..)
@@ -23,7 +24,7 @@ import System.IO (hPutStrLn, stderr)
2324import qualified Text.PrettyPrint.ANSI.Leijen as P
2425
2526import Reporting.Suggest as Suggest
26−import Terminal.Internal
27+import Terminal.Args.Internal
2728
2829
2930
@@ -186,22 +187,22 @@ flagsToDocs flags docs =
186187-- OVERVIEW
187188
188189
189−exitWithOverview :: P.Doc -> P.Doc -> [Command] -> IO a
190−exitWithOverview intro outro commands =
190+exitWithOverview :: P.Doc -> P.Doc -> [Interface] -> IO a
191+exitWithOverview intro outro interfaces =
191192 do exeName <- getExeName
192193 exitSuccess
193194 [ intro
194195 , "The most common commands are:"
195− , P.indent 4 $ stack $ Maybe.mapMaybe (toSummary exeName) commands
196+ , P.indent 4 $ stack $ Maybe.mapMaybe (toSummary exeName) interfaces
196197 , "There are a bunch of other commands as well though. Here is a full list:"
197− , P.indent 4 $ P.dullcyan $ toCommandList exeName commands
198+ , P.indent 4 $ P.dullcyan $ toCommandList exeName interfaces
198199 , "Adding the --help flag gives a bunch of additional details about each one."
199200 , outro
200201 ]
201202
202203
203−toSummary :: String -> Command -> Maybe P.Doc
204−toSummary exeName (Command name summary _ _ (Args args) _ _) =
204+toSummary :: String -> Interface -> Maybe P.Doc
205+toSummary exeName (Interface name summary _ _ (Args args) _ _) =
205206 case summary of
206207 Uncommon ->
207208 Nothing
@@ -214,10 +215,10 @@ toSummary exeName (Command name summary _ _ (Args args) _ _) =
214215 ]
215216
216217
217−toCommandList :: String -> [Command] -> P.Doc
218−toCommandList exeName commands =
218+toCommandList :: String -> [Interface] -> P.Doc
219+toCommandList exeName interfaces =
219220 let
220− names = map toName commands
221+ names = map toName interfaces
221222 width = maximum (map length names)
222223
223224 toExample name =
terminal/impl/Terminal/Helpers.hs → terminal/src/Terminal/Args/Helpers.hsrenamed+2−2
@@ -1,5 +1,5 @@
11{-# LANGUAGE OverloadedStrings #-}
2−module Terminal.Helpers
2+module Terminal.Args.Helpers
33 ( version
44 , elmFile
55 , package
@@ -14,7 +14,7 @@ import qualified Data.Map as Map
1414import qualified Data.Utf8 as Utf8
1515import qualified System.FilePath as FP
1616
17−import Terminal (Parser(..))
17+import Terminal.Args (Parser(..))
1818import qualified Deps.Registry as Registry
1919import qualified Elm.Package as Pkg
2020import qualified Elm.Version as V
terminal/impl/Terminal/Internal.hs → terminal/src/Terminal/Args/Internal.hsrenamed+8−8
@@ -1,6 +1,6 @@
11{-# LANGUAGE GADTs #-}
2−module Terminal.Internal
3− ( Command(..)
2+module Terminal.Args.Internal
3+ ( Interface(..)
44 , toName
55 , Summary(..)
66 , Flags(..)
@@ -17,11 +17,11 @@ import Text.PrettyPrint.ANSI.Leijen (Doc)
1717
1818
1919
20−-- COMMAND
20+-- INTERFACE
2121
2222
23−data Command where
24− Command
23+data Interface where
24+ Interface
2525 :: String
2626 -> Summary
2727 -> String
@@ -29,11 +29,11 @@ data Command where
2929 -> Args args
3030 -> Flags flags
3131 -> (args -> flags -> IO ())
32− -> Command
32+ -> Interface
3333
3434
35−toName :: Command -> String
36−toName (Command name _ _ _ _ _ _) =
35+toName :: Interface -> String
36+toName (Interface name _ _ _ _ _ _) =
3737 name
3838
3939
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−13
@@ -43,18 +43,11 @@ Executable worker
4343 src
4444 ../compiler/src
4545 ../builder/src
46− ../terminal/src
4746
4847 Main-Is:
4948 Main.hs
5049
5150 other-modules:
52− Artifacts
53− Cors
54− Endpoint.Compile
55− Endpoint.Quotes
56− Endpoint.Repl
57−
5851 AST.Canonical
5952 AST.Optimized
6053 AST.Source
@@ -134,7 +127,6 @@ Executable worker
134127 Parse.Type
135128 Parse.Variable
136129 Paths_elm
137− Repl
138130 Reporting
139131 Reporting.Annotation
140132 Reporting.Doc
@@ -170,11 +162,9 @@ Executable worker
170162 Type.UnionFind
171163
172164 Build-depends:
173− aeson,
174165 ansi-terminal >= 0.8 && < 0.9,
175166 ansi-wl-pprint >= 0.6.8 && < 0.7,
176167 base >=4.11 && <5,
177− base64-bytestring,
178168 binary >= 0.8 && < 0.9,
179169 bytestring >= 0.9 && < 0.11,
180170 containers >= 0.5.8.2 && < 0.6,
@@ -183,7 +173,6 @@ Executable worker
183173 filelock,
184174 filepath >= 1 && < 2.0,
185175 ghc-prim >= 0.5.2,
186− haskeline,
187176 HTTP >= 4000.2.5 && < 4000.4,
188177 http-client >= 0.6 && < 0.7,
189178 http-client-tls >= 0.3 && < 0.4,
@@ -194,8 +183,6 @@ Executable worker
194183 network >= 2.4 && < 2.7,
195184 network-uri,
196185 parsec,
197− process,
198− random,
199186 raw-strings-qq,
200187 scientific,
201188 SHA,
worker/elm.json+8−3
@@ -8,13 +8,18 @@
88 "direct": {
99 "elm/browser": "1.0.1",
1010 "elm/core": "1.0.2",
11+ "elm/file": "1.0.5",
1112 "elm/html": "1.0.0",
13+ "elm/http": "2.0.0",
1214 "elm/json": "1.1.3",
13− "elm/project-metadata-utils": "1.0.0"
15+ "elm/random": "1.0.0",
16+ "elm/svg": "1.0.1",
17+ "elm/time": "1.0.0",
18+ "elm-explorations/linear-algebra": "1.0.3",
19+ "elm-explorations/webgl": "1.1.0"
1420 },
1521 "indirect": {
16− "elm/parser": "1.1.0",
17− "elm/time": "1.0.0",
22+ "elm/bytes": "1.0.8",
1823 "elm/url": "1.0.0",
1924 "elm/virtual-dom": "1.0.2"
2025 }
worker/outlines/compile/elm.jsondeleted−32
@@ -1,32 +0,0 @@
1−{
2− "type": "application",
3− "source-directories": [
4− "../../src"
5− ],
6− "elm-version": "0.19.1",
7− "dependencies": {
8− "direct": {
9− "elm/browser": "1.0.1",
10− "elm/core": "1.0.2",
11− "elm/file": "1.0.5",
12− "elm/html": "1.0.0",
13− "elm/http": "2.0.0",
14− "elm/json": "1.1.3",
15− "elm/random": "1.0.0",
16− "elm/svg": "1.0.1",
17− "elm/time": "1.0.0",
18− "elm-explorations/linear-algebra": "1.0.3",
19− "elm-explorations/webgl": "1.1.0",
20− "evancz/elm-playground": "1.0.2"
21− },
22− "indirect": {
23− "elm/bytes": "1.0.8",
24− "elm/url": "1.0.0",
25− "elm/virtual-dom": "1.0.2"
26− }
27− },
28− "test-dependencies": {
29− "direct": {},
30− "indirect": {}
31− }
32−}
worker/outlines/repl/elm.jsondeleted−19
@@ -1,19 +0,0 @@
1−{
2− "type": "application",
3− "source-directories": [
4− "../../src"
5− ],
6− "elm-version": "0.19.1",
7− "dependencies": {
8− "direct": {
9− "elm/core": "1.0.2"
10− },
11− "indirect": {
12− "elm/json": "1.1.3"
13− }
14− },
15− "test-dependencies": {
16− "direct": {},
17− "indirect": {}
18− }
19−}
worker/src/Artifacts.hsdeleted−155
@@ -1,155 +0,0 @@
1−{-# OPTIONS_GHC -Wall #-}
2−module Artifacts
3− ( Artifacts(..)
4− , loadCompile
5− , loadRepl
6− , toDepsInfo
7− )
8− where
9−
10−
11−import Control.Concurrent (readMVar)
12−import Control.Monad (liftM2)
13−import qualified Data.ByteString as BS
14−import qualified Data.ByteString.Builder as B
15−import qualified Data.ByteString.Lazy as LBS
16−import qualified Data.Map as Map
17−import qualified Data.Name as N
18−import qualified Data.OneOrMore as OneOrMore
19−import qualified System.Directory as Dir
20−import System.FilePath ((</>))
21−
22−import qualified AST.Canonical as Can
23−import qualified AST.Optimized as Opt
24−import qualified BackgroundWriter as BW
25−import qualified Elm.Details as Details
26−import qualified Elm.Interface as I
27−import qualified Elm.ModuleName as ModuleName
28−import qualified Elm.Package as Pkg
29−import Json.Encode ((==>))
30−import qualified Json.Encode as E
31−import qualified Json.String as Json
32−import qualified Reporting
33−
34−
35−
36−-- ARTIFACTS
37−
38−
39−data Artifacts =
40− Artifacts
41− { _ifaces :: Map.Map ModuleName.Raw I.Interface
42− , _graph :: Opt.GlobalGraph
43− }
44−
45−
46−loadCompile :: IO Artifacts
47−loadCompile =
48− load ("outlines" </> "compile")
49−
50−
51−loadRepl :: IO Artifacts
52−loadRepl =
53− load ("outlines" </> "repl")
54−
55−
56−
57−-- LOAD
58−
59−
60−load :: FilePath -> IO Artifacts
61−load dir =
62− BW.withScope $ \scope ->
63− do putStrLn $ "Loading " ++ dir </> "elm.json"
64− style <- Reporting.terminal
65− root <- fmap (</> dir) Dir.getCurrentDirectory
66− result <- Details.load style scope root
67− case result of
68− Left _ ->
69− error $ "Ran into some problem loading elm.json\nTry running `elm make` in: " ++ dir
70−
71− Right details ->
72− do omvar <- Details.loadObjects root details
73− imvar <- Details.loadInterfaces root details
74− mdeps <- readMVar imvar
75− mobjs <- readMVar omvar
76− case liftM2 (,) mdeps mobjs of
77− Nothing ->
78− error $ "Ran into some weird problem loading elm.json\nTry running `elm make` in: " ++ dir
79−
80− Just (deps, objs) ->
81− return $ Artifacts (toInterfaces deps) objs
82−
83−
84−toInterfaces :: Map.Map ModuleName.Canonical I.DependencyInterface -> Map.Map ModuleName.Raw I.Interface
85−toInterfaces deps =
86− Map.mapMaybe toUnique $ Map.fromListWith OneOrMore.more $
87− Map.elems (Map.mapMaybeWithKey getPublic deps)
88−
89−
90−getPublic :: ModuleName.Canonical -> I.DependencyInterface -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore I.Interface)
91−getPublic (ModuleName.Canonical _ name) dep =
92− case dep of
93− I.Public iface -> Just (name, OneOrMore.one iface)
94− I.Private _ _ _ -> Nothing
95−
96−
97−toUnique :: OneOrMore.OneOrMore a -> Maybe a
98−toUnique oneOrMore =
99− case oneOrMore of
100− OneOrMore.One value -> Just value
101− OneOrMore.More _ _ -> Nothing
102−
103−
104−
105−-- TO DEPS INFO
106−
107−
108−toDepsInfo :: Artifacts -> BS.ByteString
109−toDepsInfo (Artifacts ifaces _) =
110− LBS.toStrict $ B.toLazyByteString $ E.encodeUgly $ encode ifaces
111−
112−
113−
114−-- ENCODE
115−
116−
117−encode :: Map.Map ModuleName.Raw I.Interface -> E.Value
118−encode ifaces =
119− E.dict Json.fromName encodeInterface ifaces
120−
121−
122−encodeInterface :: I.Interface -> E.Value
123−encodeInterface (I.Interface pkg values unions aliases binops) =
124− E.object
125− [ "pkg" ==> E.chars (Pkg.toChars pkg)
126− , "ops" ==> E.list E.name (Map.keys binops)
127− , "values" ==> E.list E.name (Map.keys values)
128− , "aliases" ==> E.list E.name (Map.keys (Map.filter isPublicAlias aliases))
129− , "types" ==> E.dict Json.fromName (E.list E.name) (Map.mapMaybe toPublicUnion unions)
130− ]
131−
132−
133−isPublicAlias :: I.Alias -> Bool
134−isPublicAlias alias =
135− case alias of
136− I.PublicAlias _ -> True
137− I.PrivateAlias _ -> False
138−
139−
140−toPublicUnion :: I.Union -> Maybe [N.Name]
141−toPublicUnion union =
142− case union of
143− I.OpenUnion (Can.Union _ variants _ _) ->
144− Just (map getVariantName variants)
145−
146− I.ClosedUnion _ ->
147− Just []
148−
149− I.PrivateUnion _ ->
150− Nothing
151−
152−
153−getVariantName :: Can.Ctor -> N.Name
154−getVariantName (Can.Ctor name _ _ _) =
155− name
worker/src/Cors.hsdeleted−48
@@ -1,48 +0,0 @@
1−{-# OPTIONS_GHC -Wall #-}
2−module Cors
3− ( allow
4− )
5− where
6−
7−
8−import qualified Data.HashSet as HashSet
9−import Network.URI (parseURI)
10−import Snap.Core (Snap, Method, method)
11−import Snap.Util.CORS (CORSOptions(..), HashableMethod(..), OriginList(Origins), applyCORS, mkOriginSet)
12−
13−
14−
15−-- ALLOW
16−
17−
18−allow :: Method -> [String] -> Snap () -> Snap ()
19−allow method_ origins snap =
20− applyCORS (toOptions method_ origins) $ method method_ $
21− snap
22−
23−
24−
25−-- TO OPTIONS
26−
27−
28−toOptions :: (Monad m) => Method -> [String] -> CORSOptions m
29−toOptions method_ origins =
30− let
31− allowedOrigins = toOriginList origins
32− allowedMethods = HashSet.singleton (HashableMethod method_)
33− in
34− CORSOptions
35− { corsAllowOrigin = return allowedOrigins
36− , corsAllowCredentials = return True
37− , corsExposeHeaders = return HashSet.empty
38− , corsAllowedMethods = return allowedMethods
39− , corsAllowedHeaders = return
40− }
41−
42−
43−toOriginList :: [String] -> OriginList
44−toOriginList origins =
45− Origins $ mkOriginSet $
46− case traverse parseURI origins of
47− Just uris -> uris
48− Nothing -> error "invalid entry given to toOriginList list"
worker/src/Endpoint/Compile.hsdeleted−323
@@ -1,323 +0,0 @@
1−{-# OPTIONS_GHC -Wall #-}
2−{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
3−module Endpoint.Compile
4− ( endpoint_V1
5− , endpoint_V2
6− , loadErrorJS
7− )
8− where
9−
10−
11−import qualified Data.ByteString as B
12−import qualified Data.ByteString.Builder as B
13−import qualified Data.ByteString.Lazy as LBS
14−import qualified Data.Map as Map
15−import qualified Data.Map.Utils as Map
16−import qualified Data.Name as N
17−import qualified Data.NonEmptyList as NE
18−import Snap.Core
19−import Snap.Util.FileUploads
20−import qualified System.Directory as Dir
21−import qualified System.IO.Streams as Stream
22−import Text.RawString.QQ (r)
23−
24−import qualified Artifacts as A
25−import qualified Cors
26−
27−import qualified AST.Source as Src
28−import qualified AST.Canonical as Can
29−import qualified AST.Optimized as Opt
30−import qualified BackgroundWriter as BW
31−import qualified Build
32−import qualified Compile
33−import qualified Elm.Details as Details
34−import qualified Elm.Interface as I
35−import qualified Elm.ModuleName as ModuleName
36−import qualified Elm.Package as Pkg
37−import qualified File
38−import qualified Generate
39−import qualified Generate.Html as Html
40−import qualified Generate.JavaScript as JS
41−import qualified Generate.Mode as Mode
42−import qualified Json.Encode as Encode
43−import qualified Parse.Module as Parse
44−import qualified Reporting
45−import qualified Reporting.Annotation as A
46−import Reporting.Doc ((<>))
47−import qualified Reporting.Doc as D
48−import qualified Reporting.Error as Error
49−import qualified Reporting.Error.Import as Import
50−import qualified Reporting.Exit as Exit
51−import qualified Reporting.Exit.Help as Help
52−import qualified Reporting.Task as Task
53−
54−
55−
56−-- ALLOWED ORIGINS
57−
58−
59−allowedOrigins :: [String]
60−allowedOrigins =
61− [ "https://elm-lang.org"
62− , "https://package.elm-lang.org"
63− ]
64−
65−
66−
67−-- ENDPOINT (V1)
68−
69−
70−endpoint_V1 :: A.Artifacts -> Snap ()
71−endpoint_V1 artifacts =
72− endpoint artifacts $ \result ->
73− case result of
74− Ok name js -> writeBuilder $ Html.sandwich name js
75− Err report -> writeBuilder $ renderProblem_V1 report
76−
77−
78−
79−-- ENDPOINT (V2)
80−
81−
82−endpoint_V2 :: A.Artifacts -> Snap ()
83−endpoint_V2 artifacts =
84− endpoint artifacts $ \result ->
85− case result of
86− Ok name js -> writeBuilder $ renderSuccess_V2 name js
87− Err report -> writeBuilder $ renderProblem_V2 report
88−
89−
90−
91−-- ENDPOINT
92−
93−
94−data Result
95− = Ok N.Name B.Builder
96− | Err Help.Report
97−
98−
99−endpoint :: A.Artifacts -> (Result -> Snap ()) -> Snap ()
100−endpoint artifacts callback =
101− Cors.allow POST allowedOrigins $
102− do result <- foldMultipart defaultUploadPolicy ignoreFile 0
103− case result of
104− ([("code",source)], 0) ->
105− do modifyResponse $ setContentType "text/html; charset=utf-8"
106− callback $
107− case compile artifacts source of
108− Success name js -> Ok name js
109− NoMain -> Err noMain
110− BadInput name err -> Err $ Help.compilerReport "/" (Error.Module name "/try" File.zeroTime source err) []
111−
112− _ ->
113− do modifyResponse $ setResponseStatus 400 "Bad Request"
114− modifyResponse $ setContentType "text/html; charset=utf-8"
115− writeBS
116− "<p>Unexpected request format. This should not be possible!</p>\
117− \<p>Please report this\
118− \ <a href=\"https://github.com/elm/compiler/issues\">here</a>\
119− \ along with the URL and your browser version.</p>"
120−
121−
122−ignoreFile :: PartInfo -> Stream.InputStream B.ByteString -> Int -> IO Int
123−ignoreFile _ _ count =
124− return (count + 1)
125−
126−
127−
128−-- COMPILE
129−
130−
131−data Outcome
132− = Success N.Name B.Builder
133− | NoMain
134− | BadInput ModuleName.Raw Error.Error
135−
136−
137−compile :: A.Artifacts -> B.ByteString -> Outcome
138−compile (A.Artifacts interfaces objects) source =
139− case Parse.fromByteString Parse.Application source of
140− Left err ->
141− BadInput N._Main (Error.BadSyntax err)
142−
143− Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
144− case checkImports interfaces imports of
145− Left err ->
146− BadInput (Src.getName modul) (Error.BadImports err)
147−
148− Right ifaces ->
149− case Compile.compile Pkg.dummyName ifaces modul of
150− Left err ->
151− BadInput (Src.getName modul) err
152−
153− Right (Compile.Artifacts canModule _ locals) ->
154− case locals of
155− Opt.LocalGraph Nothing _ _ ->
156− NoMain
157−
158− Opt.LocalGraph (Just main_) _ _ ->
159− let
160− mode = Mode.Dev Nothing
161− home = Can._name canModule
162− name = ModuleName._module home
163− mains = Map.singleton home main_
164− graph = Opt.addLocalGraph locals objects
165− in
166− Success name $ JS.generate mode graph mains
167−
168−
169−checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
170−checkImports interfaces imports =
171− let
172− importDict = Map.fromValues Src.getImportName imports
173− missing = Map.difference importDict interfaces
174− in
175− case Map.elems missing of
176− [] ->
177− Right (Map.intersection interfaces importDict)
178−
179− i:is ->
180− let
181− unimported =
182− Map.keysSet (Map.difference interfaces importDict)
183−
184− toError (Src.Import (A.At region name) _ _) =
185− Import.Error region name unimported Import.NotFound
186− in
187− Left (fmap toError (NE.List i is))
188−
189−
190−
191−-- RENDER PROBLEM (V1)
192−
193−
194−renderProblem_V1 :: Help.Report -> B.Builder
195−renderProblem_V1 report =
196− [r|<!DOCTYPE HTML>
197−<html>
198−<head>
199− <meta charset="UTF-8">
200− <style>body { padding: 0; margin: 0; background-color: black; }</style>
201− <script src="https://worker.elm-lang.org/compile/errors.js"></script>
202−</head>
203−<body>
204− <script>
205− var app = Elm.Errors.init({flags:|] <> Encode.encodeUgly (Exit.toJson report) <> [r|});
206− app.ports.jumpTo.subscribe(function(region) {
207− window.parent.postMessage(JSON.stringify(region), "*");
208− });
209− </script>
210−</body>
211−</html>|]
212−
213−
214−
215−-- RENDER SUCCESS (V2)
216−
217−
218−renderSuccess_V2 :: N.Name -> B.Builder -> B.Builder
219−renderSuccess_V2 moduleName javascript =
220− let name = N.toBuilder moduleName in
221− [r|<!DOCTYPE HTML>
222−<html>
223−<head>
224− <meta charset="UTF-8">
225− <title>|] <> name <> [r|</title>
226− <style>body { padding: 0; margin: 0; }</style>
227−</head>
228−
229−<body>
230−
231−<pre id="elm"></pre>
232−
233−<script>
234−window.parent.postMessage("SUCCESS", "*");
235−
236−try {
237−|] <> javascript <> [r|
238−
239− var app = Elm.|] <> name <> [r|.init({ node: document.getElementById("elm") });
240−}
241−catch (e)
242−{
243− // display initialization errors (e.g. bad flags, infinite recursion)
244− var header = document.createElement("h1");
245− header.style.fontFamily = "monospace";
246− header.innerText = "Initialization Error";
247− var pre = document.getElementById("elm");
248− document.body.insertBefore(header, pre);
249− pre.innerText = e;
250− throw e;
251−}
252−</script>
253−
254−</body>
255−</html>|]
256−
257−
258−
259−-- RENDER PROBLEM (V2)
260−
261−
262−renderProblem_V2 :: Help.Report -> B.Builder
263−renderProblem_V2 report =
264− [r|<!DOCTYPE HTML>
265−<html>
266−<head>
267− <meta charset="UTF-8">
268− <style>body { padding: 0; margin: 0; display: none; }</style>
269−</head>
270−<body>
271− <script>
272− var errors = |] <> Encode.encodeUgly (Exit.toJson report) <> [r|;
273− window.parent.postMessage(JSON.stringify(errors), "*");
274− </script>
275−</body>
276−</html>|]
277−
278−
279−
280−-- NO MAIN
281−
282−
283−noMain :: Help.Report
284−noMain =
285− Help.report "NO MAIN" Nothing
286− (
287− "Without a `main` value, I do not know what to show on screen!"
288− )
289− [ D.reflow $
290− "Adding a `main` value can be as brief as:"
291− , D.vcat
292− [ D.fillSep [D.cyan "import","Html"]
293− , ""
294− , D.fillSep [D.green "main","="]
295− , D.indent 2 $ D.fillSep [D.cyan "Html" <> ".text",D.dullyellow "\"Hello!\""]
296− ]
297− , D.reflow $
298− "Try adding something like that!"
299− , D.toSimpleNote $
300− "I recommend looking through https://guide.elm-lang.org for more advice on\
301− \ how to fill in `main` values."
302− ]
303−
304−
305−
306−-- LOAD ERROR JS
307−
308−
309−loadErrorJS :: IO B.ByteString
310−loadErrorJS =
311− let
312− run work =
313− do result <- work
314− case result of
315− Right a -> return a
316− Left _ -> error "problem building src/Errors.elm"
317− in
318− BW.withScope $ \scope ->
319− do root <- Dir.getCurrentDirectory
320− details <- run $ Details.load Reporting.silent scope root
321− artifacts <- run $ Build.fromPaths Reporting.silent root details (NE.List "src/Errors.elm" [])
322− javascript <- run $ Task.run $ Generate.prod root details artifacts
323− return $ LBS.toStrict $ B.toLazyByteString javascript
worker/src/Endpoint/Quotes.hsdeleted−114
@@ -1,114 +0,0 @@
1−{-# LANGUAGE BangPatterns, MagicHash, OverloadedStrings, UnboxedTuples #-}
2−module Endpoint.Quotes
3− ( endpoint
4− )
5− where
6−
7−
8−import Control.Monad.IO.Class (liftIO)
9−import qualified Data.ByteString as BS
10−import GHC.Int (Int(I#))
11−import GHC.Prim
12−import GHC.ST (ST(ST), runST)
13−import qualified System.Random as Random
14−
15−import Snap.Core
16−
17−
18−
19−-- ENDPOINT
20−
21−
22−endpoint :: Snap ()
23−endpoint =
24− do modifyResponse
25− $ setContentType "application/json"
26− . setHeader "Access-Control-Allow-Origin" "*"
27− writeBS =<< liftIO getQuote
28−
29−
30−getQuote :: IO BS.ByteString
31−getQuote =
32− let
33− (Quotes sa#) = quotes
34− in
35− do (I# i#) <- Random.randomRIO (0, I# (sizeofSmallArray# sa# -# 1#))
36− case indexSmallArray# sa# i# of
37− (# json #) ->
38− return json
39−
40−
41−
42−-- QUOTES
43−
44−
45−data Quotes =
46− Quotes (SmallArray# BS.ByteString)
47−
48−
49−quotes :: Quotes
50−quotes =
51− let
52− !(I# len#) = length quoteList
53− in
54− runST $ ST $ \s ->
55− case newSmallArray# len# "" s of
56− (# s, sma# #) ->
57− case quotesHelp# sma# quoteList s of
58− s ->
59− case unsafeFreezeSmallArray# sma# s of
60− (# s, sa# #) ->
61− (# s, Quotes sa# #)
62−
63−
64−quotesHelp# :: SmallMutableArray# s a -> [a] -> State# s -> State# s
65−quotesHelp# sma# =
66− go 0#
67− where
68− go i# list s =
69− case list of
70− [] ->
71− s
72−
73− x:xs ->
74− case writeSmallArray# sma# i# x s of
75− s ->
76− go (i# +# 1#) xs s
77−
78−
79−quoteList :: [BS.ByteString]
80−quoteList =
81− [ "{\"source\":\"Civilization and its Discontents\",\"author\":\"Sigmund Freud\",\"year\":1902,\"quote\":\"The enormous expansion of communications, due to the world-wide telegraph and telephone networks, has entirely transformed the conditions of trade and commerce. Everything is done in haste, at fever pitch. The night is used for travel, the day for business; even \\u201Choliday trips\\u201D put a strain on the nervous system. Great political, industrial and financial crises carry this excitement into far wider areas of the population than ever before. Interest in political life has become universal: tempers are inflamed by political, religious and social struggles, party politics, electioneering and the immense growth of trade-unionism; people are forced to engage in constant mental activity and robbed of the time the need for relaxation, sleep and rest.\"}"
82− , "{\"source\":\"A Preface to Politics\",\"author\":\"Walter Lippmann\",\"year\":1913,\"quote\":\"The Economic Man\\u2014that lazy abstraction\\u2014is still paraded in the lecture room.\"}"
83− , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"You ask me to say what you should consider it particularly important to avoid. My answer is this: a mass crowd. It is something to which you cannot entrust yourself yet without risk. I at any rate am ready to confess my own frailty in this respect. I never come back home with quite the same moral character as I went out with.\"}"
84− , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"December used to be a month but it is now a year\"}"
85− , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"But nothing is as ruinous to the character as sitting away one\\u2019s time at a show - for it is then, through the medium of entertainment, that vices creep into one with more than usual ease.\"}"
86− , "{\"source\":\"Letters from a Stoic\",\"author\":\"Seneca\",\"year\":54,\"quote\":\"All this hurrying from place to place won\\u2019t bring you any relief, for you\\u2019re travelling in the company of your own emotions, followed by your troubles all the way. If only they were really following you! They\\u2019d be farther away from you: as it is they\\u2019re not at your back, but on it! That\\u2019s why they weigh you down with just the same uncomfortable chafing wherever you are. It\\u2019s medicine, not a particular part of the world, that a person needs if he\\u2019s ill. Suppose someone has broken his leg or dislocated a joint; he doesn\\u2019t get into a carriage or board a ship: he calls in a doctor to have the fracture set or the dislocation reduced. Well then, when a person\\u2019s spirit is wrenched or broken at so many points, do you imagine that it can be put right by a change of scenery, that that sort of trouble isn\\u2019t so serious that it can\\u2019t be cured by an outing?\"}"
87− , "{\"source\":\"Progress and Poverty\",\"author\":\"Henry George\",\"year\":1879,\"quote\":\"The present century has been marked by a prodigious increase in wealth-producing power. The utilization of steam and electricity, the introduction of improved processes and laborsaving machinery, the greater subdivision and grander scale of production, the wonderful facilitation of exchanges, have multiplied enormously the effectiveness of labor. At the beginning of this marvelous era it was natural to expect, and it was expected, that laborsaving inventions would lighten the toil and improve the condition of the laborer; that the enormous increase in the power of producing wealth would make real poverty a thing of the past.\"}"
88− , "{\"source\":\"Imperialism\",\"author\":\"John Hobson\",\"year\":1902,\"quote\":\"Although the new Imperialism has been bad business for the nation, it has been good business for certain classes and certain trades within the nation. The vast expenditure on armaments, the costly wars, the grave risks and embarrassments of foreign policy, the stoppage of political and social reforms within Great Britain, though fraught with great injury to the nation, have served well the present business interests of certain industries and professions.\"}"
89− , "{\"source\":\"Neo-Colonialism\",\"author\":\"Kwame Nkrumah\",\"year\":1965,\"quote\":\"The essence of neo-colonialism is that the State which is subject to it is, in theory, independent and has all the outward trappings of international sovereignty. In reality its economic system and thus its political policy is directed from the outside. The methods and form of this direction can take various shapes. For example, in an extreme case the troops of the imperial power may garrison the territory of the neo-colonial State and control the government of it. More often, however, neo-colonialist control is exercised through economic or monetary means. The neo-colonial State may be obliged to take the manufactured products of the imperialist power to the exclusion of competing products from elsewhere. Control over government policy in the neo-colonial State may be secured by payments towards the cost of running the State, by the provision of civil servants in positions where they can dictate policy, and by monetary control over foreign exchange through the imposition of a banking system controlled by the imperial power.\"}"
90− , "{\"source\":\"Neo-Colonialism\",\"author\":\"Kwame Nkrumah\",\"year\":1965,\"quote\":\"In the end the situation arises that the only type of aid which the neo-colonialist masters consider as safe is \\u2018military aid\\u2019. Once a neo-colonialist territory is brought to such a state of economic chaos and misery that revolt actually breaks out then, and only then, is there no limit to the generosity of the neo-colonial overlord, provided, of course, that the funds supplied are utilised exclusively for military purposes. Military aid in fact marks the last stage of neo-colonialism and its effect is self-destructive. Sooner or later the weapons supplied pass into the hands of the opponents of the neo-colonialist regime and the war itself increases the social misery which originally provoked it.\"}"
91− , "{\"source\":\"Barnyard in your Backyard\",\"author\":\"Gail Damerow\",\"year\":2002,\"quote\":\"Wild jungle fowl, the ancestors of modern chickens, met their nutritional needs by consuming a variety of plants and insects. Given enough room to roam, some of today\\u2019s breeds remain active foragers.\"}"
92− , "{\"source\":\"Barnyard in your Backyard\",\"author\":\"Gail Damerow\",\"year\":2002,\"quote\":\"Another way to reduce the cost of feed is to let your chickens roam on a lawn or in a pasture for part of the day. By eating plants, seeds, and insects, they will balance their diet and eat less of the expensive commercial stuff. Take care not to put your chickens on grass or around buildings that have been sprayed with toxins.\"}"
93− , "{\"source\":\"Co-operation in Danish Agriculture\",\"author\":\"Harald Faber\",\"year\":1918,\"quote\":\"A plan for improving the butter made from the milk from peasant farms by collecting the milk to be worked at one place was submitted to the Royal Agricultural Society of Denmark as early as 1852, and it pointed out that this could be done on co-operative lines, the peasants being the owners of the factory and sharing the proceeds.\"}"
94− , "{\"source\":\"Co-operation in Danish Agriculture\",\"author\":\"Harald Faber\",\"year\":1918,\"quote\":\"It was the Danish peasants themselves who found a practical way of developing the dairy industry, and they found this by applying the co-operative principles introduced by the Rochdale weavers. They received no support and only lukewarm sympathy from large farmers and estate owners, until later on when the co-operative dairies were doing so well that even owners of estates with two to three hundred cows found it to their advantage to close their private dairies and to join co-operative dairies.\"}"
95− , "{\"source\":\"Beekeeping: A Practical Guide\",\"author\":\"Richard Bonney\",\"year\":1993,\"quote\":\"How many of you have been in a classroom or a training program where the instructor says at the outset, \\u201CLook at the person on your right; now look at the person on your left. One of you won\\u2019t be here next year.\\u201D Beekeeping is like that. Furthermore, not all beekeepers are truly beekeepers. Some are beehavers.\"}"
96− , "{\"source\":\"The Rodale Book of Composting\",\"author\":\"Deborah Martin and Grace Gershuny\",\"year\":1992,\"quote\":\"Earthworms. If bacteria are the champion microscopic decomposers, then the heavyweight champion is doubtless the earthworm. Pages of praise have been written to the earthworm, ever since it became known that this creature spends most of its time tilling and enriching the soil.\"}"
97− , "{\"source\":\"War is a Racket\",\"author\":\"General Smedley Butler\",\"year\":1935,\"quote\":\"There are 40,000,000 men under arms in the world today, and our statesmen and diplomats have the temerity to say that war is not in the making. Hell\\u2019s bells! Are these 40,000,000 men being trained to be dancers?\"}"
98− , "{\"source\":\"Root Cellaring\",\"author\":\"Mike and Nancy Bubel\",\"year\":1991,\"quote\":\"What is not so widely acknowledged is that the soil in which your plants grow can influence the keeping quality of the vegetables you harvest. According to studies reported in E. P. Shirakov\\u2019s \\u201CPractical Course in Storage and Processing of Fruits and Vegetables\\u201D, abundant potash in the soil promotes long storage life of fruits and vegetables grown on that soil.\"}"
99− , "{\"source\":\"Angora Goats the Northern Way\",\"author\":\"Susan Black Drummond\",\"year\":1985,\"quote\":\"Because of its long wearing qualities and resistance to soil, mohair was once a major upholstery fabric in this country, and was the seat cover material in many cars and in British Railroad seats. The synthetic fiber craze put an end to mohair use as upholstery fabric here.\"}"
100− , "{\"source\":\"Making a Newspaper\",\"author\":\"John Given\",\"year\":1912,\"quote\":\"Yellow journalism originated through a desire to gain readers and advertisers, and it produced results. Its original disciples have readers by the hundred thousand and they have about all the advertising that they can well handle.\"}"
101− , "{\"source\":\"Making a Newspaper\",\"author\":\"John Given\",\"year\":1912,\"quote\":\"With the adding of every new train and the improvement of every new time-table, the building of every new trolley road, and the establishment of every new mail route, the big city papers are enabled to reach out further, and, wherever they reach, the local papers suffer [...] There is not a paper published in any city between New York and Boston that has not in the last ten years been hurt by the papers of these two cities.\"}"
102− , "{\"source\":\"Muscles: Testing and Function (4th Edition)\",\"author\":\"Florence Kendall, Elizabeth McCreary, Patricia Provance\",\"year\":1993,\"quote\":\"The mechanics of the low back is inseparable from that of the overall posture but especially that of the pelvis and the lower extremities. Pain manifested in the leg may be due to an underlying problem in the back. Conversely, the symptoms appearing in the low back may be due to underlying faulty mechanics of the feet, legs, or pelvis.\"}"
103− , "{\"source\":\"Farmers of Forty Centuries\",\"author\":\"F. H. King\",\"year\":1911,\"quote\":\"The Sikiang is one of the great rivers of China and indeed of the world. Its width at Wuchow at low water was nearly a mile and our steamer anchored in twenty-four feet of water to a floating dock made fast by huge iron chains reaching three hundred feet up the slop to the city proper, thus providing for a rise of twenty-six feet in the river at its flood stage during the rainy season.\"}"
104− , "{\"source\":\"How to Grow More Vegetables\",\"author\":\"John Jeavons\",\"year\":1974,\"quote\":\"If you are having trouble with birds eating the berries in your berry patch, you could erect a wren house in the middle of it. Wrens are insectivores, and they will not bother the berries. But they will attack any bird, however large, that comes near their nest.\"}"
105− , "{\"source\":\"Confidence Men and Painted Women\",\"author\":\"Karen Halttunen\",\"year\":1982,\"quote\":\"Even one\\u2019s neighbor next door, as a visitor to Pittsburgh commented in 1818, might be a stranger: \\u201CA next door neighbor is, with them, frequently unknown, and months and years pass, without their exchanging with each other the ordinary compliments of friendship and goodwill.\\u201D\"}"
106− , "{\"source\":\"Secondhand Time\",\"author\":\"Svetlana Alexievich\",\"year\":2016,\"quote\":\"I couldn\\u2019t understand what was going on. I remember seeing Gaidar on TV saying, \\u201Clearn how to sell... The market will save us...\\u201D You buy a bottle of mineral water on one corner and sell it on another\\u2014that\\u2019s business. The people listened, bewildered. I would come home, lock the door, and weep.\"}"
107− , "{\"source\":\"Hiroshima\",\"author\":\"John Hersey\",\"year\":1985,\"quote\":\"At exactly fifteen minutes past eight in the morning, on August 6, 1945, Japanese time, at the moment when the atomic bomb flashed above Hiroshima, Miss Toshiko Sasaki, a clerk in the personnel department of the East Asia Tin Works, had just sat down at her place in the plant office and was turning her head to speak to the girl at the next desk.\"}"
108− , "{\"source\":\"The Orphan\",\"author\":\"Maxim Gorky\",\"year\":1899,\"quote\":\"On a foggy and rainy day, by the cemetery gate, a small group of people standing in a muddy puddle were bargaining with the cabman. \\u201CFifteen kopeks!\\u201D The tall and heavy-set priest exclaimed in a deep bass, in response to the cabman\\u2019s shouts asking for twenty-five kopecks.\"}"
109− , "{\"source\":\"Shah of Shahs\",\"author\":\"Ryszard Kapuściński\",\"year\":1982,\"quote\":\"This plane flies out of Teheran every day and lands at Munich at noon. Waiting limousines carry the passengers to elegant restaurants for lunch. After lunch they all fly back to Teheran in the same airplane and eat their suppers at home. Hardly an expensive entertainment, the jaunt costs only two thousand dollars a head. For people in the Shah\\u2019s favor, such a sum is nothing.\"}"
110− , "{\"source\":\"Introduction to Fortran IV\",\"author\":\"Paul Chirlian\",\"year\":1973,\"quote\":\"There are many programming languages that can be used. We shall discuss a language that is almost universally used, and which is particularly applicable to mathematical and scientific computations. This language is FORTRAN IV.\"}"
111− ]
112−
113−
114−
worker/src/Endpoint/Repl.hsdeleted−244
@@ -1,244 +0,0 @@
1−{-# OPTIONS_GHC -Wall #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−module Endpoint.Repl
4− ( endpoint
5− )
6− where
7−
8−
9−import Data.Aeson ((.:))
10−import qualified Data.Aeson as Aeson
11−import qualified Data.Aeson.Types as Aeson
12−import qualified Data.ByteString as BS
13−import qualified Data.ByteString.Builder as B
14−import qualified Data.ByteString.Lazy as LBS
15−import Data.Map ((!))
16−import qualified Data.Map as Map
17−import qualified Data.Map.Utils as Map
18−import qualified Data.Name as N
19−import qualified Data.NonEmptyList as NE
20−import Snap.Core
21−
22−import qualified Artifacts as A
23−import qualified Cors
24−
25−import qualified AST.Source as Src
26−import qualified AST.Canonical as Can
27−import qualified AST.Optimized as Opt
28−import qualified Compile
29−import qualified Elm.Interface as I
30−import qualified Elm.ModuleName as ModuleName
31−import qualified Elm.Package as Pkg
32−import qualified File
33−import qualified Generate.JavaScript as JS
34−import qualified Json.Encode as Encode
35−import qualified Parse.Module as Parse
36−import qualified Repl
37−import qualified Reporting.Annotation as A
38−import qualified Reporting.Error as Error
39−import qualified Reporting.Error.Import as Import
40−import qualified Reporting.Exit as Exit
41−import qualified Reporting.Exit.Help as Help
42−import qualified Reporting.Render.Type.Localizer as L
43−
44−
45−
46−-- ALLOWED ORIGINS
47−
48−
49−allowedOrigins :: [String]
50−allowedOrigins =
51− [ "https://guide.elm-lang.org"
52− , "https://guide.elm-lang.jp"
53− , "http://localhost:8007"
54− ]
55−
56−
57−
58−-- ENDPOINT
59−
60−
61−endpoint :: A.Artifacts -> Snap ()
62−endpoint artifacts =
63− Cors.allow POST allowedOrigins $
64− do body <- readRequestBody (64 * 1024)
65− case decodeBody body of
66− Just (state, entry) ->
67− serveOutcome (toOutcome artifacts state entry)
68−
69− Nothing ->
70− do modifyResponse $ setResponseStatus 400 "Bad Request"
71− modifyResponse $ setContentType "text/html; charset=utf-8"
72− writeBS "Received unexpected JSON body."
73−
74−
75−
76−-- TO OUTCOME
77−
78−
79−data Outcome
80− = NewImport N.Name
81− | NewType N.Name
82− | NewWork B.Builder
83− --
84− | Skip
85− | Indent
86− | DefStart N.Name
87− --
88− | NoPorts
89− | InvalidCommand
90− | Failure BS.ByteString Error.Error
91−
92−
93−toOutcome :: A.Artifacts -> Repl.State -> String -> Outcome
94−toOutcome artifacts state entry =
95− case reverse (lines entry) of
96− [] ->
97− Skip
98−
99− prev : rev ->
100− case Repl.categorize (Repl.Lines prev rev) of
101− Repl.Done input ->
102− case input of
103− Repl.Import name src -> compile artifacts state (ImportEntry name src)
104− Repl.Type name src -> compile artifacts state (TypeEntry name src)
105− Repl.Decl name src -> compile artifacts state (DeclEntry name src)
106− Repl.Expr src -> compile artifacts state (ExprEntry src)
107− Repl.Port -> NoPorts
108− Repl.Skip -> Skip
109− Repl.Reset -> InvalidCommand
110− Repl.Exit -> InvalidCommand
111− Repl.Help _ -> InvalidCommand
112−
113− Repl.Continue prefill ->
114− case prefill of
115− Repl.Indent -> Indent
116− Repl.DefStart name -> DefStart name
117−
118−
119−
120−-- SERVE OUTCOME
121−
122−
123−serveOutcome :: Outcome -> Snap ()
124−serveOutcome outcome =
125− let
126− serveString = serveBuilder "text/plain"
127− in
128− case outcome of
129− NewImport name -> serveString $ "add-import:" <> N.toBuilder name
130− NewType name -> serveString $ "add-type:" <> N.toBuilder name
131− NewWork js -> serveBuilder "application/javascript" js
132− Skip -> serveString $ "skip"
133− Indent -> serveString $ "indent"
134− DefStart name -> serveString $ "def-start:" <> N.toBuilder name
135− NoPorts -> serveString $ "no-ports"
136− InvalidCommand -> serveString $ "invalid-command"
137− Failure source err ->
138− serveBuilder "application/json" $ Encode.encodeUgly $ Exit.toJson $
139− Help.compilerReport "/" (Error.Module N.replModule "/repl" File.zeroTime source err) []
140−
141−
142−serveBuilder :: BS.ByteString -> B.Builder -> Snap ()
143−serveBuilder mime builder =
144− do modifyResponse (setContentType mime)
145− writeBuilder builder
146−
147−
148−
149−-- COMPILE
150−
151−
152−data EntryType
153− = ImportEntry N.Name BS.ByteString
154− | TypeEntry N.Name BS.ByteString
155− | DeclEntry N.Name BS.ByteString
156− | ExprEntry BS.ByteString
157−
158−
159−compile :: A.Artifacts -> Repl.State -> EntryType -> Outcome
160−compile (A.Artifacts interfaces objects) state@(Repl.State imports types decls) entryType =
161− let
162− source =
163− case entryType of
164− ImportEntry name src -> Repl.toByteString (state { Repl._imports = Map.insert name (B.byteString src) imports }) Repl.OutputNothing
165− TypeEntry name src -> Repl.toByteString (state { Repl._types = Map.insert name (B.byteString src) types }) Repl.OutputNothing
166− DeclEntry name src -> Repl.toByteString (state { Repl._decls = Map.insert name (B.byteString src) decls }) (Repl.OutputDecl name)
167− ExprEntry src -> Repl.toByteString state (Repl.OutputExpr src)
168− in
169− case
170− do modul <- mapLeft Error.BadSyntax $ Parse.fromByteString Parse.Application source
171− ifaces <- mapLeft Error.BadImports $ checkImports interfaces (Src._imports modul)
172− artifacts <- Compile.compile Pkg.dummyName ifaces modul
173− return ( modul, artifacts, objects )
174− of
175− Left err ->
176− Failure source err
177−
178− Right info ->
179− case entryType of
180− ImportEntry name _ -> NewImport name
181− TypeEntry name _ -> NewType name
182− DeclEntry name _ -> NewWork (toJavaScript info (Just name))
183− ExprEntry _ -> NewWork (toJavaScript info Nothing)
184−
185−
186−toJavaScript :: (Src.Module, Compile.Artifacts, Opt.GlobalGraph) -> Maybe N.Name -> B.Builder
187−toJavaScript (modul, Compile.Artifacts canModule types locals, objects) maybeName =
188− let
189− localizer = L.fromModule modul
190− graph = Opt.addLocalGraph locals objects
191− home = Can._name canModule
192− tipe = types ! maybe N.replValueToPrint id maybeName
193− in
194− JS.generateForReplEndpoint localizer graph home maybeName tipe
195−
196−
197−mapLeft :: (x -> y) -> Either x a -> Either y a
198−mapLeft func result =
199− either (Left . func) Right result
200−
201−
202−checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
203−checkImports interfaces imports =
204− let
205− importDict = Map.fromValues Src.getImportName imports
206− missing = Map.difference importDict interfaces
207− in
208− case Map.elems missing of
209− [] ->
210− Right (Map.intersection interfaces importDict)
211−
212− i:is ->
213− let
214− unimported =
215− Map.keysSet (Map.difference interfaces importDict)
216−
217− toError (Src.Import (A.At region name) _ _) =
218− Import.Error region name unimported Import.NotFound
219− in
220− Left (fmap toError (NE.List i is))
221−
222−
223−
224−-- DECODE BODY
225−
226−
227−decodeBody :: LBS.ByteString -> Maybe ( Repl.State, String )
228−decodeBody body =
229− Aeson.parseMaybe decodeBodyHelp =<< Aeson.decode' body
230−
231−
232−decodeBodyHelp :: Aeson.Object -> Aeson.Parser ( Repl.State, String )
233−decodeBodyHelp obj =
234− let
235− get key =
236− do dict <- obj .: key
237− let f (k,v) = (N.fromChars k, B.stringUtf8 v)
238− return $ Map.fromList $ map f $ Map.toList dict
239− in
240− do imports <- get "imports"
241− types <- get "types"
242− decls <- get "decls"
243− entry <- obj .: "entry"
244− return ( Repl.State imports types decls, entry )
worker/src/Errors.elmdeleted−217
@@ -1,217 +0,0 @@
1−port module Errors exposing (main)
2−
3−
4−import Browser
5−import Char
6−import Html exposing (..)
7−import Html.Attributes exposing (..)
8−import Html.Events exposing (onClick)
9−import String
10−import Json.Decode as D
11−import Elm.Error as Error
12−
13−
14−
15−-- PORTS
16−
17−
18−port jumpTo : Error.Region -> Cmd msg
19−
20−
21−
22−-- MAIN
23−
24−
25−main =
26− Browser.document
27− { init = \flags -> (D.decodeValue Error.decoder flags, Cmd.none)
28− , update = \region result -> (result, jumpTo region)
29− , view = view
30− , subscriptions = \_ -> Sub.none
31− }
32−
33−
34−type alias Msg = Error.Region
35−
36−
37−
38−-- VIEW
39−
40−
41−view : Result D.Error Error.Error -> Browser.Document Msg
42−view result =
43− { title = "Problem!"
44− , body =
45− case result of
46− Err err ->
47− [ text (D.errorToString err) ]
48−
49− Ok error ->
50− [ viewError error ]
51− }
52−
53−
54−viewError : Error.Error -> Html Msg
55−viewError error =
56− div
57− [ style "width" "calc(100% - 4em)"
58− , style "min-height" "calc(100% - 4em)"
59− , style "font-family" "monospace"
60− , style "white-space" "pre-wrap"
61− , style "background-color" "black"
62− , style "color" "rgb(233,235,235)"
63− , style "padding" "2em"
64− ]
65− (viewErrorHelp error)
66−
67−
68−viewErrorHelp : Error.Error -> List (Html Msg)
69−viewErrorHelp error =
70− case error of
71− Error.GeneralProblem { title, message } ->
72− viewHeader title Nothing :: viewMessage message
73−
74− Error.ModuleProblems badModules ->
75− viewBadModules badModules
76−
77−
78−
79−-- VIEW HEADER
80−
81−
82−viewHeader : String -> Maybe Error.Region -> Html Msg
83−viewHeader title maybeRegion =
84− case maybeRegion of
85− Nothing ->
86− span [ style "color" "rgb(51,187,200)" ]
87− [ text <| "-- " ++ title ++ " "
88− , text <| String.repeat (76 - String.length title) "-"
89− , text <| "\n\n"
90− ]
91−
92− Just region ->
93− span [ style "color" "rgb(51,187,200)" ]
94− [ text <| "-- " ++ title ++ " "
95− , text <| String.repeat (60 - String.length title) "-"
96− , text " "
97− , span
98− [ style "cursor" "pointer"
99− , style "text-decoration" "underline"
100− , onClick region
101− ]
102− [ text "Jump To Problem"
103− ]
104− , text <| "\n\n"
105− ]
106−
107−
108−
109−-- VIEW BAD MODULES
110−
111−
112−viewBadModules : List Error.BadModule -> List (Html Msg)
113−viewBadModules badModules =
114− case badModules of
115− [] ->
116− []
117−
118− [badModule] ->
119− [viewBadModule badModule]
120−
121− a :: b :: cs ->
122− viewBadModule a :: viewSeparator a.name b.name :: viewBadModules (b :: cs)
123−
124−
125−viewBadModule : Error.BadModule -> Html Msg
126−viewBadModule { problems } =
127− span [] (List.map viewProblem problems)
128−
129−
130−viewProblem : Error.Problem -> Html Msg
131−viewProblem problem =
132− span [] (viewHeader problem.title (Just problem.region) :: viewMessage problem.message)
133−
134−
135−viewSeparator : String -> String -> Html msg
136−viewSeparator before after =
137− span [ style "color" "rgb(211,56,211)" ]
138− [ text <|
139− String.padLeft 80 ' ' (before ++ " ↑ ") ++ "\n" ++
140− "====o======================================================================o====\n" ++
141− " ↓ " ++ after ++ "\n\n\n"
142− ]
143−
144−
145−
146−-- VIEW MESSAGE
147−
148−
149−viewMessage : List Error.Chunk -> List (Html msg)
150−viewMessage chunks =
151− case chunks of
152− [] ->
153− [ text "\n\n\n" ]
154−
155− chunk :: others ->
156− let
157− htmlChunk =
158− case chunk of
159− Error.Unstyled string ->
160− text string
161−
162− Error.Styled style string ->
163− span (styleToAttrs style) [ text string ]
164− in
165− htmlChunk :: viewMessage others
166−
167−
168−styleToAttrs : Error.Style -> List (Attribute msg)
169−styleToAttrs { bold, underline, color } =
170− addBold bold <| addUnderline underline <| addColor color []
171−
172−
173−addBold : Bool -> List (Attribute msg) -> List (Attribute msg)
174−addBold bool attrs =
175− if bool then
176− style "font-weight" "bold" :: attrs
177− else
178− attrs
179−
180−
181−addUnderline : Bool -> List (Attribute msg) -> List (Attribute msg)
182−addUnderline bool attrs =
183− if bool then
184− style "text-decoration" "underline" :: attrs
185− else
186− attrs
187−
188−
189−addColor : Maybe Error.Color -> List (Attribute msg) -> List (Attribute msg)
190−addColor maybeColor attrs =
191− case maybeColor of
192− Nothing ->
193− attrs
194−
195− Just color ->
196− style "color" (colorToCss color) :: attrs
197−
198−
199−colorToCss : Error.Color -> String
200−colorToCss color =
201− case color of
202− Error.Red -> "rgb(194,54,33)"
203− Error.RED -> "rgb(252,57,31)"
204− Error.Magenta -> "rgb(211,56,211)"
205− Error.MAGENTA -> "rgb(249,53,248)"
206− Error.Yellow -> "rgb(173,173,39)"
207− Error.YELLOW -> "rgb(234,236,35)"
208− Error.Green -> "rgb(37,188,36)"
209− Error.GREEN -> "rgb(49,231,34)"
210− Error.Cyan -> "rgb(51,187,200)"
211− Error.CYAN -> "rgb(20,240,240)"
212− Error.Blue -> "rgb(73,46,225)"
213− Error.BLUE -> "rgb(88,51,255)"
214− Error.White -> "rgb(203,204,205)"
215− Error.WHITE -> "rgb(233,235,235)"
216− Error.Black -> "rgb(0,0,0)"
217− Error.BLACK -> "rgb(129,131,131)"
worker/src/Main.hs+264−35
@@ -1,21 +1,54 @@
11{-# OPTIONS_GHC -Wall #-}
2−{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
33module Main
44 ( main
55 )
66 where
77
88
9−import Control.Monad (msum)
10−import qualified Data.ByteString as BS
9+import Control.Concurrent (readMVar)
10+import Control.Monad (liftM2, msum)
11+import qualified Data.ByteString as B
12+import qualified Data.ByteString.Builder as B
13+import qualified Data.ByteString.Lazy as LBS
14+import qualified Data.HashSet as HashSet
15+import qualified Data.Map as Map
16+import qualified Data.Map.Utils as Map
17+import qualified Data.Name as N
18+import qualified Data.NonEmptyList as NE
19+import qualified Data.OneOrMore as OneOrMore
20+import Network.URI (parseURI)
1121import Snap.Core
1222import Snap.Http.Server
23+import Snap.Util.CORS (CORSOptions(..), HashableMethod(..), OriginList(Origins), applyCORS, mkOriginSet)
24+import Snap.Util.FileUploads
25+import qualified System.Directory as Dir
26+import qualified System.IO.Streams as Stream
27+import Text.RawString.QQ (r)
1328
14−import qualified Artifacts
15−import qualified Cors
16−import qualified Endpoint.Compile as Compile
17−import qualified Endpoint.Quotes as Quotes
18−import qualified Endpoint.Repl as Repl
29+import qualified AST.Source as Src
30+import qualified AST.Canonical as Can
31+import qualified AST.Optimized as Opt
32+import qualified BackgroundWriter as BW
33+import qualified Build
34+import qualified Compile
35+import qualified Elm.Details as Details
36+import qualified Elm.Interface as I
37+import qualified Elm.ModuleName as ModuleName
38+import qualified Elm.Package as Pkg
39+import qualified File
40+import qualified Generate
41+import qualified Generate.Html as Html
42+import qualified Generate.JavaScript as Generate
43+import qualified Generate.Mode as Mode
44+import qualified Json.Encode as Encode
45+import qualified Parse.Module as Parse
46+import qualified Reporting
47+import qualified Reporting.Annotation as A
48+import qualified Reporting.Error as Error
49+import qualified Reporting.Error.Import as Import
50+import qualified Reporting.Exit as Exit
51+import qualified Reporting.Task as Task
1952
2053
2154
@@ -24,50 +57,246 @@ import qualified Endpoint.Repl as Repl
2457
2558main :: IO ()
2659main =
27− do rArtifacts <- Artifacts.loadRepl
28− cArtifacts <- Artifacts.loadCompile
29− errorJS <- Compile.loadErrorJS
30− let depsInfo = Artifacts.toDepsInfo cArtifacts
31−
60+ do artifacts <- loadArtifacts
61+ errorJS <- compileErrorViewer
3262 httpServe config $ msum $
33− [ ifTop $ status
34− , path "repl" $ Repl.endpoint rArtifacts
35− , path "compile" $ Compile.endpoint_V1 cArtifacts
36− , path "compile/v2" $ Compile.endpoint_V2 cArtifacts
37− , path "compile/errors.js" $ serveJavaScript errorJS
38− , path "compile/deps-info.json" $ serveDepsInfo depsInfo
39− , path "quotes" $ Quotes.endpoint
63+ [ path "compile" $ compile artifacts
64+ , path "compile/errors.js" $ writeBS errorJS
4065 , notFound
4166 ]
4267
4368
4469config :: Config Snap a
4570config =
46− setPort 8000 $ setAccessLog ConfigNoLog $ setErrorLog ConfigNoLog $ defaultConfig
71+ defaultConfig
72+ |> setPort 8000
73+ |> setAccessLog ConfigNoLog
74+ |> setErrorLog ConfigNoLog
75+
76+
77+(|>) :: a -> (a -> b) -> b
78+(|>) value func =
79+ func value
80+
4781
4882
49−status :: Snap ()
50−status =
51− do modifyResponse $ setContentType "text/plain"
52− writeBuilder "Status: OK"
83+-- NOT FOUND
5384
5485
5586notFound :: Snap ()
5687notFound =
5788 do modifyResponse $ setResponseStatus 404 "Not Found"
5889 modifyResponse $ setContentType "text/html; charset=utf-8"
59− writeBuilder "Not Found"
90+ writeBS "Not Found"
91+
92+
93+
94+-- COMPILE ENDPOINT
95+
96+
97+compile :: Artifacts -> Snap ()
98+compile artifacts =
99+ applyCORS corsOptions $ method POST $
100+ do result <- foldMultipart defaultUploadPolicy ignoreFile 0
101+ case result of
102+ ([("code",source)], 0) ->
103+ do modifyResponse $ setContentType "text/html; charset=utf-8"
104+ case compileToBuilder artifacts source of
105+ Right builder -> writeBuilder builder
106+ Left exit -> writeBuilder (exitToHtmlBuilder exit)
107+
108+ _ ->
109+ do modifyResponse $ setResponseStatus 400 "Bad Request"
110+ modifyResponse $ setContentType "text/html; charset=utf-8"
111+ writeBS
112+ "<p>Unexpected request format. This should not be possible!</p>\
113+ \<p>Please report this\
114+ \ <a href=\"https://github.com/elm/compiler/issues\">here</a>\
115+ \ along with the URL and your browser version.</p>"
116+
117+
118+ignoreFile :: PartInfo -> Stream.InputStream B.ByteString -> Int -> IO Int
119+ignoreFile _ _ count =
120+ return (count + 1)
121+
122+
123+exitToHtmlBuilder :: Exit.Worker -> B.Builder
124+exitToHtmlBuilder exit =
125+ let
126+ json =
127+ Encode.encodeUgly $ Exit.toJson $ Exit.workerToReport exit
128+ in
129+ [r|<!DOCTYPE HTML>
130+<html>
131+<head>
132+ <meta charset="UTF-8">
133+ <style>body { padding: 0; margin: 0; background-color: black; }</style>
134+ <script src="https://worker.elm-lang.org/compile/errors.js"></script>
135+</head>
136+<body>
137+ <script>Elm.Errors.init({flags:|] <> json <> [r|});</script>
138+</body>
139+</html>|]
140+
141+
142+
143+-- COMPILE TO BUILDER
144+
145+
146+compileToBuilder :: Artifacts -> B.ByteString -> Either Exit.Worker B.Builder
147+compileToBuilder (Artifacts interfaces objects) source =
148+ case Parse.fromByteString Pkg.dummyName source of
149+ Left err ->
150+ Left $ toInputError N._Main source (Error.BadSyntax err)
151+
152+ Right modul@(Src.Module _ _ _ imports _ _ _ _ _) ->
153+ case checkImports interfaces imports of
154+ Left err ->
155+ Left $ toInputError (Src.getName modul) source (Error.BadImports err)
156+
157+ Right ifaces ->
158+ case Compile.compile Pkg.dummyName ifaces modul of
159+ Left err ->
160+ Left $ toInputError (Src.getName modul) source err
161+
162+ Right (Compile.Artifacts canModule _ locals) ->
163+ case locals of
164+ Opt.LocalGraph Nothing _ _ ->
165+ Left Exit.WorkerNoMain
166+
167+ Opt.LocalGraph (Just main_) _ _ ->
168+ let
169+ mode = Mode.Dev Nothing
170+ home = Can._name canModule
171+ name = ModuleName._module home
172+ mains = Map.singleton home main_
173+ graph = Opt.addLocalGraph locals objects
174+ in
175+ Right $ Html.sandwich name $ Generate.generate mode graph mains
176+
177+
178+checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
179+checkImports interfaces imports =
180+ let
181+ importDict = Map.fromValues Src.getImportName imports
182+ missing = Map.difference importDict interfaces
183+ in
184+ case Map.elems missing of
185+ [] ->
186+ Right (Map.intersection interfaces importDict)
187+
188+ i:is ->
189+ let
190+ unimported = Map.keysSet (Map.difference interfaces importDict)
191+ toError (Src.Import (A.At region name) _ _) =
192+ Import.Error region name unimported Import.NotFound
193+ in
194+ Left (fmap toError (NE.List i is))
195+
196+
197+toInputError :: ModuleName.Raw -> B.ByteString -> Error.Error -> Exit.Worker
198+toInputError name source err =
199+ Exit.WorkerInputError $
200+ Error.Module name "/try" File.zeroTime source err
201+
202+
203+
204+-- COMPILE ERROR VIEWER
205+
206+
207+compileErrorViewer :: IO B.ByteString
208+compileErrorViewer =
209+ let
210+ run work =
211+ do result <- work
212+ case result of
213+ Right a -> return a
214+ Left _ -> error "problem building reactor/src/Errors.elm"
215+ in
216+ Dir.withCurrentDirectory "../reactor" $ BW.withScope $ \scope ->
217+ do let root = "."
218+ details <- run $ Details.load Reporting.silent scope root
219+ artifacts <- run $ Build.fromMains Reporting.silent root details (NE.List "src/Errors.elm" [])
220+ javascript <- run $ Task.run $ Generate.prod root details artifacts
221+ return $ LBS.toStrict $ B.toLazyByteString javascript
222+
223+
224+
225+-- CORS OPTIONS
226+
227+
228+corsOptions :: (Monad m) => CORSOptions m
229+corsOptions =
230+ let
231+ allowedOrigins = toOriginList [ "https://elm-lang.org", "https://package.elm-lang.org" ]
232+ allowedMethods = HashSet.singleton (HashableMethod POST)
233+ in
234+ CORSOptions
235+ { corsAllowOrigin = return allowedOrigins
236+ , corsAllowCredentials = return True
237+ , corsExposeHeaders = return HashSet.empty
238+ , corsAllowedMethods = return allowedMethods
239+ , corsAllowedHeaders = return
240+ }
241+
242+
243+toOriginList :: [String] -> OriginList
244+toOriginList origins =
245+ Origins $ mkOriginSet $
246+ case traverse parseURI origins of
247+ Just uris -> uris
248+ Nothing -> error "invalid entry given to toOriginList list"
249+
250+
251+
252+-- ARTIFACTS
253+
254+
255+data Artifacts =
256+ Artifacts
257+ { _ifaces :: Map.Map ModuleName.Raw I.Interface
258+ , _graph :: Opt.GlobalGraph
259+ }
260+
261+
262+loadArtifacts :: IO Artifacts
263+loadArtifacts =
264+ BW.withScope $ \scope ->
265+ do style <- Reporting.terminal
266+ root <- Dir.getCurrentDirectory
267+ result <- Details.load style scope root
268+ case result of
269+ Left _ ->
270+ error "Ran into some problem loading elm.json details"
271+
272+ Right details ->
273+ do omvar <- Details.loadObjects root details
274+ imvar <- Details.loadInterfaces root details
275+ mdeps <- readMVar imvar
276+ mobjs <- readMVar omvar
277+ case liftM2 (,) mdeps mobjs of
278+ Nothing ->
279+ error "Ran into some weird problem loading elm.json details"
280+
281+ Just (deps, objs) ->
282+ return $ Artifacts (toInterfaces deps) objs
283+
60284
285+toInterfaces :: Map.Map ModuleName.Canonical I.DependencyInterface -> Map.Map ModuleName.Raw I.Interface
286+toInterfaces deps =
287+ Map.mapMaybe toUnique $ Map.fromListWith OneOrMore.more $
288+ Map.elems (Map.mapMaybeWithKey getPublic deps)
61289
62−serveJavaScript :: BS.ByteString -> Snap ()
63−serveJavaScript javascript =
64− do modifyResponse $ setContentType "application/javascript"
65− writeBS javascript
66290
291+getPublic :: ModuleName.Canonical -> I.DependencyInterface -> Maybe (ModuleName.Raw, OneOrMore.OneOrMore I.Interface)
292+getPublic (ModuleName.Canonical _ name) dep =
293+ case dep of
294+ I.Public iface -> Just (name, OneOrMore.one iface)
295+ I.Private _ _ _ -> Nothing
67296
68−serveDepsInfo :: BS.ByteString -> Snap ()
69−serveDepsInfo json =
70− Cors.allow GET ["https://elm-lang.org"] $
71− do modifyResponse $ setContentType "application/json"
72− writeBS json
73297
298+toUnique :: OneOrMore.OneOrMore a -> Maybe a
299+toUnique oneOrMore =
300+ case oneOrMore of
301+ OneOrMore.One value -> Just value
302+ OneOrMore.More _ _ -> Nothing