From 3dd5eea49d8b6dbbc43ba365aa79b3864b260b3e Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 17 Mar 2008 12:46:53 +0000 Subject: [PATCH] merging recent changes in Finnish --- lib/resource/finnish/LexiconFin.gf | 6 ++---- lib/resource/finnish/ParadigmsFin.gf | 1 - src/GF/Devel/GrammarToGFCC.hs | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/resource/finnish/LexiconFin.gf b/lib/resource/finnish/LexiconFin.gf index feff5be3a..7a19a2521 100644 --- a/lib/resource/finnish/LexiconFin.gf +++ b/lib/resource/finnish/LexiconFin.gf @@ -51,8 +51,8 @@ lin "lasten" "lapsia" "lapsina" "lapsissa" "lapsiin" ; church_N = mkN "kirkko" ; city_N = mkN "kaupunki" ; - clean_A = mkA "puhdas" ; - clever_A = mkA "viisas" ; + clean_A = mkA (mkN "puhdas") ; + clever_A = mkA (mkN "viisas") ; close_V2 = mkV2 (mkV "sulkea") ; coat_N = mkN "takki" ; cold_A = mkA (mkN "kylmä") "kylmempi" "kylmin" ; @@ -357,8 +357,6 @@ lin "seisoin" "seisoi" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät suck_V2 = mkV2 (mkV "imeä") cpartitive ; swell_V = mkV "turvota" "turposi" ; --- swell_V = mk12V "turvota" "turpoaa" "turpoan" "turpoavat" "turvotkaa" "turvotaan" --- "turposi" "turposin" "turpoaisi" "turvonnut" "turvottu" "turvotun" ; swim_V = mkV "uida" "uin" "ui" ; think_V = mkV "ajatella" "ajattelen" "ajatteli" ; throw_V2 = mkV2 (mkV "heittää") ; diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf index 3e84b5935..faa2b6edf 100644 --- a/lib/resource/finnish/ParadigmsFin.gf +++ b/lib/resource/finnish/ParadigmsFin.gf @@ -425,7 +425,6 @@ oper -- adjectives mkA = overload { --- mkA : Str -> A = \x -> noun2adjDeg (mk1N x) ** {lock_A = <>} ; mkA : Str -> A = mkA_1 ; mkA : N -> A = \n -> noun2adjDeg n ** {lock_A = <>} ; mkA : N -> (kivempaa,kivinta : Str) -> A = regAdjective ; diff --git a/src/GF/Devel/GrammarToGFCC.hs b/src/GF/Devel/GrammarToGFCC.hs index 5d2ddb1aa..2c1bbc169 100644 --- a/src/GF/Devel/GrammarToGFCC.hs +++ b/src/GF/Devel/GrammarToGFCC.hs @@ -418,6 +418,7 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of T (TTyped ty) cs -> t2t $ V ty $ map snd cs ---- should be elim'ed in tc V ty ts -> mkCurry $ V ty [t2t t | t <- ts] S t p -> mkCurrySel (t2t t) (t2t p) + _ -> GM.composSafeOp t2t tr where t2t = term2term cgr env @@ -523,6 +524,7 @@ mkLab k = LIdent (("_" ++ show k)) unlock = filter notlock where notlock (l,(_, t)) = case t of --- need not look at l R [] -> False + RecType [] -> False _ -> True unlockTyp = filter notlock