From 0a59f95d92223bae842323d582ec5d2eb3156a8d Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 29 Nov 2013 14:43:01 +0000 Subject: Move checkPredefError from GF.Compile.Compute.ConcreteLazy to GF.Grammar.Macros Also simplified its type. --- src/compiler/GF/Compile/Optimize.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/GF/Compile/Optimize.hs') diff --git a/src/compiler/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs index e5289fe7b..bd75cbc2c 100644 --- a/src/compiler/GF/Compile/Optimize.hs +++ b/src/compiler/GF/Compile/Optimize.hs @@ -119,7 +119,7 @@ partEval opts = if flag optNewComp opts partEvalNew opts gr (context, val) trm = errIn (render (text "partial evaluation" <+> ppTerm Qualified 0 trm)) $ - checkPredefError gr trm + checkPredefError trm partEvalOld opts gr (context, val) trm = errIn (render (text "partial evaluation" <+> ppTerm Qualified 0 trm)) $ do let vars = map (\(bt,x,t) -> x) context @@ -130,7 +130,7 @@ partEvalOld opts gr (context, val) trm = errIn (render (text "partial evaluation trm3 <- if rightType trm2 then computeTerm gr subst trm2 -- compute twice?? else recordExpand val trm2 >>= computeTerm gr subst - trm4 <- checkPredefError gr trm3 + trm4 <- checkPredefError trm3 return $ mkAbs [(Explicit,v) | v <- vars] trm4 where -- don't eta expand records of right length (correct by type checking) -- cgit v1.2.3