8a4b62e · lynxjs-elm/compiler

git.iko.soy/lynxjs-elm/compiler

preserve order when checking for duplicate names

fixes https://github.com/elm/compiler/issues/2037

commit8a4b62e08ed6da54dbed326229435b1f7becea53 authorEvan Czaplicki <evancz@users.noreply.github.com> dateWed 15 Jan 2020, 17:34 (7 years ago) parentf91bfde

3 files changed+5−4

compare with master

unifiedsplit

compiler/src/Canonicalize/Environment/Dups.hs+1−1 compiler/src/Canonicalize/Pattern.hs+3−2 compiler/src/Parse/Pattern.hs+1−1

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

@@ -105,7 +105,7 @@ one name region value =

105105

106106insert :: Name.Name -> A.Region -> a -> Dict a -> Dict a

107107insert name region value dict =

108− Map.insertWith OneOrMore.more name (OneOrMore.one (Info region value)) dict

108+ Map.insertWith (\new old -> OneOrMore.more old new) name (OneOrMore.one (Info region value)) dict

109109

110110

111111union :: Dict a -> Dict a -> Dict a

compiler/src/Canonicalize/Pattern.hs+3−2

@@ -8,6 +8,7 @@ module Canonicalize.Pattern

88 where

1010

11+import qualified Data.List as List

1112import qualified Data.Map.Strict as Map

1213import qualified Data.Name as Name

1314

@@ -173,8 +174,8 @@ logVar name region value =

173174logFields :: [A.Located Name.Name] -> a -> Result DupsDict w a

174175logFields fields value =

175176 let

176− addField (A.At region name) dict =

177+ addField dict (A.At region name) =

177178 Dups.insert name region region dict

178179 in

179180 Result.Result $ \bindings warnings _ ok ->

180− ok (foldr addField bindings fields) warnings value

181+ ok (List.foldl' addField bindings fields) warnings value

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

@@ -129,7 +129,7 @@ recordHelp start vars =

129129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd

130130 recordHelp start (var:vars)

131131 , do word1 0x7D {-}-} E.PRecordEnd

132− addEnd start (Src.PRecord vars)

132+ addEnd start (Src.PRecord (reverse vars))

133133 ]

134134

135135