8a4b62e · elk · git.iko.soy

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

compare with master

unifiedsplit

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

105

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

107insert 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

109

110

111union :: Dict a -> Dict a -> Dict a

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

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

8 where

9

10

11+import qualified Data.List as List

11import qualified Data.Map.Strict as Map

12import qualified Data.Map.Strict as Map

12import qualified Data.Name as Name

13import qualified Data.Name as Name

13

14

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

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

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

174logFields fields value =

175logFields fields value =

175 let

176 let

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

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

177 Dups.insert name region region dict

178 Dups.insert name region region dict

178 in

179 in

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

180 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 =

129 Space.chompAndCheckIndent E.PRecordSpace E.PRecordIndentEnd

130 recordHelp start (var:vars)

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

132− addEnd start (Src.PRecord vars)

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

133 ]

134

135