From 4d34c7f66b1783423387c9dae359bd38f64426dd Mon Sep 17 00:00:00 2001 From: Peter LjungloĢˆf Date: Fri, 30 Nov 2018 11:52:56 +0100 Subject: Fix deprecations from containers >= 0.4.0.0 E.g. `foldWithKey` has been deprecated since 0.4.0.0 (November 2010)[1] and has been removed in 0.6.0.1 (2018)[2] [1]: https://github.com/haskell/containers/blob/master/changelog.md#0400--nov-2010 [2]: https://github.com/haskell/containers/blob/master/changelog.md#death-of-deprecated-functions (commit originally by @fredefox) --- src/runtime/haskell/PGF/Parse.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/haskell/PGF/Parse.hs') diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs index 51b1d3273..d4df937db 100644 --- a/src/runtime/haskell/PGF/Parse.hs +++ b/src/runtime/haskell/PGF/Parse.hs @@ -198,7 +198,7 @@ recoveryStates open_types (EState abs cnc chart) = Nothing -> [] complete open_fcats items ac = - foldl (Set.fold (\(Active j' ppos funid seqid args keyc) -> + foldl (Set.foldr (\(Active j' ppos funid seqid args keyc) -> (:) (Active j' (ppos+1) funid seqid args keyc))) items [set | fcat <- open_fcats, (set,_) <- lookupACByFCat fcat ac] @@ -363,7 +363,7 @@ process flit ftok cnc (item@(Active j ppos funid seqid args key0):items) acc cha items2 = case lookupAC key0 ((active chart:actives chart) !! (k-j)) of Nothing -> items - Just (set,sc) -> Set.fold (\(Active j' ppos funid seqid args keyc) -> + Just (set,sc) -> Set.foldr (\(Active j' ppos funid seqid args keyc) -> let SymCat d _ = unsafeAt (unsafeAt (sequences cnc) seqid) ppos PArg hypos _ = args !! d in (:) (Active j' (ppos+1) funid seqid (updateAt d (PArg hypos fid) args) keyc)) items set @@ -395,7 +395,7 @@ process flit ftok cnc (item@(Active j ppos funid seqid args key0):items) acc cha predict flit ftok cnc forest key0 key@(AK fid lbl) k acc items = let (acc1,items1) = case IntMap.lookup fid forest of Nothing -> (acc,items) - Just set -> Set.fold foldProd (acc,items) set + Just set -> Set.foldr foldProd (acc,items) set (acc2,items2) = case IntMap.lookup fid (lexicon cnc) >>= IntMap.lookup lbl of Just tmap -> let (mb_v,toks) = TrieMap.decompose (TrieMap.map (toItems key0 k) tmap) -- cgit v1.2.3