From b416f5bbf7a1ac6d549f68424fec3af64ce34725 Mon Sep 17 00:00:00 2001 From: "peter.ljunglof" Date: Wed, 29 Aug 2012 21:48:34 +0000 Subject: Use nub' instead of nub in some places, remove some unused nub imports --- src/runtime/haskell/PGF/Forest.hs | 4 ++-- src/runtime/haskell/PGF/Optimize.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/haskell/PGF/Forest.hs b/src/runtime/haskell/PGF/Forest.hs index 3c4272317..5cb4ccf51 100644 --- a/src/runtime/haskell/PGF/Forest.hs +++ b/src/runtime/haskell/PGF/Forest.hs @@ -32,7 +32,7 @@ import qualified Data.IntSet as IntSet import qualified Data.IntMap as IntMap import Control.Monad import Control.Monad.State -import GF.Data.SortedList +import GF.Data.Utilities (nub') data Forest = Forest @@ -121,7 +121,7 @@ getAbsTrees (Forest abs cnc forest root) arg@(PArg _ fid) ty dp = generateForForest (prove dp) e) emptyMetaStore fid in if null res then Left (nub err) - else Right (nub [e | (_,_,e) <- res]) + else Right (nub' [e | (_,_,e) <- res]) where go rec_ scope_ mb_tty_ (PArg hypos fid) | fid < totalCats cnc = case mb_tty of diff --git a/src/runtime/haskell/PGF/Optimize.hs b/src/runtime/haskell/PGF/Optimize.hs index 833684fe0..a339c9add 100644 --- a/src/runtime/haskell/PGF/Optimize.hs +++ b/src/runtime/haskell/PGF/Optimize.hs @@ -8,7 +8,7 @@ import PGF.CId import PGF.Data import PGF.Macros import Data.Maybe -import Data.List (mapAccumL, nub) +import Data.List (mapAccumL) import Data.Array.IArray import Data.Array.MArray import Data.Array.ST -- cgit v1.2.3