summaryrefslogtreecommitdiff
path: root/src/compiler/GF/Compile/Compute/ConcreteNew1.hs
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2014-07-28 11:58:00 +0000
committerhallgren <hallgren@chalmers.se>2014-07-28 11:58:00 +0000
commit7a91afc02a0a245bf9fea248e61421a75c22137d (patch)
treee8c0466894f64a5a6cb98ef4d32dedcb9eeca879 /src/compiler/GF/Compile/Compute/ConcreteNew1.hs
parent59172ce9c5baf593e3110036a14c910da80878f7 (diff)
Convert from Text.PrettyPrint to GF.Text.Pretty
All compiler modules now use GF.Text.Pretty instead of Text.PrettyPrint
Diffstat (limited to 'src/compiler/GF/Compile/Compute/ConcreteNew1.hs')
-rw-r--r--src/compiler/GF/Compile/Compute/ConcreteNew1.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew1.hs b/src/compiler/GF/Compile/Compute/ConcreteNew1.hs
index 354f8249e..eba1db57b 100644
--- a/src/compiler/GF/Compile/Compute/ConcreteNew1.hs
+++ b/src/compiler/GF/Compile/Compute/ConcreteNew1.hs
@@ -8,7 +8,7 @@ import GF.Grammar.Lookup
import GF.Grammar.Predef
import GF.Data.Operations
import Data.List (intersect)
-import Text.PrettyPrint
+import GF.Text.Pretty
normalForm :: SourceGrammar -> Term -> Term
normalForm gr t = value2term gr [] (eval gr [] t)
@@ -65,7 +65,7 @@ eval gr env (ImplArg t) = VImplArg (eval gr env t)
eval gr env (Table p res) = VTblType (eval gr env p) (eval gr env res)
eval gr env (RecType rs) = VRecType [(l,eval gr env ty) | (l,ty) <- rs]
eval gr env t@(ExtR t1 t2) =
- let error = VError (show (text "The term" <+> ppTerm Unqualified 0 t <+> text "is not reducible"))
+ let error = VError (show ("The term" <+> ppTerm Unqualified 0 t <+> "is not reducible"))
in case (eval gr env t1, eval gr env t2) of
(VRecType rs1, VRecType rs2) -> case intersect (map fst rs1) (map fst rs2) of
[] -> VRecType (rs1 ++ rs2)