diff options
Diffstat (limited to 'src/compiler/GF/Compile/Compute')
| -rw-r--r-- | src/compiler/GF/Compile/Compute/ConcreteNew.hs | 8 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/Predef.hs | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew.hs b/src/compiler/GF/Compile/Compute/ConcreteNew.hs index 5183ebf32..54e57478e 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs @@ -33,7 +33,7 @@ nfx env@(GE _ _ _ loc) t = value2term loc [] # eval env t eval :: GlobalEnv -> Term -> Err Value eval ge t = ($[]) # value (toplevel ge) t -apply env = apply' env +--apply env = apply' env -------------------------------------------------------------------------------- @@ -279,7 +279,7 @@ strsFromValue t = case t of d0 <- strsFromValue d v0 <- mapM (strsFromValue . fst) vs c0 <- mapM (strsFromValue . snd) vs - let vs' = zip v0 c0 + --let vs' = zip v0 c0 return [strTok (str2strings def) vars | def <- d0, vars <- [[(str2strings v, map sstr c) | (v,c) <- zip vv c0] | @@ -511,11 +511,11 @@ ix loc fn xs i = else bugloc loc $ "(!!): index too large in "++fn++", "++show i++"<"++show n where n = length xs -infixl 1 #,<#,@@ +infixl 1 #,<# --,@@ f # x = fmap f x mf <# mx = ap mf mx -m1 @@ m2 = (m1 =<<) . m2 +--m1 @@ m2 = (m1 =<<) . m2 both f (x,y) = (,) # f x <# f y diff --git a/src/compiler/GF/Compile/Compute/Predef.hs b/src/compiler/GF/Compile/Compute/Predef.hs index ab74f1f63..0900f3665 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -2,7 +2,7 @@ {-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} module GF.Compile.Compute.Predef(predef,predefName,delta) where -import GF.Text.Pretty(render,hang) +--import GF.Text.Pretty(render,hang) import qualified Data.Map as Map import Data.Array(array,(!)) import Data.List (isInfixOf) @@ -146,11 +146,11 @@ norm v = (VString s1,VString s2) -> VString (s1++" "++s2) (v1,v2) -> VC v1 v2 _ -> v - +{- strict v = case v of VError err -> Left err _ -> Right v - +-} string s = case words s of [] -> VString "" ss -> foldr1 VC (map VString ss) @@ -158,7 +158,8 @@ string s = case words s of --- swap (x,y) = (y,x) - +{- bug msg = ppbug msg ppbug doc = error $ render $ hang "Internal error in Compute.Predef:" 4 doc +-}
\ No newline at end of file |