GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

merging recent changes in Finnish

Browse Source
This commit is contained in:
aarne
2008-03-17 12:46:53 +00:00
parent c5268ded64
commit 3dd5eea49d
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/resource/finnish/LexiconFin.gf
View File

@@ -51,8 +51,8 @@ lin
"lasten" "lapsia" "lapsina" "lapsissa" "lapsiin" ; "lasten" "lapsia" "lapsina" "lapsissa" "lapsiin" ;
church_N = mkN "kirkko" ; church_N = mkN "kirkko" ;
city_N = mkN "kaupunki" ; city_N = mkN "kaupunki" ;
clean_A = mkA "puhdas" ; clean_A = mkA (mkN "puhdas") ;
clever_A = mkA "viisas" ; clever_A = mkA (mkN "viisas") ;
close_V2 = mkV2 (mkV "sulkea") ; close_V2 = mkV2 (mkV "sulkea") ;
coat_N = mkN "takki" ; coat_N = mkN "takki" ;
cold_A = mkA (mkN "kylmä") "kylmempi" "kylmin" ; cold_A = mkA (mkN "kylmä") "kylmempi" "kylmin" ;
@@ -357,8 +357,6 @@ lin
"seisoin" "seisoi" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät "seisoin" "seisoi" "seisoisi" "seissyt" "seisty" "seistyn" ; --- *seisoivät
suck_V2 = mkV2 (mkV "imeä") cpartitive ; suck_V2 = mkV2 (mkV "imeä") cpartitive ;
swell_V = mkV "turvota" "turposi" ; 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" ; swim_V = mkV "uida" "uin" "ui" ;
think_V = mkV "ajatella" "ajattelen" "ajatteli" ; think_V = mkV "ajatella" "ajattelen" "ajatteli" ;
throw_V2 = mkV2 (mkV "heittää") ; throw_V2 = mkV2 (mkV "heittää") ;

1
lib/resource/finnish/ParadigmsFin.gf
View File

@@ -425,7 +425,6 @@ oper
-- adjectives -- adjectives
mkA = overload { mkA = overload {
-- mkA : Str -> A = \x -> noun2adjDeg (mk1N x) ** {lock_A = <>} ;
mkA : Str -> A = mkA_1 ; mkA : Str -> A = mkA_1 ;
mkA : N -> A = \n -> noun2adjDeg n ** {lock_A = <>} ; mkA : N -> A = \n -> noun2adjDeg n ** {lock_A = <>} ;
mkA : N -> (kivempaa,kivinta : Str) -> A = regAdjective ; mkA : N -> (kivempaa,kivinta : Str) -> A = regAdjective ;

2
src/GF/Devel/GrammarToGFCC.hs
View File

@@ -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 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] V ty ts -> mkCurry $ V ty [t2t t | t <- ts]
S t p -> mkCurrySel (t2t t) (t2t p) S t p -> mkCurrySel (t2t t) (t2t p)
_ -> GM.composSafeOp t2t tr _ -> GM.composSafeOp t2t tr
where where
t2t = term2term cgr env t2t = term2term cgr env
@@ -523,6 +524,7 @@ mkLab k = LIdent (("_" ++ show k))
unlock = filter notlock where unlock = filter notlock where
notlock (l,(_, t)) = case t of --- need not look at l notlock (l,(_, t)) = case t of --- need not look at l
R [] -> False R [] -> False
RecType [] -> False
_ -> True _ -> True
unlockTyp = filter notlock unlockTyp = filter notlock