From 3d5b9bd1fd46a51651cbfbd45f03e5b878aebbac Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 19 Sep 2013 18:23:47 +0000 Subject: Make Ident abstract; imports of Data.ByteString.Char8 down from 29 to 16 modules Most of the explicit uses of ByteStrings were eliminated by using identS, identS = identC . BS.pack which was found in GF.Grammar.CF and moved to GF.Infra.Ident. The function prefixIdent :: String -> Ident -> Ident allowed one additional import of ByteString to be eliminated. The functions isArgIdent :: Ident -> Bool getArgIndex :: Ident -> Maybe Int were needed to eliminate explicit pattern matching on Ident from two modules. --- src/compiler/GF/Compile/Compute/ConcreteLazy.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/compiler/GF/Compile/Compute/ConcreteLazy.hs') diff --git a/src/compiler/GF/Compile/Compute/ConcreteLazy.hs b/src/compiler/GF/Compile/Compute/ConcreteLazy.hs index fce118fec..0e3a4fb45 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteLazy.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteLazy.hs @@ -508,8 +508,7 @@ computeTermOpt gr = comput True where -- | argument variables cannot be glued checkNoArgVars :: Term -> Comp Term checkNoArgVars t = case t of - Vr (IA _ _) -> fail $ glueErrorMsg $ ppTerm Unqualified 0 t - Vr (IAV _ _ _) -> fail $ glueErrorMsg $ ppTerm Unqualified 0 t + Vr x | isArgIdent x -> fail $ glueErrorMsg $ ppTerm Unqualified 0 t _ -> composOp checkNoArgVars t glueErrorMsg s = -- cgit v1.2.3