diff options
| author | krasimir <krasimir@chalmers.se> | 2009-09-14 15:13:11 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-09-14 15:13:11 +0000 |
| commit | 9f3534b3bb4e6bc45301b0ddb9468ca721b3dc17 (patch) | |
| tree | 446c17a431e23ba04e50ed7183dbc384b2ef0a76 /src/GF/Grammar/Unify.hs | |
| parent | 4426120effd0475c0e35cb90eaf0f53eaa4afcef (diff) | |
Use GF.Grammar.Printer everywhere instead of PrGrammar
Diffstat (limited to 'src/GF/Grammar/Unify.hs')
| -rw-r--r-- | src/GF/Grammar/Unify.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GF/Grammar/Unify.hs b/src/GF/Grammar/Unify.hs index 68f8b3352..f367dc891 100644 --- a/src/GF/Grammar/Unify.hs +++ b/src/GF/Grammar/Unify.hs @@ -18,9 +18,9 @@ module GF.Grammar.Unify (unifyVal) where import GF.Grammar.Abstract - import GF.Data.Operations +import Text.PrettyPrint import Data.List (partition) unifyVal :: Constraints -> Err (Constraints,MetaSubst) @@ -64,13 +64,13 @@ unify e1 e2 g = unify b c' g (App c a, App d b) -> case unify c d g of Ok g1 -> unify a b g1 - _ -> prtBad "fail unify" e1 + _ -> Bad (render (text "fail unify" <+> ppTerm Unqualified 0 e1)) (RecType xs,RecType ys) | xs == ys -> return g - _ -> prtBad "fail unify" e1 + _ -> Bad (render (text "fail unify" <+> ppTerm Unqualified 0 e1)) extend :: Unifier -> MetaSymb -> Term -> Err Unifier extend g s t | (t == Meta s) = return g - | occCheck s t = prtBad "occurs check" t + | occCheck s t = Bad (render (text "occurs check" <+> ppTerm Unqualified 0 t)) | True = return ((s, t) : g) subst_all :: Unifier -> Term -> Err Term |