diff options
Diffstat (limited to 'src/compiler/GF/Compile/Compute')
| -rw-r--r-- | src/compiler/GF/Compile/Compute/AppPredefined.hs | 12 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/ConcreteLazy.hs | 3 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/ConcreteNew.hs | 5 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/ConcreteNew1.hs | 3 |
4 files changed, 8 insertions, 15 deletions
diff --git a/src/compiler/GF/Compile/Compute/AppPredefined.hs b/src/compiler/GF/Compile/Compute/AppPredefined.hs index d4b6dfb41..869052e0a 100644 --- a/src/compiler/GF/Compile/Compute/AppPredefined.hs +++ b/src/compiler/GF/Compile/Compute/AppPredefined.hs @@ -16,14 +16,13 @@ module GF.Compile.Compute.AppPredefined ( isInPredefined, typPredefined, arrityPredefined, predefModInfo, appPredefined ) where -import GF.Infra.Ident +import GF.Infra.Ident(identS) import GF.Infra.Option import GF.Data.Operations import GF.Grammar import GF.Grammar.Predef import qualified Data.Map as Map -import qualified Data.ByteString.Char8 as BS import Text.PrettyPrint import Data.Char (isUpper,toUpper,toLower) @@ -90,11 +89,8 @@ primitives = Map.fromList fun from to = oper (mkFunType from to) oper ty = ResOper (Just (noLoc ty)) Nothing - varL :: Ident - varL = identC (BS.pack "L") - - varP :: Ident - varP = identC (BS.pack "P") + varL = identS "L" + varP = identS "P" appPredefined :: Term -> Err (Term,Bool) appPredefined t = case t of @@ -127,7 +123,7 @@ appPredefined t = case t of (EInt i, EInt j) | f == cLessInt -> retb $ if i<j then predefTrue else predefFalse (EInt i, EInt j) | f == cPlus -> retb $ EInt $ i+j (_, t) | f == cShow && notVar t -> retb $ foldrC $ map K $ words $ render (ppTerm Unqualified 0 t) - (_, K s) | f == cRead -> retb $ Cn (identC (BS.pack s)) --- because of K, only works for atomic tags + (_, K s) | f == cRead -> retb $ Cn (identS s) --- because of K, only works for atomic tags (_, t) | f == cToStr -> trm2str t >>= retb _ -> retb t ---- prtBad "cannot compute predefined" t 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 = diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew.hs b/src/compiler/GF/Compile/Compute/ConcreteNew.hs index 3a05d62fb..3e87ea43a 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs @@ -19,7 +19,6 @@ import Control.Monad(ap,liftM,liftM2,mplus,unless) import Data.List (findIndex,intersect,isInfixOf,nub,elemIndex,(\\)) import Data.Char (isUpper,toUpper,toLower) import Text.PrettyPrint -import qualified Data.ByteString.Char8 as BS import qualified Data.Map as Map --import Debug.Trace(trace) @@ -80,7 +79,7 @@ resource env (m,c) = resourceValues :: SourceGrammar -> GlobalEnv resourceValues gr = env where - env = GE gr rvs (L NoLoc IW) + env = GE gr rvs (L NoLoc identW) rvs = Map.mapWithKey moduleResources (moduleMap gr) moduleResources m = Map.mapWithKey (moduleResource m) . jments moduleResource m c _info = do L l t <- lookupResDefLoc gr (m,c) @@ -115,7 +114,7 @@ value env t0 = Vr x -> var env x Q x@(m,f) | m == cPredef -> if f==cErrorType -- to be removed - then let p = identC (BS.pack "P") + then let p = identS "P" in const # value0 env (mkProd [(Implicit,p,typeType)] (Vr p) []) else const . flip VApp [] # predef f | otherwise -> const # resource env x --valueResDef (fst env) x diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew1.hs b/src/compiler/GF/Compile/Compute/ConcreteNew1.hs index 59c9ef6b4..354f8249e 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteNew1.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteNew1.hs @@ -9,7 +9,6 @@ import GF.Grammar.Predef import GF.Data.Operations import Data.List (intersect) import Text.PrettyPrint -import qualified Data.ByteString.Char8 as BS normalForm :: SourceGrammar -> Term -> Term normalForm gr t = value2term gr [] (eval gr [] t) @@ -44,7 +43,7 @@ eval gr env (Vr x) = case lookup x env of Nothing -> error ("Unknown variable "++showIdent x) eval gr env (Q x) | x == (cPredef,cErrorType) -- to be removed - = let varP = identC (BS.pack "P") + = let varP = identS "P" in eval gr [] (mkProd [(Implicit,varP,typeType)] (Vr varP) []) | fst x == cPredef = VApp x [] | otherwise = case lookupResDef gr x of |