From 65e92e6dabe76068f82f0aecd1d4470c7c782cee Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 23 Aug 2008 14:26:34 +0000 Subject: [PATCH] infForm added to Catalan ; debugging alternative in PGF generation --- lib/resource/catalan/DiffCat.gf | 2 ++ src/GF/Compile/GrammarToGFCC.hs | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/resource/catalan/DiffCat.gf b/lib/resource/catalan/DiffCat.gf index cc57abee0..1b41659f3 100644 --- a/lib/resource/catalan/DiffCat.gf +++ b/lib/resource/catalan/DiffCat.gf @@ -85,6 +85,8 @@ oper -- => <"te" ++ "me", []> ; -- <_,_,CPron {n = Sg ; p = P2},CPron {n = Sg ; p = P1}> => <"te" ++ "me", []> ; + infForm _ _ _ _ = True ; + mkImperative _ p vp = { --- politeness s = \\pol,aag => let diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index 613612f03..cc34cf546 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -284,8 +284,11 @@ canon2canon abs = M.ModMod mo -> (c, M.ModMod $ M.replaceJudgements mo $ mapTree f2 (M.jments mo)) _ -> (c,m) - j2j cg (f,j) = case j of - CncFun x (Yes tr) z -> (f,CncFun x (Yes ({-trace ("+ " ++ prt f)-} (t2t tr))) z) + j2j cg (f,j) = +---- let debug = trace ("+ " ++ prt f) in + let debug = id in + case j of + CncFun x (Yes tr) z -> (f,CncFun x (Yes (debug (t2t tr))) z) CncCat (Yes ty) (Yes x) y -> (f,CncCat (Yes (ty2ty ty)) (Yes (t2t x)) y) _ -> (f,j) where