on 678fc8e help sign in
.github/CONTRIBUTING.md+20−18
since splitsnapshots
unifiedsplit
@@ -4,15 +4,10 @@ Thanks helping with the development of Elm! This document describes the basic
4standards for opening pull requests and making the review process as smooth as
4standards for opening pull requests and making the review process as smooth as
5possible.
5possible.
6
6
7+## Licensing
7
8
8−## Expectations
9+You need to sign the [contributor agreement](ContributorAgreement.pdf)
9−
10+and send it to <info@elm-lang.org> before opening your pull request.
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−
16
11
17## Style Guide
12## Style Guide
18
13
@@ -22,20 +17,27 @@ Finally, please be patient with the core team. They are trying their best with l
22[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
17[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
23[js]: https://google.github.io/styleguide/javascriptguide.xml
18[js]: https://google.github.io/styleguide/javascriptguide.xml
24
19
25−
26## Branches
20## Branches
27
21
28−[The master branch][master] is the home of the next release of the compiler
22+ * [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
23+ so new features and improvements get merged there. Most pull requests
30−should target this branch!
24+ should target this branch!
31−
32−[master]: http://github.com/elm-lang/elm/tree/master
33
25
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.
34
29
35−## Licensing
30+[master]: http://github.com/elm-lang/elm/tree/master
36−
31+[stable]: http://github.com/elm-lang/elm/tree/stable
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:
38
32
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.
40
37
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.
41
42
43+[website]: https://github.com/elm-lang/elm-lang.org
.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
5cabal.sandbox.config
5cabal.sandbox.config
6.DS_Store
6.DS_Store
7*~
7*~
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.

builder/src/Http.hs+1−1
@@ -241,4 +241,4 @@ jsonPart name filePath value =
241
241
242stringPart :: String -> String -> Multi.Part
242stringPart :: String -> String -> Multi.Part
243stringPart name string =
243stringPart name string =
244− Multi.partBS (String.fromString name) (BS.pack string)
244+ Multi.partBS (String.fromString name) (BS.pack string)
builder/src/Reporting/Exit.hs+8−6
@@ -1282,7 +1282,8 @@ toDetailsReport details =
1282 "The dependencies in your elm.json are not compatible."
1282 "The dependencies in your elm.json are not compatible."
1283 [ D.fillSep
1283 [ D.fillSep
1284 ["Did","you","change","them","by","hand?","Try","to","change","it","back!"
1284 ["Did","you","change","them","by","hand?","Try","to","change","it","back!"
1285− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1285+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1286+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1286 ]
1287 ]
1287 , D.reflow $
1288 , D.reflow $
1288 "Please ask for help on the community forums if you try those paths and are still\
1289 "Please ask for help on the community forums if you try those paths and are still\
@@ -1299,7 +1300,8 @@ toDetailsReport details =
1299 \ get access to the registry!"
1300 \ get access to the registry!"
1300 , D.toFancyNote
1301 , D.toFancyNote
1301 ["If","you","changed","your","dependencies","by","hand,","try","to","change","them","back!"
1302 ["If","you","changed","your","dependencies","by","hand,","try","to","change","them","back!"
1302− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1303+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1304+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1303 ]
1305 ]
1304 ]
1306 ]
1305
1307
@@ -1335,7 +1337,8 @@ toDetailsReport details =
1335 \ party tool) leaving them in an invalid state."
1337 \ party tool) leaving them in an invalid state."
1336 [ D.fillSep
1338 [ D.fillSep
1337 ["Try","to","change","them","back","to","what","they","were","before!"
1339 ["Try","to","change","them","back","to","what","they","were","before!"
1338− ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install" <> "."
1340+ ,"It","is","much","more","reliable","to","add","dependencies","with",D.green "elm install"
1341+ ,"or","the","dependency","management","tool","in",D.green "elm reactor" <> "."
1339 ]
1342 ]
1340 , D.reflow $
1343 , D.reflow $
1341 "Please ask for help on the community forums if you try those paths and are still\
1344 "Please ask for help on the community forums if you try those paths and are still\
@@ -1522,7 +1525,7 @@ toHttpErrorReport title err context =
1522
1525
1523 Http.BadHttp url httpExceptionContent ->
1526 Http.BadHttp url httpExceptionContent ->
1524 case httpExceptionContent of
1527 case httpExceptionContent of
1525− HTTP.StatusCodeException response body ->
1528+ HTTP.StatusCodeException response _ ->
1526 let
1529 let
1527 (HTTP.Status code message) = HTTP.responseStatus response
1530 (HTTP.Status code message) = HTTP.responseStatus response
1528 in
1531 in
@@ -1530,7 +1533,6 @@ toHttpErrorReport title err context =
1530 [ D.fillSep $
1533 [ D.fillSep $
1531 ["But","it","came","back","as",D.red (D.fromInt code)]
1534 ["But","it","came","back","as",D.red (D.fromInt code)]
1532 ++ map D.fromChars (words (BS_UTF8.toString message))
1535 ++ map D.fromChars (words (BS_UTF8.toString message))
1533− , D.indent 4 $ D.reflow $ BS_UTF8.toString body
1534 , D.reflow $
1536 , D.reflow $
1535 "This may mean some online endpoint changed in an unexpected way, so if does not\
1537 "This may mean some online endpoint changed in an unexpected way, so if does not\
1536 \ seem like something on your side is causing this (e.g. firewall) please report\
1538 \ seem like something on your side is causing this (e.g. firewall) please report\
@@ -1968,7 +1970,7 @@ toGenerateReport problem =
1968 "The issue is that --optimize strips out info needed by `Debug` functions.\
1970 "The issue is that --optimize strips out info needed by `Debug` functions.\
1969 \ Here are two examples:"
1971 \ Here are two examples:"
1970 , D.indent 4 $ D.reflow $
1972 , D.indent 4 $ D.reflow $
1971− "(1) It shortens record field names. This makes the generated JavaScript\
1973+ "(1) It shortens record field names. This makes the generated JavaScript is\
1972 \ smaller, but `Debug.toString` cannot know the real field names anymore."
1974 \ smaller, but `Debug.toString` cannot know the real field names anymore."
1973 , D.indent 4 $ D.reflow $
1975 , D.indent 4 $ D.reflow $
1974 "(2) Values like `type Height = Height Float` are unboxed. This reduces\
1976 "(2) Values like `type Height = Height Float` are unboxed. This reduces\
compiler/src/AST/Utils/Type.hs+1
@@ -1,4 +1,5 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2+{-# LANGUAGE OverloadedStrings #-}
2module AST.Utils.Type
3module AST.Utils.Type
3 ( delambda
4 ( delambda
4 , dealias
5 , dealias
compiler/src/Canonicalize/Environment.hs+20−50
@@ -4,8 +4,6 @@ module Canonicalize.Environment
4 ( Env(..)
4 ( Env(..)
5 , Exposed
5 , Exposed
6 , Qualified
6 , Qualified
7− , Info(..)
8− , mergeInfo
9 , Var(..)
7 , Var(..)
10 , Type(..)
8 , Type(..)
11 , Ctor(..)
9 , Ctor(..)
@@ -22,8 +20,8 @@ module Canonicalize.Environment
22
20
23import qualified Data.Map.Merge.Strict as Map
21import qualified Data.Map.Merge.Strict as Map
24import qualified Data.Map.Strict as Map
22import qualified Data.Map.Strict as Map
23+import qualified Data.Map.Strict.Internal as I
25import qualified Data.Name as Name
24import qualified Data.Name as Name
26−import qualified Data.OneOrMore as OneOrMore
27
25
28import qualified AST.Utils.Binop as Binop
26import qualified AST.Utils.Binop as Binop
29import qualified AST.Canonical as Can
27import qualified AST.Canonical as Can
@@ -60,34 +58,11 @@ data Env =
60
58
61
59
62type Exposed a =
60type Exposed a =
63− Map.Map Name.Name (Info a)
61+ Map.Map Name.Name (Map.Map ModuleName.Canonical a)
64
62
65
63
66type Qualified a =
64type Qualified a =
67− Map.Map Name.Name (Map.Map Name.Name (Info a))
65+ Map.Map Name.Name (Map.Map Name.Name (Map.Map ModuleName.Canonical 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))
91
66
92
67
93
68
@@ -97,8 +72,7 @@ mergeInfo info1 info2 =
97data Var
72data Var
98 = Local A.Region
73 = Local A.Region
99 | TopLevel A.Region
74 | TopLevel A.Region
100− | Foreign ModuleName.Canonical Can.Annotation
75+ | Foreign (Map.Map ModuleName.Canonical Can.Annotation)
101− | Foreigns ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
102
76
103
77
104
78
@@ -165,10 +139,7 @@ addLocalLeft _ region =
165addLocalBoth :: Name.Name -> A.Region -> Var -> Result i w Var
139addLocalBoth :: Name.Name -> A.Region -> Var -> Result i w Var
166addLocalBoth name region var =
140addLocalBoth name region var =
167 case var of
141 case var of
168− Foreign _ _ ->
142+ Foreign _ ->
169− Result.ok (Local region)
170−
171− Foreigns _ _ ->
172 Result.ok (Local region)
143 Result.ok (Local region)
173
144
174 Local parentRegion ->
145 Local parentRegion ->
@@ -179,18 +150,17 @@ addLocalBoth name region var =
179
150
180
151
181
152
182−
183-- FIND TYPE
153-- FIND TYPE
184
154
185
155
186findType :: A.Region -> Env -> Name.Name -> Result i w Type
156findType :: A.Region -> Env -> Name.Name -> Result i w Type
187findType region (Env _ _ ts _ _ _ qts _) name =
157findType region (Env _ _ ts _ _ _ qts _) name =
188 case Map.lookup name ts of
158 case Map.lookup name ts of
189− Just (Specific _ tipe) ->
159+ Just (I.Bin 1 _ tipe _ _) ->
190 Result.ok tipe
160 Result.ok tipe
191
161
192− Just (Ambiguous h hs) ->
162+ Just homes ->
193− Result.throw (Error.AmbiguousType region Nothing name h hs)
163+ Result.throw (Error.AmbiguousType region Nothing name (Map.keys homes))
194
164
195 Nothing ->
165 Nothing ->
196 Result.throw (Error.NotFoundType region Nothing name (toPossibleNames ts qts))
166 Result.throw (Error.NotFoundType region Nothing name (toPossibleNames ts qts))
@@ -201,11 +171,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =
201 case Map.lookup prefix qts of
171 case Map.lookup prefix qts of
202 Just qualified ->
172 Just qualified ->
203 case Map.lookup name qualified of
173 case Map.lookup name qualified of
204− Just (Specific _ tipe) ->
174+ Just (I.Bin 1 _ tipe _ _) ->
205 Result.ok tipe
175 Result.ok tipe
206
176
207− Just (Ambiguous h hs) ->
177+ Just homes ->
208− Result.throw (Error.AmbiguousType region (Just prefix) name h hs)
178+ Result.throw (Error.AmbiguousType region (Just prefix) name (Map.keys homes))
209
179
210 Nothing ->
180 Nothing ->
211 Result.throw (Error.NotFoundType region (Just prefix) name (toPossibleNames ts qts))
181 Result.throw (Error.NotFoundType region (Just prefix) name (toPossibleNames ts qts))
@@ -221,11 +191,11 @@ findTypeQual region (Env _ _ ts _ _ _ qts _) prefix name =
221findCtor :: A.Region -> Env -> Name.Name -> Result i w Ctor
191findCtor :: A.Region -> Env -> Name.Name -> Result i w Ctor
222findCtor region (Env _ _ _ cs _ _ _ qcs) name =
192findCtor region (Env _ _ _ cs _ _ _ qcs) name =
223 case Map.lookup name cs of
193 case Map.lookup name cs of
224− Just (Specific _ ctor) ->
194+ Just (I.Bin 1 _ ctor _ _) ->
225 Result.ok ctor
195 Result.ok ctor
226
196
227− Just (Ambiguous h hs) ->
197+ Just homes ->
228− Result.throw (Error.AmbiguousVariant region Nothing name h hs)
198+ Result.throw (Error.AmbiguousVariant region Nothing name (Map.keys homes))
229
199
230 Nothing ->
200 Nothing ->
231 Result.throw (Error.NotFoundVariant region Nothing name (toPossibleNames cs qcs))
201 Result.throw (Error.NotFoundVariant region Nothing name (toPossibleNames cs qcs))
@@ -236,11 +206,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =
236 case Map.lookup prefix qcs of
206 case Map.lookup prefix qcs of
237 Just qualified ->
207 Just qualified ->
238 case Map.lookup name qualified of
208 case Map.lookup name qualified of
239− Just (Specific _ pattern) ->
209+ Just (I.Bin 1 _ pattern _ _) ->
240 Result.ok pattern
210 Result.ok pattern
241
211
242− Just (Ambiguous h hs) ->
212+ Just homes ->
243− Result.throw (Error.AmbiguousVariant region (Just prefix) name h hs)
213+ Result.throw (Error.AmbiguousVariant region (Just prefix) name (Map.keys homes))
244
214
245 Nothing ->
215 Nothing ->
246 Result.throw (Error.NotFoundVariant region (Just prefix) name (toPossibleNames cs qcs))
216 Result.throw (Error.NotFoundVariant region (Just prefix) name (toPossibleNames cs qcs))
@@ -256,11 +226,11 @@ findCtorQual region (Env _ _ _ cs _ _ _ qcs) prefix name =
256findBinop :: A.Region -> Env -> Name.Name -> Result i w Binop
226findBinop :: A.Region -> Env -> Name.Name -> Result i w Binop
257findBinop region (Env _ _ _ _ binops _ _ _) name =
227findBinop region (Env _ _ _ _ binops _ _ _) name =
258 case Map.lookup name binops of
228 case Map.lookup name binops of
259− Just (Specific _ binop) ->
229+ Just (I.Bin 1 _ binop _ _) ->
260 Result.ok binop
230 Result.ok binop
261
231
262− Just (Ambiguous h hs) ->
232+ Just homes ->
263− Result.throw (Error.AmbiguousBinop region name h hs)
233+ Result.throw (Error.AmbiguousBinop region name (Map.keys homes))
264
234
265 Nothing ->
235 Nothing ->
266 Result.throw (Error.NotFoundBinop region name (Map.keysSet binops))
236 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 =
105
105
106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a
106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a
107insert name region value dict =
107insert 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
109
109
110
110
111union :: Dict a -> Dict a -> Dict a
111union :: Dict a -> Dict a -> Dict a
compiler/src/Canonicalize/Environment/Foreign.hs+30−42
@@ -35,14 +35,7 @@ type Result i w a =
35createInitialEnv :: ModuleName.Canonical -> Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Result i w Env.Env
35createInitialEnv :: ModuleName.Canonical -> Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Result i w Env.Env
36createInitialEnv home ifaces imports =
36createInitialEnv home ifaces imports =
37 do (State vs ts cs bs qvs qts qcs) <- foldM (addImport ifaces) emptyState (toSafeImports home imports)
37 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)
38+ Result.ok (Env.Env home (Map.map Env.Foreign 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
46
39
47
40
48
41
@@ -68,7 +61,7 @@ emptyState =
68
61
69emptyTypes :: Env.Exposed Env.Type
62emptyTypes :: Env.Exposed Env.Type
70emptyTypes =
63emptyTypes =
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))
72
65
73
66
74
67
@@ -109,8 +102,8 @@ addImport ifaces (State vs ts cs bs qvs qts qcs) (Src.Import (A.At _ name) maybe
109 (Map.mapMaybeWithKey (unionToType home) unions)
102 (Map.mapMaybeWithKey (unionToType home) unions)
110 (Map.mapMaybeWithKey (aliasToType home) aliases)
103 (Map.mapMaybeWithKey (aliasToType home) aliases)
111
104
112− !vars = Map.map (Env.Specific home) defs
105+ !vars = Map.map (Map.singleton home) defs
113− !types = Map.map (Env.Specific home . fst) rawTypeInfo
106+ !types = Map.map (Map.singleton home . fst) rawTypeInfo
114 !ctors = Map.foldr (addExposed . snd) Map.empty rawTypeInfo
107 !ctors = Map.foldr (addExposed . snd) Map.empty rawTypeInfo
115
108
116 !qvs2 = addQualified prefix vars qvs
109 !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
136
129
137addExposed :: Env.Exposed a -> Env.Exposed a -> Env.Exposed a
130addExposed :: Env.Exposed a -> Env.Exposed a -> Env.Exposed a
138addExposed =
131addExposed =
139− Map.unionWith Env.mergeInfo
132+ Map.unionWith Map.union
140
133
141
134
142addQualified :: Name.Name -> Env.Exposed a -> Env.Qualified a -> Env.Qualified a
135addQualified :: Name.Name -> Env.Exposed a -> Env.Qualified a -> Env.Qualified a
@@ -157,7 +150,7 @@ unionToTypeHelp :: ModuleName.Canonical -> Name.Name -> Can.Union -> (Env.Type,
157unionToTypeHelp home name union@(Can.Union vars ctors _ _) =
150unionToTypeHelp home name union@(Can.Union vars ctors _ _) =
158 let
151 let
159 addCtor dict (Can.Ctor ctor index _ args) =
152 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
161 in
154 in
162 ( Env.Union (length vars) home
155 ( Env.Union (length vars) home
163 , List.foldl' addCtor Map.empty ctors
156 , List.foldl' addCtor Map.empty ctors
@@ -188,7 +181,7 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =
188 (Can.TAlias home name avars (Can.Filled tipe))
181 (Can.TAlias home name avars (Can.Filled tipe))
189 (Can.fieldsToList fields)
182 (Can.fieldsToList fields)
190 in
183 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))
192
185
193 _ ->
186 _ ->
194 Map.empty
187 Map.empty
@@ -199,9 +192,9 @@ aliasToTypeHelp home name (Can.Alias vars tipe) =
199-- BINOP
192-- BINOP
200
193
201
194
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
203binopToBinop home op (I.Binop name annotation associativity precedence) =
196binopToBinop 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)
205
198
206
199
207
200
@@ -221,7 +214,7 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =
221 Src.Lower (A.At region name) ->
214 Src.Lower (A.At region name) ->
222 case Map.lookup name vars of
215 case Map.lookup name vars of
223 Just info ->
216 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)
225
218
226 Nothing ->
219 Nothing ->
227 Result.throw (Error.ImportExposingNotFound region home name (Map.keys vars))
220 Result.throw (Error.ImportExposingNotFound region home name (Map.keys vars))
@@ -234,23 +227,23 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =
234 case tipe of
227 case tipe of
235 Env.Union _ _ ->
228 Env.Union _ _ ->
236 let
229 let
237− !ts2 = Map.insert name (Env.Specific home tipe) ts
230+ !ts2 = Map.insert name (Map.singleton home tipe) ts
238 in
231 in
239 Result.ok (State vs ts2 cs bs qvs qts qcs)
232 Result.ok (State vs ts2 cs bs qvs qts qcs)
240
233
241 Env.Alias _ _ _ _ ->
234 Env.Alias _ _ _ _ ->
242 let
235 let
243− !ts2 = Map.insert name (Env.Specific home tipe) ts
236+ !ts2 = Map.insert name (Map.singleton home tipe) ts
244 !cs2 = addExposed cs ctors
237 !cs2 = addExposed cs ctors
245 in
238 in
246 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
239 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
247
240
248 Nothing ->
241 Nothing ->
249− case checkForCtorMistake name types of
242+ case Map.lookup name (toCtors types) of
250− tipe:_ ->
243+ Just tipe ->
251 Result.throw $ Error.ImportCtorByName region name tipe
244 Result.throw $ Error.ImportCtorByName region name tipe
252
245
253− [] ->
246+ Nothing ->
254 Result.throw $ Error.ImportExposingNotFound region home name (Map.keys types)
247 Result.throw $ Error.ImportExposingNotFound region home name (Map.keys types)
255
248
256 Src.Public dotDotRegion ->
249 Src.Public dotDotRegion ->
@@ -259,7 +252,7 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =
259 case tipe of
252 case tipe of
260 Env.Union _ _ ->
253 Env.Union _ _ ->
261 let
254 let
262− !ts2 = Map.insert name (Env.Specific home tipe) ts
255+ !ts2 = Map.insert name (Map.singleton home tipe) ts
263 !cs2 = addExposed cs ctors
256 !cs2 = addExposed cs ctors
264 in
257 in
265 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
258 Result.ok (State vs ts2 cs2 bs qvs qts qcs)
@@ -282,23 +275,18 @@ addExposedValue home vars types binops (State vs ts cs bs qvs qts qcs) exposed =
282 Result.throw (Error.ImportExposingNotFound region home op (Map.keys binops))
275 Result.throw (Error.ImportExposingNotFound region home op (Map.keys binops))
283
276
284
277
278+
285−checkForCtorMistake :: Name.Name -> Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> [Name.Name]
279+toCtors :: Map.Map Name.Name (Env.Type, Env.Exposed Env.Ctor) -> Map.Map Name.Name Name.Name
286−checkForCtorMistake givenName types =
280+toCtors types =
287− Map.foldr addMatches [] types
281+ Map.foldr addCtors Map.empty types
288 where
282 where
289− addMatches (_, exposedCtors) matches =
283+ addCtors (_, exposedCtors) dict =
290− Map.foldrWithKey addMatch matches exposedCtors
284+ Map.foldrWithKey addCtor dict exposedCtors
291−
285+
292− addMatch ctorName info matches =
286+ addCtor ctorName homes dict =
293− if ctorName /= givenName
294− then matches
295− else
296− case info of
287+ case Map.elems homes of
297− Env.Specific _ (Env.Ctor _ tipeName _ _ _) ->
288+ [Env.Ctor _ tipeName _ _ _] ->
298− tipeName : matches
289+ Map.insert ctorName tipeName dict
299−
290+
300− Env.Specific _ (Env.RecordCtor _ _ _) ->
291+ _ ->
301− matches
292+ dict
302−
303− Env.Ambiguous _ _ ->
304− matches
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
110addUnion :: ModuleName.Canonical -> Env.Exposed Env.Type -> A.Located Src.Union -> Result i w (Env.Exposed Env.Type)
110addUnion :: ModuleName.Canonical -> Env.Exposed Env.Type -> A.Located Src.Union -> Result i w (Env.Exposed Env.Type)
111addUnion home types union@(A.At _ (Src.Union (A.At _ name) _ _)) =
111addUnion home types union@(A.At _ (Src.Union (A.At _ name) _ _)) =
112 do arity <- checkUnionFreeVars union
112 do arity <- checkUnionFreeVars union
113− let one = Env.Specific home (Env.Union arity home)
113+ let one = Map.singleton home (Env.Union arity home)
114 Result.ok $ Map.insert name one types
114 Result.ok $ Map.insert name one types
115
115
116
116
@@ -133,7 +133,7 @@ addAlias env@(Env.Env home vs ts cs bs qvs qts qcs) scc =
133 Graph.AcyclicSCC alias@(A.At _ (Src.Alias (A.At _ name) _ tipe)) ->
133 Graph.AcyclicSCC alias@(A.At _ (Src.Alias (A.At _ name) _ tipe)) ->
134 do args <- checkAliasFreeVars alias
134 do args <- checkAliasFreeVars alias
135 ctype <- Type.canonicalize env tipe
135 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)
137 let ts1 = Map.insert name one ts
137 let ts1 = Map.insert name one ts
138 Result.ok $ Env.Env home vs ts1 cs bs qvs qts qcs
138 Result.ok $ Env.Env home vs ts1 cs bs qvs qts qcs
139
139
@@ -281,7 +281,7 @@ addCtors (Src.Module _ _ _ _ _ unions aliases _ _) env@(Env.Env home vs ts cs bs
281 )
281 )
282
282
283
283
284−type CtorDups = Dups.Dict (Env.Info Env.Ctor)
284+type CtorDups = Dups.Dict (Map.Map ModuleName.Canonical Env.Ctor)
285
285
286
286
287
287
@@ -297,7 +297,7 @@ canonicalizeAlias env@(Env.Env home _ _ _ _ _ _ _) (A.At _ (Src.Alias (A.At regi
297 ,
297 ,
298 case ctipe of
298 case ctipe of
299 Can.TRecord fields Nothing ->
299 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))
301
301
302 _ ->
302 _ ->
303 Dups.none
303 Dups.none
@@ -351,5 +351,5 @@ toOpts ctors =
351
351
352toCtor :: ModuleName.Canonical -> Name.Name -> Can.Union -> A.Located Can.Ctor -> CtorDups
352toCtor :: ModuleName.Canonical -> Name.Name -> Can.Union -> A.Located Can.Ctor -> CtorDups
353toCtor home typeName union (A.At region (Can.Ctor name index _ args)) =
353toCtor 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 $
355 Env.Ctor home typeName union index args
355 Env.Ctor home typeName union index args
compiler/src/Canonicalize/Expression.hs+7−6
@@ -14,6 +14,7 @@ import Control.Monad (foldM)
14import qualified Data.Graph as Graph
14import qualified Data.Graph as Graph
15import qualified Data.List as List
15import qualified Data.List as List
16import qualified Data.Map.Strict as Map
16import qualified Data.Map.Strict as Map
17+import qualified Data.Map.Strict.Internal as I
17import qualified Data.Name as Name
18import qualified Data.Name as Name
18
19
19import qualified AST.Canonical as Can
20import qualified AST.Canonical as Can
@@ -695,15 +696,15 @@ findVar region (Env.Env localHome vs _ _ _ qvs _ _) name =
695 Env.TopLevel _ ->
696 Env.TopLevel _ ->
696 logVar name (Can.VarTopLevel localHome name)
697 logVar name (Can.VarTopLevel localHome name)
697
698
698− Env.Foreign home annotation ->
699+ Env.Foreign (I.Bin 1 home annotation _ _) ->
699 Result.ok $
700 Result.ok $
700 if home == ModuleName.debug then
701 if home == ModuleName.debug then
701 Can.VarDebug localHome name annotation
702 Can.VarDebug localHome name annotation
702 else
703 else
703 Can.VarForeign home name annotation
704 Can.VarForeign home name annotation
704
705
705− Env.Foreigns h hs ->
706+ Env.Foreign homes ->
706− Result.throw (Error.AmbiguousVar region Nothing name h hs)
707+ Result.throw (Error.AmbiguousVar region Nothing name (Map.keys homes))
707
708
708 Nothing ->
709 Nothing ->
709 Result.throw (Error.NotFoundVar region Nothing name (toPossibleNames vs qvs))
710 Result.throw (Error.NotFoundVar region Nothing name (toPossibleNames vs qvs))
@@ -714,15 +715,15 @@ findVarQual region (Env.Env localHome vs _ _ _ qvs _ _) prefix name =
714 case Map.lookup prefix qvs of
715 case Map.lookup prefix qvs of
715 Just qualified ->
716 Just qualified ->
716 case Map.lookup name qualified of
717 case Map.lookup name qualified of
717− Just (Env.Specific home annotation) ->
718+ Just (I.Bin 1 home annotation _ _) ->
718 Result.ok $
719 Result.ok $
719 if home == ModuleName.debug then
720 if home == ModuleName.debug then
720 Can.VarDebug localHome name annotation
721 Can.VarDebug localHome name annotation
721 else
722 else
722 Can.VarForeign home name annotation
723 Can.VarForeign home name annotation
723
724
724− Just (Env.Ambiguous h hs) ->
725+ Just homes ->
725− Result.throw (Error.AmbiguousVar region (Just prefix) name h hs)
726+ Result.throw (Error.AmbiguousVar region (Just prefix) name (Map.keys homes))
726
727
727 Nothing ->
728 Nothing ->
728 Result.throw (Error.NotFoundVar region (Just prefix) name (toPossibleNames vs qvs))
729 Result.throw (Error.NotFoundVar region (Just prefix) name (toPossibleNames vs qvs))
compiler/src/Canonicalize/Pattern.hs+2−3
@@ -8,7 +8,6 @@ module Canonicalize.Pattern
8 where
8 where
9
9
10
10
11−import qualified Data.List as List
12import qualified Data.Map.Strict as Map
11import qualified Data.Map.Strict as Map
13import qualified Data.Name as Name
12import qualified Data.Name as Name
14
13
@@ -174,8 +173,8 @@ logVar name region value =
174logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a
173logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a
175logFields fields value =
174logFields fields value =
176 let
175 let
177− addField dict (A.At region name) =
176+ addField (A.At region name) dict =
178 Dups.insert name region region dict
177 Dups.insert name region region dict
179 in
178 in
180 Result.Result $ \bindings warnings _ ok ->
179 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/Utf8.hs+1−3
@@ -261,9 +261,7 @@ instance Eq (Utf8 t) where
261
261
262
262
263-- COMPARE
263-- COMPARE
264−--
264+
265−-- TODO: is it fine to sort by length and only compare bytes on length ties?
266−--
267
265
268instance Ord (Utf8 t) where
266instance Ord (Utf8 t) where
269 compare (Utf8 ba1#) (Utf8 ba2#) =
267 compare (Utf8 ba1#) (Utf8 ba2#) =
compiler/src/Elm/ModuleName.hs+6−2
@@ -7,13 +7,12 @@ module Elm.ModuleName
7 --
7 --
8 , encode
8 , encode
9 , decoder
9 , decoder
10− , parser
11 --
10 --
12 , Canonical(..)
11 , Canonical(..)
13 , basics, char, string
12 , basics, char, string
14 , maybe, result, list, array, dict, tuple
13 , maybe, result, list, array, dict, tuple
15 , platform, cmd, sub
14 , platform, cmd, sub
16− , debug
15+ , debug, bitwise
17 , virtualDom
16 , virtualDom
18 , jsonDecode, jsonEncode
17 , jsonDecode, jsonEncode
19 , webgl, texture, vector2, vector3, vector4, matrix4
18 , webgl, texture, vector2, vector3, vector4, matrix4
@@ -226,6 +225,11 @@ debug :: Canonical
226debug = Canonical Pkg.core Name.debug
225debug = Canonical Pkg.core Name.debug
227
226
228
227
228+{-# NOINLINE bitwise #-}
229+bitwise :: Canonical
230+bitwise = Canonical Pkg.core Name.bitwise
231+
232+
229
233
230-- HTML
234-- HTML
231
235
compiler/src/Parse/Pattern.hs+1−1
@@ -129,7 +129,7 @@ recordHelp start vars =
129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd
129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd
130 recordHelp start (var:vars)
130 recordHelp start (var:vars)
131 , do word1 0x7D {-}-} E.PRecordEnd
131 , do word1 0x7D {-}-} E.PRecordEnd
132− addEnd start (Src.PRecord (reverse vars))
132+ addEnd start (Src.PRecord vars)
133 ]
133 ]
134
134
135
135
compiler/src/Reporting/Error/Canonicalize.hs+16−21
@@ -14,10 +14,8 @@ module Reporting.Error.Canonicalize
14
14
15
15
16import qualified Data.Char as Char
16import qualified Data.Char as Char
17−import qualified Data.List as List
18import qualified Data.Map as Map
17import qualified Data.Map as Map
19import qualified Data.Name as Name
18import qualified Data.Name as Name
20−import qualified Data.OneOrMore as OneOrMore
21import qualified Data.Set as Set
19import qualified Data.Set as Set
22
20
23import qualified AST.Canonical as Can
21import qualified AST.Canonical as Can
@@ -39,10 +37,10 @@ import qualified Reporting.Suggest as Suggest
39
37
40data Error
38data Error
41 = AnnotationTooShort A.Region Name.Name Index.ZeroBased Int
39 = AnnotationTooShort A.Region Name.Name Index.ZeroBased Int
42− | AmbiguousVar A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
40+ | AmbiguousVar A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
43− | AmbiguousType A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
41+ | AmbiguousType A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
44− | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
42+ | AmbiguousVariant A.Region (Maybe Name.Name) Name.Name [ModuleName.Canonical]
45− | AmbiguousBinop A.Region Name.Name ModuleName.Canonical (OneOrMore.OneOrMore ModuleName.Canonical)
43+ | AmbiguousBinop A.Region Name.Name [ModuleName.Canonical]
46 | BadArity A.Region BadArityContext Name.Name Int Int
44 | BadArity A.Region BadArityContext Name.Name Int Int
47 | Binop A.Region Name.Name Name.Name
45 | Binop A.Region Name.Name Name.Name
48 | DuplicateDecl Name.Name A.Region A.Region
46 | DuplicateDecl Name.Name A.Region A.Region
@@ -166,17 +164,17 @@ toReport source err =
166 <> " be deleted? Maybe some parentheses are missing?"
164 <> " be deleted? Maybe some parentheses are missing?"
167 )
165 )
168
166
169− AmbiguousVar region maybePrefix name h hs ->
167+ AmbiguousVar region maybePrefix name possibleHomes ->
170− ambiguousName source region maybePrefix name h hs "variable"
168+ ambiguousName source region maybePrefix name possibleHomes "variable"
171
169
172− AmbiguousType region maybePrefix name h hs ->
170+ AmbiguousType region maybePrefix name possibleHomes ->
173− ambiguousName source region maybePrefix name h hs "type"
171+ ambiguousName source region maybePrefix name possibleHomes "type"
174
172
175− AmbiguousVariant region maybePrefix name h hs ->
173+ AmbiguousVariant region maybePrefix name possibleHomes ->
176− ambiguousName source region maybePrefix name h hs "variant"
174+ ambiguousName source region maybePrefix name possibleHomes "variant"
177
175
178− AmbiguousBinop region name h hs ->
176+ AmbiguousBinop region name possibleHomes ->
179− ambiguousName source region Nothing name h hs "operator"
177+ ambiguousName source region Nothing name possibleHomes "operator"
180
178
181 BadArity region badArityContext name expected actual ->
179 BadArity region badArityContext name expected actual ->
182 let
180 let
@@ -679,7 +677,7 @@ toReport source err =
679 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
677 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
680 ,
678 ,
681 D.stack
679 D.stack
682− [ makeTheory "Are you trying to mutate a variable?" $
680+ [ makeTheory "Are you are trying to mutate a variable?" $
683 "Elm does not have mutation, so when I see " ++ Name.toChars name
681 "Elm does not have mutation, so when I see " ++ Name.toChars name
684 ++ " defined in terms of " ++ Name.toChars name
682 ++ " defined in terms of " ++ Name.toChars name
685 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
683 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -725,7 +723,7 @@ toReport source err =
725 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
723 "The `" <> Name.toChars name <> "` value is defined directly in terms of itself, causing an infinite loop."
726 ,
724 ,
727 D.stack
725 D.stack
728− [ makeTheory "Are you trying to mutate a variable?" $
726+ [ makeTheory "Are you are trying to mutate a variable?" $
729 "Elm does not have mutation, so when I see " ++ Name.toChars name
727 "Elm does not have mutation, so when I see " ++ Name.toChars name
730 ++ " defined in terms of " ++ Name.toChars name
728 ++ " defined in terms of " ++ Name.toChars name
731 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
729 ++ ", I treat it as a recursive definition. Try giving the new value a new name!"
@@ -976,11 +974,8 @@ nameClash source r1 r2 messageThatEndsWithPunctuation =
976-- AMBIGUOUS NAME
974-- AMBIGUOUS NAME
977
975
978
976
979−ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> ModuleName.Canonical -> OneOrMore.OneOrMore ModuleName.Canonical -> String -> Report.Report
977+ambiguousName :: Code.Source -> A.Region -> Maybe Name.Name -> Name.Name -> [ModuleName.Canonical] -> String -> Report.Report
980−ambiguousName source region maybePrefix name h hs thing =
978+ambiguousName source region maybePrefix name possibleHomes thing =
981− let
982− possibleHomes = List.sort (h : OneOrMore.destruct (:) hs)
983− in
984 Report.Report "AMBIGUOUS NAME" region [] $
979 Report.Report "AMBIGUOUS NAME" region [] $
985 Code.toSnippet source region Nothing $
980 Code.toSnippet source region Nothing $
986 case maybePrefix of
981 case maybePrefix of
compiler/src/Reporting/Error/Pattern.hs+2−2
@@ -41,7 +41,7 @@ toReport source err =
41 Report.Report "UNSAFE PATTERN" region [] $
41 Report.Report "UNSAFE PATTERN" region [] $
42 Code.toSnippet source region Nothing
42 Code.toSnippet source region Nothing
43 (
43 (
44− "This pattern does not cover all possibilities:"
44+ "This pattern does not cover all possiblities:"
45 ,
45 ,
46 D.stack
46 D.stack
47 [ "Other possibilities include:"
47 [ "Other possibilities include:"
@@ -64,7 +64,7 @@ toReport source err =
64 , unhandledPatternsToDocBlock unhandled
64 , unhandledPatternsToDocBlock unhandled
65 , D.reflow $
65 , D.reflow $
66 "I would have to crash if I saw one of those! You can use\
66 "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.\
68 \ Switch to a `case` expression to account for all possibilities."
68 \ Switch to a `case` expression to account for all possibilities."
69 , D.toSimpleHint $
69 , D.toSimpleHint $
70 "Are you calling a function that definitely returns values\
70 "Are you calling a function that definitely returns values\
compiler/src/Reporting/Error/Syntax.hs+1−1
@@ -2591,7 +2591,7 @@ toExprReport source context expr startRow startCol =
2591 ,"give","a","more","specific","hint!"
2591 ,"give","a","more","specific","hint!"
2592 ]
2592 ]
2593 , D.toSimpleNote $
2593 , D.toSimpleNote $
2594− "This can also happen if I run into reserved words like `let` or `as` unexpectedly.\
2594+ "This can also happen if run into reserved words like `let` or `as` unexpectedly.\
2595 \ Or if I run into operators in unexpected spots. Point is, there are a\
2595 \ Or if I run into operators in unexpected spots. Point is, there are a\
2596 \ couple ways I can get confused and give sort of weird advice!"
2596 \ couple ways I can get confused and give sort of weird advice!"
2597 ]
2597 ]
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
8 "source-directories": [
8 "source-directories": [
9 "src"
9 "src"
10 ],
10 ],
11− "elm-version": "0.19.1",
11+ "elm-version": "0.19.0",
12 "dependencies": {
12 "dependencies": {
13 "direct": {
13 "direct": {
14 "elm/browser": "1.0.0",
14 "elm/browser": "1.0.0",
@@ -48,7 +48,7 @@ A list of directories where Elm code lives. Most projects just use `"src"` for e
48
48
49## `"elm-version"`
49## `"elm-version"`
50
50
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!
52
52
53<br>
53<br>
54
54
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
49
49
50## `"license"`
50## `"license"`
51
51
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/).
53
53
54<br>
54<br>
55
55
hints/implicit-casts.md+3
@@ -16,6 +16,9 @@ Languages that will add in implicit casts for addition include:
16
16
17These languages generally agree that an `Int` may be implicitly cast to a `Float` when necessary. So everyone is doing it, why not Elm?!
17These languages generally agree that an `Int` may be implicitly cast to a `Float` when necessary. So everyone is doing it, why not Elm?!
18
18
19+> **Note:** Ruby does not follow the trend. They implicitly cast a `Float` to an `Int`, truncating all the decimal points!
20+
21+
19## Type Inference + Implicit Casts
22## Type Inference + Implicit Casts
20
23
21Elm comes from the ML-family of languages. Languages in the ML-family that **never** do implicit casts include:
24Elm comes from the ML-family of languages. Languages in the ML-family that **never** do implicit casts include:
hints/optimize.md+2−2
@@ -21,7 +21,7 @@ Putting those together, here is how I would optimize `src/Main.elm` with two ter
21
21
22```bash
22```bash
23elm make src/Main.elm --optimize --output=elm.js
23elm 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
25```
25```
26
26
27After this you will have an `elm.js` and a significantly smaller `elm.min.js` file!
27After this you will have an `elm.js` and a significantly smaller `elm.min.js` file!
@@ -46,7 +46,7 @@ min="elm.min.js"
46
46
47elm make --optimize --output=$js $@
47elm make --optimize --output=$js $@
48
48
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
50
50
51echo "Initial size: $(cat $js | wc -c) bytes ($js)"
51echo "Initial size: $(cat $js | wc -c) bytes ($js)"
52echo "Minified size:$(cat $min | wc -c) bytes ($min)"
52echo "Minified size:$(cat $min | wc -c) bytes ($min)"
installers/README.md−2
@@ -11,8 +11,6 @@ The secret is that Elm is just a single executable file. If you are developing a
11
11
12The 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.)
12The 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
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
14
17<br/>
15<br/>
18
16
installers/linux/Dockerfile+19−33
@@ -1,39 +1,25 @@
1−# Based initially on https://gist.github.com/rlefevre/1523f47e75310e28eee243c9c5651ac9
1+# Create: 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
2+# Delete: docker system prune -a ; docker images -a
17
3
18−# Use Alpine 3.11 with GHC 8.6.5
19−FROM alpine:3.11
4+FROM alpine:3.10
20
5
21−# Install packages required to build elm
6+# branch
22−RUN apk add --no-cache ghc cabal wget musl-dev zlib-dev zlib-static ncurses-dev ncurses-static
7+ARG branch=master
8+# commit or tag
9+ARG commit=HEAD
23
10
24−WORKDIR /elm
11+# Install required packages
12+RUN apk add --update ghc cabal git musl-dev zlib-dev ncurses-dev ncurses-static wget
25
13
26−# Import source code
14+# Checkout elm compiler
27−COPY builder builder
15+WORKDIR /tmp
28−COPY compiler compiler
16+RUN git clone -b $branch https://github.com/elm/compiler.git
29−COPY reactor reactor
30−COPY terminal terminal
31−COPY cabal.config elm.cabal LICENSE ./
32
17
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
34RUN cabal new-update
22RUN cabal new-update
35−RUN cabal new-build --ghc-option=-optl=-static --ghc-option=-split-sections
23+RUN cabal new-configure --disable-executable-dynamic --ghc-option=-optl=-static --ghc-option=-optl=-pthread
24+RUN cabal new-build
36−RUN cp ./dist-newstyle/build/x86_64-linux/ghc-*/elm-*/x/elm/build/elm/elm /usr/local/bin/elm
25+RUN strip -s ./dist-newstyle/build/x86_64-linux/ghc-8.4.3/elm-0.19.1/x/elm/build/elm/elm
37−
38−# Remove debug symbols to optimize the binary size
39−RUN strip -s /usr/local/bin/elm
installers/linux/README.md+2−2
@@ -9,7 +9,7 @@ It should be possible to install it by running the following commands in your te
9#
9#
10cd ~/Desktop/
10cd ~/Desktop/
11
11
12−# Download the 0.19.1 binary for Linux.
12+# Download the 0.19.0 binary for Linux.
13#
13#
14# +-----------+----------------------+
14# +-----------+----------------------+
15# | FLAG | MEANING |
15# | FLAG | MEANING |
@@ -18,7 +18,7 @@ cd ~/Desktop/
18# | -o elm.gz | name the file elm.gz |
18# | -o elm.gz | name the file elm.gz |
19# +-----------+----------------------+
19# +-----------+----------------------+
20#
20#
21−curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
21+curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.0/binary-for-linux-64-bit.gz
22
22
23# There should now be a file named `elm.gz` on your Desktop.
23# There should now be a file named `elm.gz` on your Desktop.
24#
24#
installers/mac/README.md+3−5
@@ -1,15 +1,13 @@
1# Install Instructions
1# Install Instructions
2
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:
3+It is easier to use the Mac installer, but it should be possible to install by running the following commands in your terminal:
6
4
7```bash
5```bash
8# Move to your Desktop so you can see what is going on easier.
6# Move to your Desktop so you can see what is going on easier.
9#
7#
10cd ~/Desktop/
8cd ~/Desktop/
11
9
12−# Download the 0.19.1 binary for Linux.
10+# Download the 0.19.0 binary for Linux.
13#
11#
14# +-----------+----------------------+
12# +-----------+----------------------+
15# | FLAG | MEANING |
13# | FLAG | MEANING |
@@ -18,7 +16,7 @@ cd ~/Desktop/
18# | -o elm.gz | name the file elm.gz |
16# | -o elm.gz | name the file elm.gz |
19# +-----------+----------------------+
17# +-----------+----------------------+
20#
18#
21−curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-mac-64-bit.gz
19+curl -L -o elm.gz https://github.com/elm/compiler/releases/download/0.19.0/binary-for-mac-64-bit.gz
22
20
23# There should now be a file named `elm.gz` on your Desktop.
21# There should now be a file named `elm.gz` on your Desktop.
24#
22#
installers/mac/make-installer.sh+3−30
@@ -29,8 +29,7 @@ cp $(pwd)/preinstall $pkg_scripts
29cp $(pwd)/postinstall $pkg_scripts
29cp $(pwd)/postinstall $pkg_scripts
30
30
31pkgbuild \
31pkgbuild \
32− --sign "Developer ID Installer: <NAME>" \
33− --identifier org.elm-lang.binary \
32+ --identifier org.elm-lang.binaries.pkg \
34 --install-location $usr_binaries \
33 --install-location $usr_binaries \
35 --scripts $pkg_scripts \
34 --scripts $pkg_scripts \
36 --filter 'Scripts.*' \
35 --filter 'Scripts.*' \
@@ -40,42 +39,16 @@ pkgbuild \
40
39
41#### BUNDLE ASSETS ####
40#### BUNDLE ASSETS ####
42
41
43−rm -f installer-for-mac.pkg
42+rm -f Elm.pkg
44
43
45productbuild \
44productbuild \
46− --sign "Developer ID Installer: <NAME>" \
47− --identifier org.elm-lang.installer \
48 --distribution Distribution.xml \
45 --distribution Distribution.xml \
49 --package-path . \
46 --package-path . \
50 --resources Resources \
47 --resources Resources \
51− installer-for-mac.pkg
48+ Elm.pkg
52
49
53
50
54#### CLEAN UP ####
51#### CLEAN UP ####
55
52
56rm binaries.pkg
53rm binaries.pkg
57rm -rf $pkg_root
54rm -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
2
2
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.
4
4
5+## 1. Create tarballs of binaries
5
6
6−## 1. GitHub Release
7+You can find a list of what binaries we'll need to tar up in `index.js`.
7
8
8−Create a [GitHub Release](https://github.com/elm/compiler/releases) with the following files:
9+For example:
9
10
10−1. `binary-for-mac-64-bit.gz`
11+```javascript
11−2. `binary-for-windows-64-bit.gz`
12+var root =
12−3. `binary-for-linux-64-bit.gz`
13+ "https://github.com/elm/compiler/releases/download/" +
14+ binVersion +
15+ "/binaries-for-";
13
16
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:
15
29
30+1. `binaries-for-mac.tar.gz`
31+2. `binaries-for-windows.tar.gz`
32+3. `binaries-for-linux.tar.gz`
16
33
17−## 2. Try a beta release
34+Each of these tarballs should have **only the Elm binary** inside them - no
35+directories!
18
36
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:
20
39
21−```bash
40+```shell
22−npm publish --tag beta
41+$ tar cvzf binaries-for-linux.tar.gz elm
23```
42```
24
43
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:
26
80
27−```bash
81+```shell
28−npm dist-tags ls elm
82+$ git tag 0.19.0
29−npm install elm@beta --ignore-scripts
83+$ git push origin 0.19.0
30```
84```
31
85
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.
33
87
34−Try this on Windows, Linux, and Mac.
88+## 5. Upload binaries
35
89
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.
36
94
37−## 3. Publish final release
95+Upload the tarballs you created in step 1.
38
96
39−Remove the `-beta` suffix from the version in `package.json`. Then run:
97+## 6. Publish beta release
40
98
41−```bash
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
42−npm publish
105+$ npm publish --tag beta
43```
106```
44
107
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+```
45
114
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.
47
119
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
49
121
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.
51
123
52−```bash
124+Then run this:
53−npm dist-tag add elm@0.19.1-3 latest-0.19.1
125+
126+```shell
127+$ npm install elm@beta --ignore-scripts
54```
128```
55
129
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`
57
163
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.
59
166
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+15−26
@@ -1,45 +1,34 @@
1−# Elm Installer
1+# npm install elm
2
2
3[Elm](https://elm-lang.org) is a functional programming language that compiles to JavaScript.
3[Elm](https://elm-lang.org) is a functional programming language that compiles to JavaScript.
4
4
5−Head over to [The Official Guide](https://guide.elm-lang.org/) to start learning Elm!
5+There are installers for Mac and Windows available [here](https://github.com/elm/compiler/releases/tag/0.19.1). There are also binaries for direct download. These are the most reliable ways to install Elm.
6
6
7+This package tries to download those binaries with `npm`. It is sometimes used by people intergating Elm into existing projects or workflows.
7
8
8<br/>
9<br/>
9
10
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
11
16−**Multiple versions** ✅
12+## Install
17
13
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.
14+The following command should download the `elm` binary:
19
15
20−**Continuous integration** ⚠️
16+```
17+npm install -g elm
18+```
21
19
22−This works, but there are usually faster and more reliable options:
20+If this runs successfully, the `elm` binary should be available at:
23
21
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.
22+- `/usr/local/bin/elm` on Mac and Linux
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.
23+- `C:\Users\YOUR_NAME\AppData\Roaming\npm\` on Windows
26
24
27−That said, it will definitely work to use the `npm` installer on CI if you prefer that option.
25+It should be possible to run `elm` from your terminal after this.
28
26
27+If you run into trouble, check out [troubleshooting.md](troubleshooting.md).
29
28
30<br/>
29<br/>
31
30
32−## Install Locally
33−
34−The following command should download the latest Elm 0.19.1 binary:
35
31
36−```
32+## What is next?
37−npm install elm@latest-0.19.1
38−```
39−
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.
41−
42−Use `npm install elm@latest-0.19.0` or `npm install elm@latest-0.18.0` for earlier versions.
43−
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.
45
33
34+Head over to [The Official Guide](https://guide.elm-lang.org/) to start learning Elm!
installers/npm/bin/elm+3−10
@@ -32,16 +32,9 @@ var binaryPath = path.resolve(__dirname, 'elm') + (process.platform === 'win32'
32// Run the command directly if possible, otherwise download and then run.
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.
33// This check is important for Windows where this file will be run all the time.
34//
34//
35−if (process.platform === 'win32')
36−{
37− fs.existsSync(binaryPath)
35+fs.existsSync(binaryPath)
38− ? runCommand()
36+ ? runCommand()
39− : require('../download.js')(runCommand);
37+ : require('../download.js')(runCommand);
40−}
41−else
42−{
43− require('../download.js')(runCommand);
44−}
45
38
46
39
47function runCommand()
40function runCommand()
installers/npm/download.js+4−36
@@ -16,22 +16,14 @@ module.exports = function(callback)
16{
16{
17 // figure out URL of binary
17 // figure out URL of binary
18 var version = package.version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); // turn '1.2.3-alpha' into '1.2.3'
18 var version = package.version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); // turn '1.2.3-alpha' into '1.2.3'
19−
19+ var os = { 'darwin': 'mac', 'win32': 'windows', 'linux': 'linux' }[process.platform];
20− var platform = {
20+ var arch = { 'x64': '64-bit', 'ia32': '32-bit' }[process.arch];
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];
26−
27− verifyPlatform(version, platform);
28−
29− var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + platform + '.gz';
21+ var url = 'https://github.com/elm/compiler/releases/download/' + version + '/binary-for-' + os + '-' + arch + '.gz';
30
22
31 reportDownload(version, url);
23 reportDownload(version, url);
32
24
33 // figure out where to put the binary (calls path.resolve() to get path separators right on Windows)
25 // 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' : '');
26+ var binaryPath = path.resolve(__dirname, package.bin) + (process.platform === 'win32' ? '.exe' : '');
35
27
36 // set up handler for request failure
28 // set up handler for request failure
37 function reportDownloadFailure(error)
29 function reportDownloadFailure(error)
@@ -58,30 +50,6 @@ module.exports = function(callback)
58
50
59
51
60
52
61−// VERIFY PLATFORM
62−
63−
64−function verifyPlatform(version, platform)
65−{
66− if (platform) return;
67−
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);
81−}
82−
83−
84−
85// EXIT FAILURE
53// EXIT FAILURE
86
54
87
55
installers/npm/package.json+2−2
@@ -1,6 +1,6 @@
1{
1{
2 "name": "elm",
2 "name": "elm",
3− "version": "0.19.1-5",
3+ "version": "0.19.1",
4 "description": "Installer for Elm: just downloads the binary into node_modules",
4 "description": "Installer for Elm: just downloads the binary into node_modules",
5 "preferGlobal": true,
5 "preferGlobal": true,
6 "license": "BSD-3-Clause",
6 "license": "BSD-3-Clause",
@@ -35,7 +35,7 @@
35 "install",
35 "install",
36 "installer"
36 "installer"
37 ],
37 ],
38− "bin": { "elm": "bin/elm" },
38+ "bin": "bin/elm",
39 "dependencies": {
39 "dependencies": {
40 "request": "^2.88.0"
40 "request": "^2.88.0"
41 }
41 }
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!
worker/elm.cabal−3
@@ -52,7 +52,6 @@ Executable worker
52 Artifacts
52 Artifacts
53 Cors
53 Cors
54 Endpoint.Compile
54 Endpoint.Compile
55− Endpoint.Quotes
56 Endpoint.Repl
55 Endpoint.Repl
57
56
58 AST.Canonical
57 AST.Canonical
@@ -174,7 +173,6 @@ Executable worker
174 ansi-terminal >= 0.8 && < 0.9,
173 ansi-terminal >= 0.8 && < 0.9,
175 ansi-wl-pprint >= 0.6.8 && < 0.7,
174 ansi-wl-pprint >= 0.6.8 && < 0.7,
176 base >=4.11 && <5,
175 base >=4.11 && <5,
177− base64-bytestring,
178 binary >= 0.8 && < 0.9,
176 binary >= 0.8 && < 0.9,
179 bytestring >= 0.9 && < 0.11,
177 bytestring >= 0.9 && < 0.11,
180 containers >= 0.5.8.2 && < 0.6,
178 containers >= 0.5.8.2 && < 0.6,
@@ -195,7 +193,6 @@ Executable worker
195 network-uri,
193 network-uri,
196 parsec,
194 parsec,
197 process,
195 process,
198− random,
199 raw-strings-qq,
196 raw-strings-qq,
200 scientific,
197 scientific,
201 SHA,
198 SHA,
worker/src/Endpoint/Compile.hs+19−109
@@ -1,8 +1,7 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
2{-# LANGUAGE OverloadedStrings, QuasiQuotes #-}
3module Endpoint.Compile
3module Endpoint.Compile
4− ( endpoint_V1
4+ ( endpoint
5− , endpoint_V2
6 , loadErrorJS
5 , loadErrorJS
7 )
6 )
8 where
7 where
@@ -64,50 +63,26 @@ allowedOrigins =
64
63
65
64
66
65
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
66-- ENDPOINT
92
67
93
68
94−data Result
95− = Ok N.Name B.Builder
96− | Err Help.Report
97−
98−
99−endpoint :: A.Artifacts -> (Result -> Snap ()) -> Snap ()
69+endpoint :: A.Artifacts -> Snap ()
100−endpoint artifacts callback =
70+endpoint artifacts =
101 Cors.allow POST allowedOrigins $
71 Cors.allow POST allowedOrigins $
102 do result <- foldMultipart defaultUploadPolicy ignoreFile 0
72 do result <- foldMultipart defaultUploadPolicy ignoreFile 0
103 case result of
73 case result of
104 ([("code",source)], 0) ->
74 ([("code",source)], 0) ->
105 do modifyResponse $ setContentType "text/html; charset=utf-8"
75 do modifyResponse $ setContentType "text/html; charset=utf-8"
106− callback $
107− case compile artifacts source of
76+ case compile artifacts source of
108− Success name js -> Ok name js
77+ Success builder ->
78+ writeBuilder builder
79+
109− NoMain -> Err noMain
80+ NoMain ->
81+ writeBuilder $ renderReport noMain
82+
83+ BadInput name err ->
84+ writeBuilder $ renderReport $
110− BadInput name err -> Err $ Help.compilerReport "/" (Error.Module name "/try" File.zeroTime source err) []
85+ Help.compilerReport "/" (Error.Module name "/try" File.zeroTime source err) []
111
86
112 _ ->
87 _ ->
113 do modifyResponse $ setResponseStatus 400 "Bad Request"
88 do modifyResponse $ setResponseStatus 400 "Bad Request"
@@ -129,7 +104,7 @@ ignoreFile _ _ count =
129
104
130
105
131data Outcome
106data Outcome
132− = Success N.Name B.Builder
107+ = Success B.Builder
133 | NoMain
108 | NoMain
134 | BadInput ModuleName.Raw Error.Error
109 | BadInput ModuleName.Raw Error.Error
135
110
@@ -163,7 +138,7 @@ compile (A.Artifacts interfaces objects) source =
163 mains = Map.singleton home main_
138 mains = Map.singleton home main_
164 graph = Opt.addLocalGraph locals objects
139 graph = Opt.addLocalGraph locals objects
165 in
140 in
166− Success name $ JS.generate mode graph mains
141+ Success $ Html.sandwich name $ JS.generate mode graph mains
167
142
168
143
169checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
144checkImports :: Map.Map ModuleName.Raw I.Interface -> [Src.Import] -> Either (NE.List Import.Error) (Map.Map ModuleName.Raw I.Interface)
@@ -188,11 +163,11 @@ checkImports interfaces imports =
188
163
189
164
190
165
191−-- RENDER PROBLEM (V1)
166+-- RENDER REPORT
192
167
193
168
194−renderProblem_V1 :: Help.Report -> B.Builder
169+renderReport :: Help.Report -> B.Builder
195−renderProblem_V1 report =
170+renderReport report =
196 [r|<!DOCTYPE HTML>
171 [r|<!DOCTYPE HTML>
197<html>
172<html>
198<head>
173<head>
@@ -204,7 +179,7 @@ renderProblem_V1 report =
204 <script>
179 <script>
205 var app = Elm.Errors.init({flags:|] <> Encode.encodeUgly (Exit.toJson report) <> [r|});
180 var app = Elm.Errors.init({flags:|] <> Encode.encodeUgly (Exit.toJson report) <> [r|});
206 app.ports.jumpTo.subscribe(function(region) {
181 app.ports.jumpTo.subscribe(function(region) {
207− window.parent.postMessage(JSON.stringify(region), "*");
182+ window.parent.postMessage(JSON.stringify(region), '*');
208 });
183 });
209 </script>
184 </script>
210</body>
185</body>
@@ -212,71 +187,6 @@ renderProblem_V1 report =
212
187
213
188
214
189
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
190-- NO MAIN
281
191
282
192
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.hs+2−3
@@ -48,9 +48,8 @@ import qualified Reporting.Render.Type.Localizer as L
48
48
49allowedOrigins :: [String]
49allowedOrigins :: [String]
50allowedOrigins =
50allowedOrigins =
51− [ "https://guide.elm-lang.org"
51+ [ "https://elm-lang.org"
52− , "https://guide.elm-lang.jp"
52+ , "https://guide.elm-lang.org"
53− , "http://localhost:8007"
54 ]
53 ]
55
54
56
55
worker/src/Main.hs+1−5
@@ -14,7 +14,6 @@ import Snap.Http.Server
14import qualified Artifacts
14import qualified Artifacts
15import qualified Cors
15import qualified Cors
16import qualified Endpoint.Compile as Compile
16import qualified Endpoint.Compile as Compile
17−import qualified Endpoint.Quotes as Quotes
18import qualified Endpoint.Repl as Repl
17import qualified Endpoint.Repl as Repl
19
18
20
19
@@ -32,11 +31,9 @@ main =
32 httpServe config $ msum $
31 httpServe config $ msum $
33 [ ifTop $ status
32 [ ifTop $ status
34 , path "repl" $ Repl.endpoint rArtifacts
33 , path "repl" $ Repl.endpoint rArtifacts
35− , path "compile" $ Compile.endpoint_V1 cArtifacts
34+ , path "compile" $ Compile.endpoint cArtifacts
36− , path "compile/v2" $ Compile.endpoint_V2 cArtifacts
37 , path "compile/errors.js" $ serveJavaScript errorJS
35 , path "compile/errors.js" $ serveJavaScript errorJS
38 , path "compile/deps-info.json" $ serveDepsInfo depsInfo
36 , path "compile/deps-info.json" $ serveDepsInfo depsInfo
39− , path "quotes" $ Quotes.endpoint
40 , notFound
37 , notFound
41 ]
38 ]
42
39
@@ -70,4 +67,3 @@ serveDepsInfo json =
70 Cors.allow GET ["https://elm-lang.org"] $
67 Cors.allow GET ["https://elm-lang.org"] $
71 do modifyResponse $ setContentType "application/json"
68 do modifyResponse $ setContentType "application/json"
72 writeBS json
69 writeBS json
73−