From c40ad4e79f8021835e9c647023ffb97285caa891 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 19 Jan 2006 17:27:46 +0000 Subject: [PATCH] workaround for a compilation bug for param defs (to be fixed) --- lib/resource-1.0/romance/DiffRomance.gf | 2 +- lib/resource-1.0/romance/NounRomance.gf | 4 ++-- src/GF/Compile/CheckGrammar.hs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/resource-1.0/romance/DiffRomance.gf b/lib/resource-1.0/romance/DiffRomance.gf index d3455153d..2e9e5bbff 100644 --- a/lib/resource-1.0/romance/DiffRomance.gf +++ b/lib/resource-1.0/romance/DiffRomance.gf @@ -10,7 +10,7 @@ param Case = Nom | Acc | CPrep Prep ; - NPForm = Ton Case | Aton Case | Poss AAgr ; + NPForm = Ton Case | Aton Case | Poss {g : Gender ; n : Number} ; --- AAgr RelForm = RSimple Case | RComplex Gender Number Case ; diff --git a/lib/resource-1.0/romance/NounRomance.gf b/lib/resource-1.0/romance/NounRomance.gf index c922f663a..525524b95 100644 --- a/lib/resource-1.0/romance/NounRomance.gf +++ b/lib/resource-1.0/romance/NounRomance.gf @@ -33,7 +33,7 @@ incomplete concrete NounRomance of Noun = n = Sg } ; DetPl quant num ord = { - s = \\g,c => quant.s ! g ! c ++ num.s ! g ++ ord.s ! aagr g Sg ; + s = \\g,c => quant.s ! g ! c ++ num.s ! g ++ ord.s ! aagr g Pl ; n = Pl } ; @@ -64,7 +64,7 @@ incomplete concrete NounRomance of Noun = n = Sg } ; DefPl = { - s = \\g,c => artDef g Sg c ; + s = \\g,c => artDef g Pl c ; n = Pl } ; diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs index 931a84a58..0684d82f2 100644 --- a/src/GF/Compile/CheckGrammar.hs +++ b/src/GF/Compile/CheckGrammar.hs @@ -185,6 +185,7 @@ checkResInfo gr (c,info) = do return (c, ResOper pty' pde') ResParam (Yes pcs) -> chIn "parameter type" $ do +---- mapM ((mapM (computeLType gr . snd)) . snd) pcs mapM_ ((mapM_ (checkIfParType gr . snd)) . snd) pcs return (c,info)