From 021b5f06d3900fe2b10d5d3ccf6ac286a779ef16 Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 19 Sep 2013 20:48:10 +0000 Subject: Introduce type RawIdent; only 9 imports of Data.ByteString.Char8 remain The fact that identifiers are represented as ByteStrings is now an internal implentation detail in module GF.Infra.Ident. Conversion between ByteString and identifiers is only needed in the lexer and the Binary instances. --- src/compiler/GF/Compile/SubExOpt.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/compiler/GF/Compile/SubExOpt.hs') diff --git a/src/compiler/GF/Compile/SubExOpt.hs b/src/compiler/GF/Compile/SubExOpt.hs index bfa2a1334..4c056f479 100644 --- a/src/compiler/GF/Compile/SubExOpt.hs +++ b/src/compiler/GF/Compile/SubExOpt.hs @@ -32,8 +32,7 @@ import GF.Data.Operations import Control.Monad import Data.Map (Map) import qualified Data.Map as Map -import qualified Data.ByteString.Char8 as BS -import Data.List + subexpModule :: SourceModule -> SourceModule subexpModule (n,mo) = errVal (n,mo) $ do @@ -133,9 +132,9 @@ collectSubterms mo t = case t of return t --- only because of composOp operIdent :: Int -> Ident -operIdent i = identC (operPrefix `BS.append` (BS.pack (show i))) --- +operIdent i = identC (operPrefix `prefixRawIdent` (rawIdentS (show i))) --- isOperIdent :: Ident -> Bool -isOperIdent id = BS.isPrefixOf operPrefix (ident2bs id) +isOperIdent id = isPrefixOf operPrefix (ident2raw id) -operPrefix = BS.pack ("A''") +operPrefix = rawIdentS ("A''") -- cgit v1.2.3