Skip to content

Commit a34406f

Browse files
committed
FIX This binding for ‘golden’ shadows the existing binding
1 parent 21a2772 commit a34406f

File tree

112 files changed

+1743
-385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1743
-385
lines changed

docs/developers/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# 📅 Revision history for HelVM Common
22

3+
## 0.1.2.4 -- 2024-04-14
4+
* Fix "This binding for ‘golden’ shadows the existing binding"
5+
36
## 0.1.2.3 -- 2023-06-20
47
* Implement `FileReaderIO (BusinessT MockIO)`
58

docs/reports/helio-test/helio-0.1.2.3-inplace/HelVM.HelIO.Collections.MapList.hs.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@
3838
<span class="lineno"> 19 </span><span class="decl"><span class="nottickedoff">mapListEmpty = mapListFromList []</span></span>
3939
<span class="lineno"> 20 </span>
4040
<span class="lineno"> 21 </span>mapListFromList :: [a] -&gt; MapList a
41-
<span class="lineno"> 22 </span><span class="decl"><span class="istickedoff">mapListFromList = fromIndexedList . List.indexed</span></span>
41+
<span class="lineno"> 22 </span><span class="decl"><span class="istickedoff">mapListFromList = fromIndexedList &lt;$&gt; List.indexed</span></span>
4242
<span class="lineno"> 23 </span>
4343
<span class="lineno"> 24 </span>fromIndexedList :: IndexedList a -&gt; MapList a
44-
<span class="lineno"> 25 </span><span class="decl"><span class="istickedoff">fromIndexedList = fromIntMap . IntMap.fromList</span></span>
44+
<span class="lineno"> 25 </span><span class="decl"><span class="istickedoff">fromIndexedList = fromIntMap &lt;$&gt; IntMap.fromList</span></span>
4545
<span class="lineno"> 26 </span>
4646
<span class="lineno"> 27 </span>fromIntMap :: IntMap a -&gt; MapList a
4747
<span class="lineno"> 28 </span><span class="decl"><span class="istickedoff">fromIntMap = MapList</span></span>
4848
<span class="lineno"> 29 </span>
4949
<span class="lineno"> 30 </span>-- | DeConstruction
5050
<span class="lineno"> 31 </span>mapListToList :: Default a =&gt; MapList a -&gt; [a]
51-
<span class="lineno"> 32 </span><span class="decl"><span class="istickedoff">mapListToList = listFromDescList . toDescList</span></span>
51+
<span class="lineno"> 32 </span><span class="decl"><span class="istickedoff">mapListToList = listFromDescList &lt;$&gt; toDescList</span></span>
5252
<span class="lineno"> 33 </span>
5353
<span class="lineno"> 34 </span>toDescList :: MapList a -&gt; IndexedList a
54-
<span class="lineno"> 35 </span><span class="decl"><span class="istickedoff">toDescList = IntMap.toDescList . unMapList</span></span>
54+
<span class="lineno"> 35 </span><span class="decl"><span class="istickedoff">toDescList = IntMap.toDescList &lt;$&gt; unMapList</span></span>
5555
<span class="lineno"> 36 </span>
5656
<span class="lineno"> 37 </span>-- | Internal function
5757
<span class="lineno"> 38 </span>listFromDescList :: Default a =&gt; IndexedList a -&gt; [a]
58-
<span class="lineno"> 39 </span><span class="decl"><span class="istickedoff">listFromDescList = loop act . ([] , ) where</span>
58+
<span class="lineno"> 39 </span><span class="decl"><span class="istickedoff">listFromDescList = loop act &lt;$&gt; ([] , ) where</span>
5959
<span class="lineno"> 40 </span><span class="spaces"> </span><span class="istickedoff">act :: Default a =&gt; AccWithIndexedList a -&gt; Either (AccWithIndexedList a) [a]</span>
6060
<span class="lineno"> 41 </span><span class="spaces"> </span><span class="istickedoff">act (acc , [] ) = <span class="nottickedoff">Right acc</span></span>
6161
<span class="lineno"> 42 </span><span class="spaces"> </span><span class="istickedoff">act (acc , [(i , v)] ) = Right $ consDef i $ v : acc</span>
6262
<span class="lineno"> 43 </span><span class="spaces"> </span><span class="istickedoff">act (acc , (i1 , v1) : (i2 , v2) : l ) = Left (consDef (i1 - i2 - 1) $ v1 : acc , (i2 , v2) : l)</span></span>
6363
<span class="lineno"> 44 </span>
6464
<span class="lineno"> 45 </span>consDef :: Default a =&gt; Key -&gt; [a] -&gt; [a]
65-
<span class="lineno"> 46 </span><span class="decl"><span class="istickedoff">consDef i l = (check . compare i) 0 where</span>
65+
<span class="lineno"> 46 </span><span class="decl"><span class="istickedoff">consDef i l = (check &lt;$&gt; compare i) 0 where</span>
6666
<span class="lineno"> 47 </span><span class="spaces"> </span><span class="istickedoff">check LT = <span class="nottickedoff">error &quot;MapList.consDef index is negative&quot;</span></span>
6767
<span class="lineno"> 48 </span><span class="spaces"> </span><span class="istickedoff">check EQ = l</span>
6868
<span class="lineno"> 49 </span><span class="spaces"> </span><span class="istickedoff">check GT = consDef (i - 1) (def : l)</span></span>
@@ -79,7 +79,7 @@
7979
<span class="lineno"> 60 </span>
8080
<span class="lineno"> 61 </span>-- | Standard instances
8181
<span class="lineno"> 62 </span>instance (Default a , Show a) =&gt; Show (MapList a) where
82-
<span class="lineno"> 63 </span> <span class="decl"><span class="nottickedoff">show = show . I.toList</span></span>
82+
<span class="lineno"> 63 </span> <span class="decl"><span class="nottickedoff">show = show &lt;$&gt; I.toList</span></span>
8383
<span class="lineno"> 64 </span>
8484
<span class="lineno"> 65 </span>instance IsString MapString where
8585
<span class="lineno"> 66 </span> <span class="decl"><span class="nottickedoff">fromString = mapListFromList</span></span>
@@ -88,27 +88,27 @@
8888
<span class="lineno"> 69 </span> type (Item (MapList a)) = a
8989
<span class="lineno"> 70 </span> <span class="decl"><span class="istickedoff">toList = mapListToList</span></span>
9090
<span class="lineno"> 71 </span> <span class="decl"><span class="istickedoff">fromList = mapListFromList</span></span>
91-
<span class="lineno"> 72 </span> <span class="decl"><span class="nottickedoff">fromListN n = mapListFromList . fromListN n</span></span>
91+
<span class="lineno"> 72 </span> <span class="decl"><span class="nottickedoff">fromListN n = mapListFromList &lt;$&gt; fromListN n</span></span>
9292
<span class="lineno"> 73 </span>
9393
<span class="lineno"> 74 </span>-- | ListLike instances
9494
<span class="lineno"> 75 </span>instance Default a =&gt; LL.FoldableLL (MapList a) a where
95-
<span class="lineno"> 76 </span> <span class="decl"><span class="nottickedoff">foldl f b = IntMap.foldl f b . unMapList</span></span>
96-
<span class="lineno"> 77 </span> <span class="decl"><span class="nottickedoff">foldr f b = IntMap.foldr f b . unMapList</span></span>
95+
<span class="lineno"> 76 </span> <span class="decl"><span class="nottickedoff">foldl f b = IntMap.foldl f b &lt;$&gt; unMapList</span></span>
96+
<span class="lineno"> 77 </span> <span class="decl"><span class="nottickedoff">foldr f b = IntMap.foldr f b &lt;$&gt; unMapList</span></span>
9797
<span class="lineno"> 78 </span>
9898
<span class="lineno"> 79 </span>-- | My instances
9999
<span class="lineno"> 80 </span>instance {-# OVERLAPPING #-} IndexSafe (MapList a) a where
100-
<span class="lineno"> 81 </span> <span class="decl"><span class="nottickedoff">findWithDefault e i = IntMap.findWithDefault e i . unMapList</span></span>
100+
<span class="lineno"> 81 </span> <span class="decl"><span class="nottickedoff">findWithDefault e i = IntMap.findWithDefault e i &lt;$&gt; unMapList</span></span>
101101
<span class="lineno"> 82 </span> <span class="decl"><span class="nottickedoff">findMaybe = mapListFindMaybe</span></span>
102102
<span class="lineno"> 83 </span> <span class="decl"><span class="nottickedoff">indexMaybe = mapListIndexMaybe</span></span>
103-
<span class="lineno"> 84 </span> <span class="decl"><span class="nottickedoff">findSafe i = liftMaybeOrError &quot;MapList.findSafe: index is not correct&quot; . mapListFindMaybe i</span></span>
104-
<span class="lineno"> 85 </span> <span class="decl"><span class="nottickedoff">indexSafe l = liftMaybeOrError &quot;MapList.LLIndexSafe: index is not correct&quot; . mapListIndexMaybe l</span></span>
103+
<span class="lineno"> 84 </span> <span class="decl"><span class="nottickedoff">findSafe i = liftMaybeOrError &quot;MapList.findSafe: index is not correct&quot; &lt;$&gt; mapListFindMaybe i</span></span>
104+
<span class="lineno"> 85 </span> <span class="decl"><span class="nottickedoff">indexSafe l = liftMaybeOrError &quot;MapList.LLIndexSafe: index is not correct&quot; &lt;$&gt; mapListIndexMaybe l</span></span>
105105
<span class="lineno"> 86 </span>
106106
<span class="lineno"> 87 </span>instance InsertDef (MapList a) a where
107-
<span class="lineno"> 88 </span> <span class="decl"><span class="nottickedoff">insertDef i e = fromIntMap . IntMap.insert i e . unMapList</span></span>
107+
<span class="lineno"> 88 </span> <span class="decl"><span class="nottickedoff">insertDef i e = fromIntMap &lt;$&gt; IntMap.insert i e &lt;$&gt; unMapList</span></span>
108108
<span class="lineno"> 89 </span>
109109
<span class="lineno"> 90 </span>-- | Internal functions
110110
<span class="lineno"> 91 </span>mapListFindMaybe :: Key -&gt; MapList a -&gt; Maybe a
111-
<span class="lineno"> 92 </span><span class="decl"><span class="nottickedoff">mapListFindMaybe i = IntMap.lookup i . unMapList</span></span>
111+
<span class="lineno"> 92 </span><span class="decl"><span class="nottickedoff">mapListFindMaybe i = IntMap.lookup i &lt;$&gt; unMapList</span></span>
112112
<span class="lineno"> 93 </span>
113113
<span class="lineno"> 94 </span>mapListIndexMaybe :: MapList a -&gt; Key -&gt; Maybe a
114114
<span class="lineno"> 95 </span><span class="decl"><span class="nottickedoff">mapListIndexMaybe l i = unMapList l IntMap.!? i</span></span>

0 commit comments

Comments
 (0)