mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-31 02:38:55 -06:00
merging recent changes in Finnish
This commit is contained in:
@@ -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ää") ;
|
||||||
|
|||||||
@@ -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 ;
|
||||||
|
|||||||
Reference in New Issue
Block a user