diff options
| author | hallgren <hallgren@chalmers.se> | 2015-08-28 13:59:43 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2015-08-28 13:59:43 +0000 |
| commit | 5bfaf10de597af504e6d2784309e533b09a6451c (patch) | |
| tree | c0aacba9c492304cb3b0f905aa05bbefa1599d2c /src/compiler/GF/Data | |
| parent | f2952768d578309a8f75c7da417e3602c4d5e9e9 (diff) | |
Comment out some dead code found with -fwarn-unused-binds
Also fixed some warnings and tightened some imports
Diffstat (limited to 'src/compiler/GF/Data')
| -rw-r--r-- | src/compiler/GF/Data/Relation.hs | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Data/Str.hs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/GF/Data/Relation.hs b/src/compiler/GF/Data/Relation.hs index 195faf96f..5a3e80e6f 100644 --- a/src/compiler/GF/Data/Relation.hs +++ b/src/compiler/GF/Data/Relation.hs @@ -189,5 +189,5 @@ remove x r = let (mss,r') = Map.updateLookupWithKey (\_ _ -> Nothing) x r incoming :: Ord a => a -> Rel' a -> Set a incoming x r = maybe Set.empty fst $ Map.lookup x r -outgoing :: Ord a => a -> Rel' a -> Set a -outgoing x r = maybe Set.empty snd $ Map.lookup x r
\ No newline at end of file +--outgoing :: Ord a => a -> Rel' a -> Set a +--outgoing x r = maybe Set.empty snd $ Map.lookup x r
\ No newline at end of file diff --git a/src/compiler/GF/Data/Str.hs b/src/compiler/GF/Data/Str.hs index 6f65764c7..0c9ab05ec 100644 --- a/src/compiler/GF/Data/Str.hs +++ b/src/compiler/GF/Data/Str.hs @@ -20,8 +20,8 @@ module GF.Data.Str ( allItems ) where -import GF.Data.Operations -import Data.List (isPrefixOf, isSuffixOf, intersperse) +import GF.Data.Operations(prQuotedString) +import Data.List (isPrefixOf, intersperse) --, isSuffixOf -- | abstract token list type. AR 2001, revised and simplified 20\/4\/2003 newtype Str = Str [Tok] deriving (Read, Show, Eq, Ord) @@ -50,11 +50,11 @@ matchPrefix s vs t = (u,as) <- vs, any (\c -> isPrefixOf c (concat (unmarkup t))) as ] ++ [s] - +{- matchSuffix :: String -> Ss -> [(Ss,[String])] -> Ss matchSuffix t s vs = head ([u | (u,as) <- vs, any (\c -> isSuffixOf c t) as] ++ [s]) - +-} unmarkup :: [String] -> [String] unmarkup = filter (not . isXMLtag) where isXMLtag s = case s of |