holiday work

This commit is contained in:
aarne
2005-08-07 07:57:48 +00:00
parent 949249fe74
commit 8aef5fb9c0
10 changed files with 477 additions and 278 deletions

View File

@@ -29,6 +29,11 @@ oper
Gen => bil + "s" --- but: hus --> hus Gen => bil + "s" --- but: hus --> hus
} ; } ;
extNGen : Str -> NounGender = \s -> case last s of {
"n" => NUtr ;
_ => NNeutr
} ;
nDreng : Str -> Subst = \dreng -> nDreng : Str -> Subst = \dreng ->
mkSubstantive dreng (dreng + "en") (dreng + "e") (dreng + "ene") ** mkSubstantive dreng (dreng + "en") (dreng + "e") (dreng + "ene") **
{h1 = Utr} ; {h1 = Utr} ;
@@ -67,6 +72,9 @@ oper
aRask : Str -> Adj = \rask -> aRask : Str -> Adj = \rask ->
mkAdjective rask rask (rask + "e") (rask + "ere") (rask + "est") ; mkAdjective rask rask (rask + "e") (rask + "ere") (rask + "est") ;
extractPositive : Adj -> {s : AdjFormPos => Case => Str} = \adj ->
{s = \\a,c => adj.s ! (AF (Posit a) c)} ;
-- verbs -- verbs
mkVerb : (_,_,_,_,_,_ : Str) -> Verbum = mkVerb : (_,_,_,_,_,_ : Str) -> Verbum =
@@ -81,6 +89,31 @@ oper
} }
} ; } ;
irregVerb : (drikke,drakk,drukket : Str) -> Verbum =
\drikke,drakk,drukket ->
let
drikk = init drikke ;
drikker = case last (init drikke) of {
"r" => drikk ;
_ => drikke + "r"
}
in
mkVerb drikke drikker (drikke + "s") drakk drukket drikk ;
regVerb : Str -> Str -> Verbum = \spise, spiste ->
let
spis = init spise ;
te = Predef.dp 2 spiste
in
case te of {
"te" => vSpis spis ;
"de" => case last spise of {
"e" => vHusk spis ;
_ => vBo spise
} ;
_ => vHusk spis
} ;
mkVoice : Voice -> Str -> Str = \v,s -> case v of { mkVoice : Voice -> Str -> Str = \v,s -> case v of {
Act => s ; Act => s ;
Pass => s + case last s of { Pass => s + case last s of {

View File

@@ -4,7 +4,6 @@
concrete BasicFin of Basic = CategoriesFin ** open ParadigmsFin in { concrete BasicFin of Basic = CategoriesFin ** open ParadigmsFin in {
flags flags
startcat=Phr ; lexer=textlit ; unlexer=text ;
optimize=values ; optimize=values ;
lin lin
@@ -12,133 +11,135 @@ lin
airplane_N = regN "lentokone" ; airplane_N = regN "lentokone" ;
answer_V2S = mkV2S (caseV2 (regV "vastata") allative) ; answer_V2S = mkV2S (caseV2 (regV "vastata") allative) ;
apartment_N = regN "asunto" ; apartment_N = regN "asunto" ;
apple_N = regN "omena" ; --- omenia, not omenoita apple_N = nLukko "omena" ; --- omenia, not omenoita
art_N = regN "taide" ; art_N = regN "taide" ;
ask_V2Q = mkV2Q (caseV2 (regV "kysyä") ablative) ; ask_V2Q = mkV2Q (caseV2 (regV "kysyä") ablative) ;
baby_N = regN "vauva" ; baby_N = nLukko "vauva" ;
bad_ADeg = mkADeg (regN "paha") "pahempi" "pahin" ; bad_ADeg = mkADeg (nLukko "paha") "pahempi" "pahin" ;
bank_N = regN "pankki" ; bank_N = regN "pankki" ;
beautiful_ADeg = mkADeg (regN "kaunis") "kauniimpi" "kaunein" ; beautiful_ADeg = mkADeg (regN "kaunis") "kauniimpi" "kaunein" ;
become_VA = mkVA (regV "tulla") translative ; become_VA = mkVA (regV "tulla") translative ;
beer_N = regN "olut" ; beer_N = regN "olut" ;
beg_V2V = mkV2V (caseV2 (reg2V "pyytää" "pyysi") partitive) ; beg_V2V = mkV2V (caseV2 (reg2V "pyytää" "pyysi") partitive) ;
big_ADeg = mkADeg (reg2N "suuri" "suuria") "suurempi" "suurin" ; big_ADeg = mkADeg (sgpartN (nArpi "suuri") "suurta") "suurempi" "suurin" ;
bike_N = nLukko "polkupyörä" ; --- for correct vowel harmony bike_N = nLukko "polkupyörä" ; --- for correct vowel harmony
bird_N = regN "lintu" ; bird_N = nLukko "lintu" ;
black_ADeg = mkADeg (regN "musta") "mustempi" "mustin" ; black_ADeg = mkADeg (nLukko "musta") "mustempi" "mustin" ;
blue_ADeg = mkADeg (regN "sininen") "sinisempi" "sinisin" ; blue_ADeg = mkADeg (regN "sininen") "sinisempi" "sinisin" ;
boat_N = regN "vene" ; boat_N = regN "vene" ;
book_N = regN "kirja" ; book_N = nLukko "kirja" ;
boot_N = regN "saapas" ; boot_N = regN "saapas" ;
boss_N = regN "pomo" ; boss_N = nLukko "pomo" ;
boy_N = reg3N "poika" "pojan" "poikia" ; boy_N = nKukko "poika" "pojan" "poikia" ;
bread_N = regN "leipä" ; bread_N = nLukko "leipä" ;
break_V2 = dirV2 (regV "rikkoa") ; break_V2 = dirV2 (regV "rikkoa") ;
broad_ADeg = mkADeg (regN "leveä") "leveämpi" "levein" ; broad_ADeg = mkADeg (regN "leveä") "leveämpi" "levein" ;
brother_N2 = genN2 (reg3N "veli" "veljen" "veljiä") ; ---- errors in Pl brother_N2 = genN2 (
mkN "veli" "veljen" "veljenä" "veljeä" "veljeen"
"veljinä" "veljissä" "veljien" "veljiä" "veljiin" human) ;
brown_ADeg = mkADeg (regN "ruskea") "ruskeampi" "ruskein" ; brown_ADeg = mkADeg (regN "ruskea") "ruskeampi" "ruskein" ;
butter_N = reg3N "voi" "voin" "voita" ; ---- errors in Part butter_N = reg3N "voi" "voin" "voita" ; ---- errors in Part
buy_V2 = dirV2 (regV "ostaa") ; buy_V2 = dirV2 (regV "ostaa") ;
camera_N = regN "kamera" ; camera_N = nLukko "kamera" ;
cap_N = regN "lakki" ; cap_N = regN "lakki" ;
car_N = reg3N "auto" "auton" "autoja" ; -- regN: audon car_N = reg3N "auto" "auton" "autoja" ; -- regN: audon
carpet_N = regN "matto" ; carpet_N = nLukko "matto" ;
cat_N = regN "kissa" ; cat_N = nLukko "kissa" ;
ceiling_N = regN "katto" ; ceiling_N = nLukko "katto" ;
chair_N = regN "tuoli" ; chair_N = regN "tuoli" ;
cheese_N = regN "juusto" ; cheese_N = nLukko "juusto" ;
child_N = mkN "lapsi" "lapsen" "lapsena" "lasta" "lapseen" child_N = mkN "lapsi" "lapsen" "lapsena" "lasta" "lapseen"
"lapsina" "lapsissa" "lasten" "lapsia" "lapsiin" human ; "lapsina" "lapsissa" "lasten" "lapsia" "lapsiin" human ;
church_N = regN "kirkko" ; church_N = nLukko "kirkko" ;
city_N = regN "kaupunki" ; city_N = regN "kaupunki" ;
clean_ADeg = regADeg "puhdas" ; clean_ADeg = regADeg "puhdas" ;
clever_ADeg = regADeg "viisas" ; clever_ADeg = regADeg "viisas" ;
close_V2 = dirV2 (regV "sulkea") ; close_V2 = dirV2 (regV "sulkea") ;
coat_N = regN "takki" ; coat_N = regN "takki" ;
cold_ADeg = mkADeg (regN "kylmä") "kylmempi" "kylmin" ; cold_ADeg = mkADeg (nLukko "kylmä") "kylmempi" "kylmin" ;
come_V = regV "tulla" ; come_V = regV "tulla" ;
computer_N = regN "tietokone" ; computer_N = regN "tietokone" ;
country_N = regN "maa" ; country_N = regN "maa" ;
cousin_N = regN "serkku" ; cousin_N = nLukko "serkku" ;
cow_N = regN "lehmä" ; cow_N = nLukko "lehmä" ;
die_V = regV "kuolla" ; die_V = regV "kuolla" ;
dirty_ADeg = mkADeg (regN "likainen") "likaisempi" "likaisin" ; dirty_ADeg = mkADeg (regN "likainen") "likaisempi" "likaisin" ;
distance_N3 = mkN3 (regN "etäisyys") elative illative ; distance_N3 = mkN3 (regN "etäisyys") elative illative ;
doctor_N = reg2N "tohtori" "tohtoreita" ; doctor_N = reg2N "tohtori" "tohtoreita" ;
dog_N = regN "koira" ; dog_N = nLukko "koira" ;
door_N = reg2N "ovi" "ovia" ; door_N = nArpi "ovi" ;
drink_V2 = dirV2 (regV "juoda") ; drink_V2 = dirV2 (regV "juoda") ;
easy_A2V = mkA2V (mkA2 (mkA (regN "helppo")) allative) ; easy_A2V = mkA2V (mkA2 (mkA (nLukko "helppo")) allative) ;
eat_V2 = dirV2 (regV "syödä") ; eat_V2 = dirV2 (regV "syödä") ;
empty_ADeg = mkADeg (regN "tyhjä") "tyhjempi" "tyhjin" ; empty_ADeg = mkADeg (nLukko "tyhjä") "tyhjempi" "tyhjin" ;
enemy_N = regN "vihollinen" ; enemy_N = regN "vihollinen" ;
factory_N = regN "tehdas" ; factory_N = regN "tehdas" ;
father_N2 = genN2 (regN "isä") ; father_N2 = genN2 (nLukko "isä") ;
fear_VS = mkVS (reg2V "pelätä" "pelkäsi") ; fear_VS = mkVS (reg2V "pelätä" "pelkäsi") ;
find_V2 = dirV2 (reg2V "löytää" "löysi") ; find_V2 = dirV2 (reg2V "löytää" "löysi") ;
fish_N = regN "kala" ; fish_N = nLukko "kala" ;
floor_N = reg2N "lattia" "lattioita" ; floor_N = reg2N "lattia" "lattioita" ;
forget_V2 = dirV2 (regV "unohtaa") ; forget_V2 = dirV2 (regV "unohtaa") ;
fridge_N = regN "jääkaappi" ; fridge_N = regN "jääkaappi" ;
friend_N = regN "ystävä" ; friend_N = nLukko "ystävä" ;
fruit_N = regN "hedelmä" ; fruit_N = nLukko "hedelmä" ;
fun_AV = mkAV (mkA (regN "hauska")) ; fun_AV = mkAV (mkA (nLukko "hauska")) ;
garden_N = regN "puutarha" ; garden_N = nKukko "puutarha" "puutarhan" "puutarhoja" ;
girl_N = regN "tyttö" ; girl_N = nLukko "tyttö" ;
glove_N = regN "käsine" ; glove_N = regN "käsine" ;
gold_N = regN "kulta" ; gold_N = nLukko "kulta" ;
good_ADeg = mkADeg (regN "hyvä") "parempi" "parhain" ; --- paras good_ADeg = mkADeg (nLukko "hyvä") "parempi" "parhain" ; --- paras
go_V = regV "mennä" ; go_V = regV "mennä" ;
green_ADeg = mkADeg (regN "vihreä") "vihreämpi" "vihrein" ; green_ADeg = mkADeg (regN "vihreä") "vihreämpi" "vihrein" ;
harbour_N = reg3N "satama" "sataman" "satamia" ; harbour_N = nKukko "satama" "sataman" "satamia" ;
hate_V2 = dirV2 (regV "vihata") ; hate_V2 = dirV2 (regV "vihata") ;
hat_N = regN "hattu" ; hat_N = nLukko "hattu" ;
have_V2 = dirV2 (caseV adessive vOlla) ; have_V2 = dirV2 (caseV adessive vOlla) ;
hear_V2 = dirV2 (regV "kuulla") ; hear_V2 = dirV2 (regV "kuulla") ;
hill_N = regN "kukkula" ; hill_N = nLukko "kukkula" ;
hope_VS = mkVS (regV "toivoa") ; hope_VS = mkVS (regV "toivoa") ;
horse_N = regN "hevonen" ; horse_N = regN "hevonen" ;
hot_ADeg = mkADeg (regN "kuuma") "kuumempi" "kuumin" ; hot_ADeg = mkADeg (nLukko "kuuma") "kuumempi" "kuumin" ;
house_N = regN "talo" ; house_N = nLukko "talo" ;
important_ADeg = mkADeg (regN "tärkeä") "tärkeämpi" "tärkein" ; important_ADeg = mkADeg (regN "tärkeä") "tärkeämpi" "tärkein" ;
industry_N = regN "teollisuus" ; industry_N = regN "teollisuus" ;
iron_N = regN "rauta" ; iron_N = nLukko "rauta" ;
king_N = regN "kuningas" ; king_N = regN "kuningas" ;
know_V2 = dirV2 (reg2V "tietää" "tiesi") ; --- tuntea; gives tietänyt know_V2 = dirV2 (reg2V "tietää" "tiesi") ; --- tuntea; gives tietänyt
lake_N = reg2N "järvi" "järviä" ; lake_N = nSylki "järvi" ;
lamp_N = regN "lamppu" ; lamp_N = nLukko "lamppu" ;
learn_V2 = learn_V2 =
dirV2 (mkV "oppia" "oppii" "opin" "oppivat" "oppikaa" "opitaan" dirV2 (mkV "oppia" "oppii" "opin" "oppivat" "oppikaa" "opitaan"
"oppi" "opin" "oppisi" "oppinut" "opittu" "opitun") ; "oppi" "opin" "oppisi" "oppinut" "opittu" "opitun") ;
leather_N = regN "nahka" ; --- nahan leather_N = nLukko "nahka" ; --- nahan
leave_V2 = dirV2 (regV "jättää") ; leave_V2 = dirV2 (regV "jättää") ;
like_V2 = caseV2 (regV "pitää") elative ; like_V2 = caseV2 (regV "pitää") elative ;
listen_V2 = caseV2 (reg3V "kuunnella" "kuuntelen" "kuunteli") partitive ; listen_V2 = caseV2 (reg3V "kuunnella" "kuuntelen" "kuunteli") partitive ;
live_V = regV "elää" ; live_V = regV "elää" ;
long_ADeg = mkADeg (regN "pitkä") "pitempi" "pisin" ; long_ADeg = mkADeg (nLukko "pitkä") "pitempi" "pisin" ;
lose_V2 = dirV2 (regV "hävitä") ; --- hukata lose_V2 = dirV2 (regV "hävitä") ; --- hukata
love_N = reg3N "rakkaus" "rakkauden" "rakkauksia" ; love_N = reg3N "rakkaus" "rakkauden" "rakkauksia" ;
love_V2 = caseV2 (regV "rakastaa") partitive ; love_V2 = caseV2 (regV "rakastaa") partitive ;
man_N = mkN "mies" "miehen" "miehenä" "miestä" "mieheen" man_N = mkN "mies" "miehen" "miehenä" "miestä" "mieheen"
"miehinä" "miehissä" "miesten" "miehiä" "miehiin" human ; "miehinä" "miehissä" "miesten" "miehiä" "miehiin" human ;
---- married_A2 = mkA2 (regA "married") "to" ; ---- married_A2 = mkA2 (regA "married") "to" ;
meat_N = regN "liha" ; meat_N = nLukko "liha" ;
milk_N = regN "maito" ; milk_N = nLukko "maito" ;
moon_N = regN "kuu" ; moon_N = regN "kuu" ;
mother_N2 = genN2 (regN "äiti") ; mother_N2 = genN2 (regN "äiti") ;
mountain_N = reg2N "vuori" "vuoria" ; mountain_N = nArpi "vuori" ;
music_N = regN "musiikki" ; music_N = regN "musiikki" ;
narrow_ADeg = mkADeg (regN "kapea") "kapeampi" "kapein" ; narrow_ADeg = mkADeg (regN "kapea") "kapeampi" "kapein" ;
new_ADeg = mkADeg (reg3N "uusi" "uuden" "uusia") "uudempi" "uusin" ; new_ADeg = mkADeg (reg3N "uusi" "uuden" "uusia") "uudempi" "uusin" ;
newspaper_N = nSylki "sanomalehti" ; --- for correct vowel harmony newspaper_N = nSylki "sanomalehti" ; --- for correct vowel harmony
oil_N = regN "öljy" ; oil_N = nLukko "öljy" ;
old_ADeg = mkADeg (regN "vanha") "vanhempi" "vanhin" ; old_ADeg = mkADeg (nLukko "vanha") "vanhempi" "vanhin" ;
open_V2 = dirV2 (regV "avata") ; open_V2 = dirV2 (regV "avata") ;
paint_V2A = mkV2A (dirV2 (regV "maalata")) translative ; paint_V2A = mkV2A (dirV2 (regV "maalata")) translative ;
paper_N = reg2N "paperi" "papereita" ; paper_N = reg2N "paperi" "papereita" ;
peace_N = regN "rauha" ; peace_N = nLukko "rauha" ;
pen_N = regN "kynä" ; pen_N = nLukko "kynä" ;
planet_N = regN "planeetta" ; planet_N = nLukko "planeetta" ;
plastic_N = regN "muovi" ; plastic_N = regN "muovi" ;
play_V2 = dirV2 (regV "pelata") ; --- leikkiä, soittaa play_V2 = dirV2 (regV "pelata") ; --- leikkiä, soittaa
policeman_N = regN "poliisi" ; policeman_N = regN "poliisi" ;
@@ -149,15 +150,15 @@ lin
rain_V0 = mkV0 (reg2V "sataa" "satoi") ; rain_V0 = mkV0 (reg2V "sataa" "satoi") ;
read_V2 = dirV2 (regV "lukea") ; read_V2 = dirV2 (regV "lukea") ;
red_ADeg = regADeg "punainen" ; red_ADeg = regADeg "punainen" ;
religion_N = regN "uskonto" ; religion_N = nLukko "uskonto" ;
restaurant_N = regN "ravintola" ; restaurant_N = nLukko "ravintola" ;
river_N = nArpi "joki" ; river_N = nArpi "joki" ;
rock_N = reg2N "kallio" "kallioita" ; rock_N = reg2N "kallio" "kallioita" ;
roof_N = regN "katto" ; roof_N = nLukko "katto" ;
rubber_N = regN "kumi" ; rubber_N = regN "kumi" ;
run_V = reg2V "juosta" "juoksi" ; run_V = reg2V "juosta" "juoksi" ;
say_VS = mkVS (regV "sanoa") ; say_VS = mkVS (regV "sanoa") ;
school_N = regN "koulu" ; school_N = nLukko "koulu" ;
science_N = regN "tiede" ; science_N = regN "tiede" ;
sea_N = nMeri "meri" ; sea_N = nMeri "meri" ;
seek_V2 = dirV2 (regV "etsiä") ; seek_V2 = dirV2 (regV "etsiä") ;
@@ -167,42 +168,42 @@ lin
sell_V3 = dirV3 (regV "myydä") allative ; sell_V3 = dirV3 (regV "myydä") allative ;
send_V3 = dirV3 (regV "lähettää") allative ; send_V3 = dirV3 (regV "lähettää") allative ;
sheep_N = regN "lammas" ; sheep_N = regN "lammas" ;
ship_N = regN "laiva" ; ship_N = nLukko "laiva" ;
shirt_N = regN "paita" ; shirt_N = nLukko "paita" ;
shoe_N = regN "kenkä" ; shoe_N = nLukko "kenkä" ;
shop_N = regN "kauppa" ; shop_N = nLukko "kauppa" ;
short_ADeg = regADeg "lyhyt" ; short_ADeg = regADeg "lyhyt" ;
silver_N = regN "hopea" ; silver_N = regN "hopea" ;
sister_N = regN "sisko" ; sister_N = nLukko "sisko" ;
sleep_V = regV "nukkua" ; sleep_V = regV "nukkua" ;
small_ADeg = mkADeg (reg3N "pieni" "pienen" "pieniä") "pienempi" "pienin" ; small_ADeg = mkADeg (reg2N "pieni" "pieniä") "pienempi" "pienin" ;
snake_N = regN "käärme" ; snake_N = regN "käärme" ;
sock_N = regN "sukka" ; sock_N = nLukko "sukka" ;
speak_V2 = dirV2 (regV "puhua") ; speak_V2 = dirV2 (regV "puhua") ;
star_N = reg2N "tähti" "tähtiä" ; star_N = nSylki "tähti" ;
steel_N = regN "teräs" ; steel_N = regN "teräs" ;
stone_N = reg2N "kivi" "kiviä" ; stone_N = nSylki "kivi" ;
stove_N = reg3N "liesi" "lieden" "liesiä" ; stove_N = reg3N "liesi" "lieden" "liesiä" ;
student_N = reg2N "opiskelija" "opiskelijoita" ; student_N = reg2N "opiskelija" "opiskelijoita" ;
stupid_ADeg = regADeg "tyhmä" ; stupid_ADeg = regADeg "tyhmä" ;
sun_N = regN "aurinko" ; sun_N = nLukko "aurinko" ;
switch8off_V2 = dirV2 (regV "sammuttaa") ; --- switch8off_V2 = dirV2 (regV "sammuttaa") ; ---
switch8on_V2 = dirV2 (regV "sytyttää") ; --- switch8on_V2 = dirV2 (regV "sytyttää") ; ---
table_N = regN "pöytä" ; table_N = nLukko "pöytä" ;
talk_V3 = mkV3 (regV "puhua") (caseP allative) (caseP elative) ; talk_V3 = mkV3 (regV "puhua") (caseP allative) (caseP elative) ;
teacher_N = regN "opettaja" ; teacher_N = nLukko "opettaja" ;
teach_V2 = dirV2 (regV "opettaa") ; teach_V2 = dirV2 (regV "opettaa") ;
television_N = reg2N "televisio" "telievisioita" ; television_N = reg2N "televisio" "televisioita" ;
thick_ADeg = regADeg "paksu" ; thick_ADeg = regADeg "paksu" ;
thin_ADeg = regADeg "ohut" ; thin_ADeg = regADeg "ohut" ;
train_N = regN "juna" ; train_N = nLukko "juna" ;
travel_V = regV "matkustaa" ; travel_V = regV "matkustaa" ;
tree_N = regN "puu" ; tree_N = regN "puu" ;
---- trousers_N = regN "trousers" ; ---- trousers_N = regN "trousers" ;
ugly_ADeg = mkADeg (regN "ruma") "rumempi" "rumin" ; ugly_ADeg = mkADeg (nLukko "ruma") "rumempi" "rumin" ;
understand_V2 = dirV2 (reg3V "ymmärtää" "ymmärrän" "ymmärsi") ; understand_V2 = dirV2 (reg3V "ymmärtää" "ymmärrän" "ymmärsi") ;
university_N = regN "yliopisto" ; university_N = nLukko "yliopisto" ;
village_N = regN "kylä" ; village_N = nLukko "kylä" ;
wait_V2 = caseV2 (regV "odottaa") partitive ; wait_V2 = caseV2 (regV "odottaa") partitive ;
walk_V = regV "kävellä" ; walk_V = regV "kävellä" ;
warm_ADeg = mkADeg warm_ADeg = mkADeg
@@ -210,7 +211,7 @@ lin
"lämpiminä" "lämpimissä" "lämpimien" "lämpimiä" "lämpimiin" "lämpiminä" "lämpimissä" "lämpimien" "lämpimiä" "lämpimiin"
nonhuman) nonhuman)
"lämpimämpi" "lämpimin" ; "lämpimämpi" "lämpimin" ;
war_N = regN "sota" ; war_N = nLukko "sota" ;
watch_V2 = dirV2 (regV "katsella") ; watch_V2 = dirV2 (regV "katsella") ;
water_N = reg3N "vesi" "veden" "vesiä" ; water_N = reg3N "vesi" "veden" "vesiä" ;
white_ADeg = regADeg "valkoinen" ; white_ADeg = regADeg "valkoinen" ;
@@ -222,7 +223,7 @@ lin
wood_N = regN "puu" ; wood_N = regN "puu" ;
write_V2 = dirV2 (regV "kirjoittaa") ; write_V2 = dirV2 (regV "kirjoittaa") ;
yellow_ADeg = regADeg "keltainen" ; yellow_ADeg = regADeg "keltainen" ;
young_ADeg = mkADeg (reg2N "nuori" "nuoria") "nuorempi" "nuorin" ; young_ADeg = mkADeg (nArpi "nuori") "nuorempi" "nuorin" ;
do_V2 = dirV2 ( do_V2 = dirV2 (
mkV "tehdä" "tekee" "teen" "tekevät" "tehkää" "tehdään" mkV "tehdä" "tekee" "teen" "tekevät" "tehkää" "tehdään"
@@ -230,7 +231,7 @@ lin
now_Adv = mkAdv "nyt" ; now_Adv = mkAdv "nyt" ;
already_Adv = mkAdv "jo" ; already_Adv = mkAdv "jo" ;
song_N = regN "laulu" ; song_N = nLukko "laulu" ;
add_V3 = dirV3 (regV "lisätä") illative ; add_V3 = dirV3 (regV "lisätä") illative ;
number_N = reg2N "numero" "numeroita" ; number_N = reg2N "numero" "numeroita" ;
put_V2 = dirV2 (regV "panna") ; put_V2 = dirV2 (regV "panna") ;

View File

@@ -22,7 +22,7 @@ concrete ClauseFin of Clause = CategoriesFin **
---- (reflPronNounPhrase (pgen2gen subj.g) subj.n subj.p)) ; ---- (reflPronNounPhrase (pgen2gen subj.g) subj.n subj.p)) ;
SPredVS subj verb sent = SPredVS subj verb sent =
sats2clause ( sats2clause (
insertComplement (mkSats subj verb) sent.s) ; insertComplement (mkSats subj verb) (embedConj ++ sent.s)) ;
SPredVQ subj verb quest = SPredVQ subj verb quest =
sats2clause ( sats2clause (
insertComplement (mkSats subj verb) quest.s) ; insertComplement (mkSats subj verb) quest.s) ;
@@ -30,7 +30,7 @@ concrete ClauseFin of Clause = CategoriesFin **
sats2clause ( sats2clause (
insertComplement insertComplement
(mkSatsObject subj verb obj) (mkSatsObject subj verb obj)
sent.s (embedConj ++ sent.s)
) ; ) ;
SPredV2Q subj verb obj quest = SPredV2Q subj verb obj quest =
sats2clause ( sats2clause (

View File

@@ -18,10 +18,41 @@ resource MorphoFin = TypesFin ** open Prelude in {
oper oper
NounH : Type = {
a,vesi,vede,vete,vetta,veteen,vetii,vesii,vesien,vesia,vesiin : Str
} ;
-- worst-case macro -- worst-case macro
mkSubst : Str -> (_,_,_,_,_,_,_,_,_,_ : Str) -> CommonNoun = mkSubst : Str -> (_,_,_,_,_,_,_,_,_,_ : Str) -> NounH =
\a,vesi,vede,vete,vetta,veteen,vetii,vesii,vesien,vesia,vesiin -> \a,vesi,vede,vete,vetta,veteen,vetii,vesii,vesien,vesia,vesiin ->
{a = a ;
vesi = vesi ;
vede = vede ;
vete = vete ;
vetta = vetta ;
veteen = veteen ;
vetii = vetii ;
vesii = vesii ;
vesien = vesien ;
vesia = vesia ;
vesiin = vesiin
} ;
nhn : NounH -> CommonNoun = \nh ->
let
a = nh.a ;
vesi = nh.vesi ;
vede = nh.vede ;
vete = nh.vete ;
vetta = nh.vetta ;
veteen = nh.veteen ;
vetii = nh.vetii ;
vesii = nh.vesii ;
vesien = nh.vesien ;
vesia = nh.vesia ;
vesiin = nh.vesiin
in
{s = table { {s = table {
NCase Sg Nom => vesi ; NCase Sg Nom => vesi ;
NCase Sg Gen => vede + "n" ; NCase Sg Gen => vede + "n" ;
@@ -65,9 +96,71 @@ oper
mkNoun : (_,_,_,_,_,_,_,_,_,_ : Str) -> CommonNoun = mkNoun : (_,_,_,_,_,_,_,_,_,_ : Str) -> CommonNoun =
\talo,talon,talona,taloa,taloon,taloina,taloissa,talojen,taloja,taloihin -> \talo,talon,talona,taloa,taloon,taloina,taloissa,talojen,taloja,taloihin ->
mkSubst (ifTok Str (Predef.dp 1 talona) "a" "a" "ä") nhn (mkSubst (ifTok Str (Predef.dp 1 talona) "a" "a" "ä")
talo (Predef.tk 1 talon) (Predef.tk 2 talona) taloa taloon talo (Predef.tk 1 talon) (Predef.tk 2 talona) taloa taloon
(Predef.tk 2 taloina) (Predef.tk 3 taloissa) talojen taloja taloihin ; (Predef.tk 2 taloina) (Predef.tk 3 taloissa) talojen taloja taloihin) ;
-- Regular heuristics.
{-
regNounH : Str -> NounH = \vesi ->
let
esi = Predef.dp 3 vesi ; -- analysis: suffixes
si = Predef.dp 2 esi ;
i = last si ;
s = init si ;
a = if_then_Str (pbool2bool (Predef.occurs "aou" vesi)) "a" "ä" ;
ves = init vesi ; -- synthesis: prefixes
vet = strongGrade ves ;
ve = init ves ;
in
case esi of {
"uus" | "yys" => sRakkaus vesi ;
"nen" => sNainen (Predef.tk 3 vesi + ("st" + a)) ;
_ => case si of {
"aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" => sPuu vesi ;
"ie" | "uo" | "yö" => sSuo vesi ;
"ea" | "eä" =>
mkSubst
a
vesi (vesi) (vesi) (vesi + a) (vesi + a+"n")
(ves + "i") (ves + "i") (ves + "iden") (ves + "it"+a)
(ves + "isiin") ;
"is" => sNauris (vesi + ("t" + a)) ;
"ut" | "yt" => sRae vesi (ves + ("en" + a)) ;
"as" | "äs" => sRae vesi (vet + (a + "n" + a)) ;
"ar" | "är" => sRae vesi (vet + ("ren" + a)) ;
_ => case i of {
"n" => sLiitin vesi (vet + "men") ;
"s" => sTilaus vesi (ves + ("ksen" + a)) ;
"i" => sBaari (vesi + a) ;
"e" => sRae vesi (strongGrade vesi + "en" + a) ;
"a" | "o" | "u" | "y" | "ä" | "ö" => sLukko vesi ;
_ => sLinux (vesi + "i" + a)
}
}
} ;
reg2NounH : (savi,savia : Str) -> NounH = \savi,savia ->
let
savit = regNounH savi ;
ia = Predef.dp 2 savia ;
i = init ia ;
a = last ia ;
o = last savi ;
savin = weakGrade savi + "n" ;
in
case <o,ia> of {
<"i","ia"> => sArpi savi ;
<"i","iä"> => sSylki savi ;
<"i","ta"> | <"i","tä"> => sTohtori (savi + a) ;
<"o","ta"> | <"ö","tä"> => sRadio savi ;
<"a","ta"> | <"ä","tä"> => sPeruna savi ;
<"a","ia"> | <"a","ja"> => sKukko savi savin savia ;
_ => savit
} ;
-}
-- Here some useful special cases; more will be given in $paradigms.Fin.gf$. -- Here some useful special cases; more will be given in $paradigms.Fin.gf$.
-- --
@@ -75,7 +168,7 @@ oper
-- to account for grade and vowel alternation, three forms are usually enough -- to account for grade and vowel alternation, three forms are usually enough
-- Examples: "talo", "kukko", "huippu", "koira", "kukka", "syylä",... -- Examples: "talo", "kukko", "huippu", "koira", "kukka", "syylä",...
sKukko : (_,_,_ : Str) -> CommonNoun = \kukko,kukon,kukkoja -> sKukko : (_,_,_ : Str) -> NounH = \kukko,kukon,kukkoja ->
let { let {
o = Predef.dp 1 kukko ; o = Predef.dp 1 kukko ;
a = Predef.dp 1 kukkoja ; a = Predef.dp 1 kukkoja ;
@@ -99,7 +192,7 @@ oper
kukkoja kukkoja
(kukkoi + ifi "in" "ihin") ; (kukkoi + ifi "in" "ihin") ;
sLukko : Str -> CommonNoun = \lukko -> sLukko : Str -> NounH = \lukko ->
let let
o = last lukko ; o = last lukko ;
lukk = init lukko ; lukk = init lukko ;
@@ -114,9 +207,9 @@ oper
-- The special case with no alternations. -- The special case with no alternations.
sTalo : Str -> CommonNoun = sLukko ; sTalo : Str -> NounH = sLukko ;
sBaari : Str -> CommonNoun = \baaria -> sBaari : Str -> NounH = \baaria ->
let let
baari = Predef.tk 1 baaria ; baari = Predef.tk 1 baaria ;
baar = Predef.tk 1 baari ; baar = Predef.tk 1 baari ;
@@ -124,32 +217,40 @@ oper
in in
sKukko baari (weakGrade baari + "n") (baar + ("ej" + a)) ; sKukko baari (weakGrade baari + "n") (baar + ("ej" + a)) ;
sKorpi : (_,_,_ : Str) -> CommonNoun = \korpi,korven,korpena -> sKorpi : (_,_,_ : Str) -> NounH = \korpi,korven,korpena ->
let { let
a = Predef.dp 1 korpena ; a = Predef.dp 1 korpena ;
korpe = Predef.tk 2 korpena ; korpe = Predef.tk 2 korpena ;
korp = init korpi ;
korpea = case last korp of {
"r" | "l" | "n" => korp + "t" + a ;
_ => korpe + a
} ;
korve = Predef.tk 1 korven ; korve = Predef.tk 1 korven ;
korvi = Predef.tk 1 korve + "i" korvi = Predef.tk 1 korve + "i" ;
} korpien = case last korp of {
"r" | "l" | "n" => korp + "ten" ;
_ => korpi + "en"
} ;
in in
mkSubst a mkSubst a
korpi korpi
korve korve
korpe korpe
(korpe + a) korpea
(korpe + "en") (korpe + "en")
korpi korpi
korvi korvi
(korpi + "en") korpien
(korpi + a) (korpi + a)
(korpi + "in") ; (korpi + "in") ;
sArpi : Str -> CommonNoun = \arpi -> sArpi : Str -> NounH = \arpi ->
sKorpi arpi (init (weakGrade arpi) + "en") (init arpi + "ena") ; sKorpi arpi (init (weakGrade arpi) + "en") (init arpi + "ena") ;
sSylki : Str -> CommonNoun = \sylki -> sSylki : Str -> NounH = \sylki ->
sKorpi sylki (init (weakGrade sylki) + "en") (init sylki + "enä") ; sKorpi sylki (init (weakGrade sylki) + "en") (init sylki + "enä") ;
sKoira : Str -> CommonNoun = \koira -> sKoira : Str -> NounH = \koira ->
let a = getHarmony (last koira) in let a = getHarmony (last koira) in
sKukko koira (koira + "n") (init koira + "i" + a) ; sKukko koira (koira + "n") (init koira + "i" + a) ;
@@ -157,7 +258,7 @@ oper
-- "malli"/"mallin"/"malleja", with the exception that the "i" is not attached -- "malli"/"mallin"/"malleja", with the exception that the "i" is not attached
-- to the singular nominative. -- to the singular nominative.
sLinux : Str -> CommonNoun = \linuxia -> sLinux : Str -> NounH = \linuxia ->
let { let {
linux = Predef.tk 2 linuxia ; linux = Predef.tk 2 linuxia ;
a = getHarmony (Predef.dp 1 linuxia) ; a = getHarmony (Predef.dp 1 linuxia) ;
@@ -177,7 +278,7 @@ oper
-- Nouns of at least 3 syllables ending with "a" or "ä", like "peruna", "rytinä". -- Nouns of at least 3 syllables ending with "a" or "ä", like "peruna", "rytinä".
sPeruna : Str -> CommonNoun = \peruna -> sPeruna : Str -> NounH = \peruna ->
let { let {
a = Predef.dp 1 peruna ; a = Predef.dp 1 peruna ;
perun = Predef.tk 1 peruna ; perun = Predef.tk 1 peruna ;
@@ -196,7 +297,7 @@ oper
(perunoi + ("t" + a)) (perunoi + ("t" + a))
(perunoi + "hin") ; (perunoi + "hin") ;
sTohtori : Str -> CommonNoun = \tohtoria -> sTohtori : Str -> NounH = \tohtoria ->
let let
a = last tohtoria ; a = last tohtoria ;
tohtori = init tohtoria ; tohtori = init tohtoria ;
@@ -214,7 +315,7 @@ oper
(tohtorei + "t" + a) (tohtorei + "t" + a)
(tohtorei + "hin") ; (tohtorei + "hin") ;
sRadio : Str -> CommonNoun = \radio -> sRadio : Str -> NounH = \radio ->
let let
o = last radio ; o = last radio ;
a = getHarmony o ; a = getHarmony o ;
@@ -235,7 +336,7 @@ oper
-- Surpraisingly, making the test for the partitive, this not only covers -- Surpraisingly, making the test for the partitive, this not only covers
-- "rae", "perhe", "savuke", but also "rengas", "lyhyt" (except $Sg Illat$), etc. -- "rae", "perhe", "savuke", but also "rengas", "lyhyt" (except $Sg Illat$), etc.
sRae : (_,_ : Str) -> CommonNoun = \rae,rakeena -> sRae : (_,_ : Str) -> NounH = \rae,rakeena ->
let { let {
a = Predef.dp 1 rakeena ; a = Predef.dp 1 rakeena ;
rakee = Predef.tk 2 rakeena ; rakee = Predef.tk 2 rakeena ;
@@ -255,7 +356,7 @@ oper
(rakei + ("t" + a)) (rakei + ("t" + a))
(rakei + "siin") ; (rakei + "siin") ;
sSusi : (_,_,_ : Str) -> CommonNoun = \susi,suden,sutena -> sSusi : (_,_,_ : Str) -> NounH = \susi,suden,sutena ->
let let
a = Predef.dp 1 sutena ; a = Predef.dp 1 sutena ;
sude = Predef.tk 1 suden ; sude = Predef.tk 1 suden ;
@@ -274,7 +375,7 @@ oper
(susi + a) (susi + a)
(susi + "in") ; (susi + "in") ;
sPuu : Str -> CommonNoun = \puu -> sPuu : Str -> NounH = \puu ->
let { let {
u = Predef.dp 1 puu ; u = Predef.dp 1 puu ;
a = getHarmony u ; a = getHarmony u ;
@@ -294,7 +395,7 @@ oper
(pui + ("t" + a)) (pui + ("t" + a))
(pui + "hin") ; (pui + "hin") ;
sSuo : Str -> CommonNoun = \suo -> sSuo : Str -> NounH = \suo ->
let { let {
o = Predef.dp 1 suo ; o = Predef.dp 1 suo ;
a = getHarmony o ; a = getHarmony o ;
@@ -315,7 +416,7 @@ oper
-- Here in fact it is handy to use the partitive form as the only stem. -- Here in fact it is handy to use the partitive form as the only stem.
sNainen : Str -> CommonNoun = \naista -> sNainen : Str -> NounH = \naista ->
let { let {
nainen = Predef.tk 3 naista + "nen" ; nainen = Predef.tk 3 naista + "nen" ;
nais = Predef.tk 2 naista ; nais = Predef.tk 2 naista ;
@@ -339,7 +440,7 @@ oper
-- The following covers: "tilaus", "kaulin", "paimen", "laidun", "sammal", -- The following covers: "tilaus", "kaulin", "paimen", "laidun", "sammal",
-- "kyynel" (excep $Sg Iness$ for the last two?). -- "kyynel" (excep $Sg Iness$ for the last two?).
sTilaus : (_,_ : Str) -> CommonNoun = \tilaus, tilauksena -> sTilaus : (_,_ : Str) -> NounH = \tilaus, tilauksena ->
let { let {
tilauks = Predef.tk 3 tilauksena ; tilauks = Predef.tk 3 tilauksena ;
tilaukse = tilauks + "e" ; tilaukse = tilauks + "e" ;
@@ -362,7 +463,7 @@ oper
-- Some words have the three grades ("rakkaus","rakkauden","rakkautena"), which -- Some words have the three grades ("rakkaus","rakkauden","rakkautena"), which
-- are however derivable from the stem. -- are however derivable from the stem.
sRakkaus : Str -> CommonNoun = \rakkaus -> sRakkaus : Str -> NounH = \rakkaus ->
let { let {
rakkau = Predef.tk 1 rakkaus ; rakkau = Predef.tk 1 rakkaus ;
rakkaut = rakkau + "t" ; rakkaut = rakkau + "t" ;
@@ -387,7 +488,7 @@ oper
-- The following covers nouns like "nauris" and adjectives like "kallis", "tyyris". -- The following covers nouns like "nauris" and adjectives like "kallis", "tyyris".
sNauris : (_ : Str) -> CommonNoun = \naurista -> sNauris : (_ : Str) -> NounH = \naurista ->
let { let {
a = Predef.dp 1 naurista ; a = Predef.dp 1 naurista ;
nauris = Predef.tk 2 naurista ; nauris = Predef.tk 2 naurista ;
@@ -411,7 +512,7 @@ oper
-- Words of the form "siitin", "avain", "höyhen" (w or wo grade alternation). -- Words of the form "siitin", "avain", "höyhen" (w or wo grade alternation).
sLiitin : Str -> Str -> CommonNoun = \liitin,liittimen -> sLiitin : Str -> Str -> NounH = \liitin,liittimen ->
let let
liittime = init liittimen ; liittime = init liittimen ;
liitti = Predef.tk 2 liittime ; liitti = Predef.tk 2 liittime ;
@@ -433,7 +534,7 @@ oper
-- The following covers adjectives like "kapea", "leveä". -- The following covers adjectives like "kapea", "leveä".
sKapea : (_ : Str) -> CommonNoun = \kapea -> sKapea : (_ : Str) -> NounH = \kapea ->
let let
a = last kapea ; a = last kapea ;
kape = init kapea ; kape = init kapea ;
@@ -453,7 +554,7 @@ oper
-- The following two are used for adjective comparison. -- The following two are used for adjective comparison.
sSuurempi : Str -> CommonNoun = \suurempaa -> sSuurempi : Str -> NounH = \suurempaa ->
let { let {
a = Predef.dp 1 suurempaa ; a = Predef.dp 1 suurempaa ;
suure = Predef.tk 4 suurempaa ; suure = Predef.tk 4 suurempaa ;
@@ -474,7 +575,7 @@ oper
(suurempi + a) (suurempi + a)
(suurempi + "in") ; (suurempi + "in") ;
sSuurin : Str -> CommonNoun = \suurinta -> sSuurin : Str -> NounH = \suurinta ->
let { let {
a = Predef.dp 1 suurinta ; a = Predef.dp 1 suurinta ;
suuri = Predef.tk 3 suurinta ; suuri = Predef.tk 3 suurinta ;
@@ -682,7 +783,7 @@ vowelHarmony : Str -> Str = \liitin ->
-- The inflextion shows a surprising similarity with "suo". -- The inflextion shows a surprising similarity with "suo".
relPron : RelPron = relPron : RelPron =
let {jo = sSuo "jo"} in {s = let {jo = nhn (sSuo "jo")} in {s =
table { table {
Sg => table { Sg => table {
Nom => "joka" ; Nom => "joka" ;
@@ -698,7 +799,7 @@ vowelHarmony : Str -> Str = \liitin ->
mikaInt : Number => Case => Str = mikaInt : Number => Case => Str =
let { let {
mi = sSuo "mi" mi = nhn (sSuo "mi")
} in } in
table { table {
Sg => table { Sg => table {
@@ -715,8 +816,8 @@ vowelHarmony : Str -> Str = \liitin ->
kukaInt : Number => Case => Str = kukaInt : Number => Case => Str =
let { let {
ku = sRae "kuka" "kenenä" ; ku = nhn (sRae "kuka" "kenenä") ;
ket = sRae "kuka" "keinä"} in ket = nhn (sRae "kuka" "keinä")} in
table { table {
Sg => table { Sg => table {
Nom => "kuka" ; Nom => "kuka" ;
@@ -773,8 +874,8 @@ vowelHarmony : Str -> Str = \liitin ->
jokuPron : Number => Case => Str = jokuPron : Number => Case => Str =
let let
ku = sPuu "ku" ; ku = nhn (sPuu "ku") ;
kui = sPuu "kuu" kui = nhn (sPuu "kuu")
in in
table { table {
Sg => table { Sg => table {
@@ -801,7 +902,7 @@ vowelHarmony : Str -> Str = \liitin ->
} }
} ; } ;
moniPron : Case => Str = caseTable singular (sSusi "moni" "monen" "monena") ; moniPron : Case => Str = caseTable singular (nhn (sSusi "moni" "monen" "monena")) ;
caseTable : Number -> CommonNoun -> Case => Str = \n,cn -> caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
\\c => cn.s ! NCase n c ; \\c => cn.s ! NCase n c ;
@@ -841,8 +942,8 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
regAdjDegr : CommonNoun -> Str -> Str -> AdjDegr = \kiva, kivempaa, kivinta -> regAdjDegr : CommonNoun -> Str -> Str -> AdjDegr = \kiva, kivempaa, kivinta ->
mkAdjDegr mkAdjDegr
(noun2adj kiva) (noun2adj kiva)
(noun2adjComp False (sSuurempi kivempaa)) (noun2adjComp False (nhn (sSuurempi kivempaa)))
(noun2adjComp False (sSuurin kivinta)) ; (noun2adjComp False (nhn (sSuurin kivinta))) ;
--3 Verbs --3 Verbs
@@ -857,13 +958,33 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb = mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb =
\tulla,tulee,tulen,tulevat,tulkaa,tullaan,tuli,tulin,tulisi,tullut,tultu,tullun -> \tulla,tulee,tulen,tulevat,tulkaa,tullaan,tuli,tulin,tulisi,tullut,tultu,tullun ->
v2v (mkVerbH
tulla tulee tulen tulevat tulkaa tullaan tuli tulin tulisi tullut tultu tullun
) ;
v2v : VerbH -> Verb = \vh ->
let let
tulla = vh.tulla ;
tulee = vh.tulee ;
tulen = vh.tulen ;
tulevat = vh.tulevat ;
tulkaa = vh.tulkaa ;
tullaan = vh.tullaan ;
tuli = vh.tuli ;
tulin = vh.tulin ;
tulisi = vh.tulisi ;
tullut = vh.tullut ;
tultu = vh.tultu ;
tultu = vh.tultu ;
tullun = vh.tullun ;
tuje = init tulen ; tuje = init tulen ;
tuji = init tulin ; tuji = init tulin ;
a = Predef.dp 1 tulkaa ; a = Predef.dp 1 tulkaa ;
tulko = Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ;
o = last tulko ;
tulleena = Predef.tk 2 tullut + ("een" + a) ; tulleena = Predef.tk 2 tullut + ("een" + a) ;
tulleen = (noun2adj (sRae tullut tulleena)).s ; tulleen = (noun2adj (nhn (sRae tullut tulleena))).s ;
tullun = (noun2adj (sKukko tultu tullun (tultu + ("j"+a)))).s ; tullun = (noun2adj (nhn (sKukko tultu tullun (tultu + ("j"+a))))).s ;
tulema = Predef.tk 3 tulevat + "m" + a ; tulema = Predef.tk 3 tulevat + "m" + a ;
vat = "v" + a + "t" vat = "v" + a + "t"
in in
@@ -889,7 +1010,10 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
Cond Pl P3 => tulisi + vat ; Cond Pl P3 => tulisi + vat ;
Imper Sg => tuje ; Imper Sg => tuje ;
Imper Pl => tulkaa ; Imper Pl => tulkaa ;
ImpNegPl => Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ; ImperP3 Sg => tulko + o + "n" ;
ImperP3 Pl => tulko + o + "t" ;
ImperP1Pl => tulkaa + "mme" ;
ImpNegPl => tulko ;
Pass True => tullaan ; Pass True => tullaan ;
Pass False => Predef.tk 2 tullaan ; Pass False => Predef.tk 2 tullaan ;
PastPartAct n => tulleen ! n ; PastPartAct n => tulleen ! n ;
@@ -902,9 +1026,95 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
} }
} ; } ;
VerbH : Type = {
tulla,tulee,tulen,tulevat,tulkaa,tullaan,tuli,tulin,tulisi,tullut,tultu,tullun
: Str
} ;
mkVerbH : (_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> VerbH =
\tulla,tulee,tulen,tulevat,tulkaa,tullaan,tuli,tulin,tulisi,tullut,tultu,tullun ->
{tulla = tulla ;
tulee = tulee ;
tulen = tulen ;
tulevat = tulevat ;
tulkaa = tulkaa ;
tullaan = tullaan ;
tuli = tuli ;
tulin = tulin ;
tulisi = tulisi ;
tullut = tullut ;
tultu = tultu ;
tullun = tullun
} ;
regVerbH : Str -> VerbH = \soutaa ->
let
taa = Predef.dp 3 soutaa ;
ta = init taa ;
aa = Predef.dp 2 taa ;
juo = Predef.tk 2 soutaa ;
souda = weakGrade (init soutaa) ;
soudan = juo + "en" ;
o = Predef.dp 1 juo ;
a = last aa ;
u = ifTok Str a "a" "u" "y" ;
joi = Predef.tk 2 juo + (o + "i")
in case ta of {
"it" => vHarkita soutaa ;
"st" | "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ;
_ => case aa of {
"aa" | "ää" => vOttaa soutaa (souda + "n") ;
"da" | "dä" => vJuoda soutaa joi ;
"ta" | "tä" => vOsata soutaa ;
_ => vHukkua soutaa souda
}} ;
reg2VerbH : (soutaa,souti : Str) -> VerbH = \soutaa,souti ->
let
soudat = regVerbH soutaa ;
soudan = weakGrade (init soutaa) + "n" ;
soudin = weakGrade souti + "n" ;
souden = init souti + "en" ;
juo = Predef.tk 2 soutaa ;
o = Predef.dp 1 juo ;
u = ifTok Str (last soutaa) "a" "u" "y" ;
aa = Predef.dp 2 soutaa ;
taa = Predef.dp 3 soutaa ;
ta = Predef.tk 1 taa ;
in
case aa of {
"aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
_ => case ta of {
"at" | "ät" => vPalkata soutaa souti ;
"st" => vJuosta soutaa souden (juo + o+u+"t") (juo + "t"+u) ;
_ => soudat
}} ** {sc = Nom ; lock_V = <>} ;
reg3VerbH : (_,_,_ : Str) -> VerbH = \soutaa,soudan,souti ->
let
taa = Predef.dp 3 soutaa ;
ta = init taa ;
aa = Predef.dp 2 taa ;
souda = init soudan ;
juo = Predef.tk 2 soutaa ;
o = last juo ;
a = last aa ;
u = ifTok Str a "a" "u" "y" ;
soudin = weakGrade souti + "n" ;
soudat = reg2VerbH soutaa souti ;
in case ta of {
"ll" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ;
"ot" | "öt" => vPudota soutaa souti ;
_ => case aa of {
"aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
"da" | "dä" => vJuoda soutaa souti ;
_ => soudat
}} ** {sc = Nom ; lock_V = <>} ;
-- For "harppoa", "hukkua", "löytyä", with grade alternation. -- For "harppoa", "hukkua", "löytyä", with grade alternation.
vHukkua : (_,_ : Str) -> Verb = \hukkua,huku -> vHukkua : (_,_ : Str) -> VerbH = \hukkua,huku ->
let { let {
a = Predef.dp 1 hukkua ; a = Predef.dp 1 hukkua ;
hukku = Predef.tk 1 hukkua ; hukku = Predef.tk 1 hukkua ;
@@ -920,7 +1130,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
hukkui = init hukku + i + "i" ; hukkui = init hukku + i + "i" ;
hukui = init huku + i + "i" ; hukui = init huku + i + "i" ;
} in } in
mkVerb mkVerbH
hukkua hukkua
(hukku + u) (hukku + u)
(huku + "n") (huku + "n")
@@ -936,14 +1146,14 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- For cases with or without alternation: "sanoa", "valua", "kysyä". -- For cases with or without alternation: "sanoa", "valua", "kysyä".
vSanoa : Str -> Verb = \sanoa -> vSanoa : Str -> VerbH = \sanoa ->
vHukkua sanoa (Predef.tk 1 sanoa) ; vHukkua sanoa (Predef.tk 1 sanoa) ;
---- vHukkua sanoa (weakGrade (Predef.tk 1 sanoa)) ; ---- vHukkua sanoa (weakGrade (Predef.tk 1 sanoa)) ;
---- The gfr file becomes 6* bigger if this change is done ---- The gfr file becomes 6* bigger if this change is done
-- For "ottaa", "käyttää", "löytää", "huoltaa", "hiihtää", "siirtää". -- For "ottaa", "käyttää", "löytää", "huoltaa", "hiihtää", "siirtää".
vHuoltaa : (_,_,_,_ : Str) -> Verb = \ottaa,otan,otti,otin -> vHuoltaa : (_,_,_,_ : Str) -> VerbH = \ottaa,otan,otti,otin ->
let { let {
a = Predef.dp 1 ottaa ; a = Predef.dp 1 ottaa ;
aa = a + a ; aa = a + a ;
@@ -952,7 +1162,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
otta = Predef.tk 1 ottaa ; otta = Predef.tk 1 ottaa ;
ote = Predef.tk 1 ota + "e" ote = Predef.tk 1 ota + "e"
} in } in
mkVerb mkVerbH
ottaa ottaa
ottaa ottaa
otan otan
@@ -968,7 +1178,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- For cases where grade alternation is not affected by the imperfect "i". -- For cases where grade alternation is not affected by the imperfect "i".
vOttaa : (_,_ : Str) -> Verb = \ottaa,otan -> vOttaa : (_,_ : Str) -> VerbH = \ottaa,otan ->
let let
i = "i" ; --- wrong rule if_then_Str (pbool2bool (Predef.occurs "ou" ottaa)) "i" "oi" i = "i" ; --- wrong rule if_then_Str (pbool2bool (Predef.occurs "ou" ottaa)) "i" "oi"
in in
@@ -976,7 +1186,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- For "poistaa", "ryystää". -- For "poistaa", "ryystää".
vPoistaa : Str -> Verb = \poistaa -> vPoistaa : Str -> VerbH = \poistaa ->
vOttaa poistaa ((Predef.tk 1 poistaa + "n")) ; vOttaa poistaa ((Predef.tk 1 poistaa + "n")) ;
@@ -984,17 +1194,17 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- from "pelätä-pelkäsi" vs. "palata-palasi" -- from "pelätä-pelkäsi" vs. "palata-palasi"
vOsata : Str -> Verb = \osata -> vOsata : Str -> VerbH = \osata ->
vPalkata osata (Predef.tk 2 osata + "si") ; vPalkata osata (Predef.tk 2 osata + "si") ;
vPalkata : Str -> Str -> Verb = \palkata,palkkasi -> vPalkata : Str -> Str -> VerbH = \palkata,palkkasi ->
let let
a = Predef.dp 1 palkata ; a = Predef.dp 1 palkata ;
palka = Predef.tk 2 palkata ; palka = Predef.tk 2 palkata ;
palkka = Predef.tk 2 palkkasi ; palkka = Predef.tk 2 palkkasi ;
u = case a of {"a" => "u" ; _ => "y"} u = case a of {"a" => "u" ; _ => "y"}
in in
mkVerb mkVerbH
palkata palkata
(palkka + a) (palkka + a)
(palkka + (a + "n")) (palkka + (a + "n"))
@@ -1008,7 +1218,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
(palka + "tt" + u) (palka + "tt" + u)
(palka + "t" + u + "n") ; (palka + "t" + u + "n") ;
vPudota : Str -> Str -> Verb = \pudota, putosi -> vPudota : Str -> Str -> VerbH = \pudota, putosi ->
let let
a = Predef.dp 1 pudota ; a = Predef.dp 1 pudota ;
pudo = Predef.tk 2 pudota ; pudo = Predef.tk 2 pudota ;
@@ -1016,7 +1226,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
putoa = puto + a ; putoa = puto + a ;
u = case a of {"a" => "u" ; _ => "y"} u = case a of {"a" => "u" ; _ => "y"}
in in
mkVerb mkVerbH
pudota pudota
(putoa + a) (putoa + a)
(putoa + "n") (putoa + "n")
@@ -1030,7 +1240,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
(pudo + "tt" + u) (pudo + "tt" + u)
(pudo + "t" + u + "n") ; (pudo + "t" + u + "n") ;
vHarkita : Str -> Verb = \harkita -> vHarkita : Str -> VerbH = \harkita ->
let let
a = Predef.dp 1 harkita ; a = Predef.dp 1 harkita ;
harki = Predef.tk 2 harkita ; harki = Predef.tk 2 harkita ;
@@ -1038,7 +1248,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
harkitsi = harki + "tsi" ; harkitsi = harki + "tsi" ;
u = case a of {"a" => "u" ; _ => "y"} u = case a of {"a" => "u" ; _ => "y"}
in in
mkVerb mkVerbH
harkita harkita
(harkitse + "e") (harkitse + "e")
(harkitse + "n") (harkitse + "n")
@@ -1057,7 +1267,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- For "juosta", "piestä", "nousta", "rangaista", "kävellä", "surra", "panna". -- For "juosta", "piestä", "nousta", "rangaista", "kävellä", "surra", "panna".
vJuosta : (_,_,_,_ : Str) -> Verb = \juosta,juoksen,juossut,juostu -> vJuosta : (_,_,_,_ : Str) -> VerbH = \juosta,juoksen,juossut,juostu ->
let let
a = Predef.dp 1 juosta ; a = Predef.dp 1 juosta ;
t = last (init juosta) ; t = last (init juosta) ;
@@ -1066,7 +1276,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
juos = Predef.tk 2 juosta ; juos = Predef.tk 2 juosta ;
juostun = ifTok Str t "t" (juostu + "n") (init juossut + "n") ; juostun = ifTok Str t "t" (juostu + "n") (init juossut + "n") ;
in in
mkVerb mkVerbH
juosta juosta
(juokse + "e") (juokse + "e")
juoksen juoksen
@@ -1082,13 +1292,13 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
-- For "juoda", "syödä", "viedä", "naida", "saada". -- For "juoda", "syödä", "viedä", "naida", "saada".
vJuoda : (_,_ : Str) -> Verb = \juoda, joi -> vJuoda : (_,_ : Str) -> VerbH = \juoda, joi ->
let let
a = Predef.dp 1 juoda ; a = Predef.dp 1 juoda ;
juo = Predef.tk 2 juoda ; juo = Predef.tk 2 juoda ;
u = case a of {"a" => "u" ; _ => "y"} u = case a of {"a" => "u" ; _ => "y"}
in in
mkVerb mkVerbH
juoda juoda
juo juo
(juo + "n") (juo + "n")
@@ -1137,7 +1347,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
} ; } ;
kaikkiPron : Number -> Case => Str = \n -> kaikkiPron : Number -> Case => Str = \n ->
let {kaiket = caseTable n (sKorpi "kaikki" "kaiken" "kaikkena")} in let {kaiket = caseTable n (nhn (sKorpi "kaikki" "kaiken" "kaikkena"))} in
table { table {
Nom => "kaikki" ; Nom => "kaikki" ;
c => kaiket ! c c => kaiket ! c
@@ -1155,21 +1365,22 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
param NumPlace = NumIndep | NumAttr ; param NumPlace = NumIndep | NumAttr ;
oper oper
yksiN = mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi" yksiN = nhn (mkSubst "ä" "yksi" "yhde" "yhte" "yhtä" "yhteen" "yksi" "yksi"
"yksien" "yksiä" "yksiin" ; "yksien" "yksiä" "yksiin") ;
kymmenenN = mkSubst "ä" "kymmenen" "kymmene" "kymmene" "kymmentä" kymmenenN = nhn (mkSubst "ä" "kymmenen" "kymmene" "kymmene" "kymmentä"
"kymmeneen" "kymmeni" "kymmeni" "kymmenien" "kymmeniä" "kymmeneen" "kymmeni" "kymmeni" "kymmenien" "kymmeniä"
"kymmeniin" ; "kymmeniin") ;
sataN = sLukko "sata" ; sataN = nhn (sLukko "sata") ;
tuhatN = mkSubst "a" "tuhat" "tuhanne" "tuhante" "tuhatta" "tuhanteen" tuhatN = nhn (mkSubst "a" "tuhat" "tuhanne" "tuhante" "tuhatta" "tuhanteen"
"tuhansi" "tuhansi" "tuhansien" "tuhansia" "tuhansiin" ; "tuhansi" "tuhansi" "tuhansien" "tuhansia" "tuhansiin") ;
kymmentaN = {s = table { kymmentaN = {s = table {
NCase Sg Nom => "kymmentä" ; NCase Sg Nom => "kymmentä" ;
c => kymmenenN.s ! c c => kymmenenN.s ! c
} }
} ; } ;
sataaN = {s = table { sataaN = {s = table {
Sg => sataN.s ; Sg => sataN.s ;
Pl => table { Pl => table {

View File

@@ -9,21 +9,21 @@ lincat
lin lin
num x = x ; num x = x ;
n2 = mkSubst "a" "kaksi" "kahde" "kahte" "kahta" "kahteen" "kaksi" "kaksi" n2 = nhn (mkSubst "a" "kaksi" "kahde" "kahte" "kahta" "kahteen" "kaksi" "kaksi"
"kaksien" "kaksia" "kaksiin" ; "kaksien" "kaksia" "kaksiin") ;
n3 = mkSubst "a" "kolme" "kolme" "kolme" "kolmea" "kolmeen" "kolmi" "kolmi" n3 = nhn (mkSubst "a" "kolme" "kolme" "kolme" "kolmea" "kolmeen" "kolmi" "kolmi"
"kolmien" "kolmia" "kolmiin" ; "kolmien" "kolmia" "kolmiin") ;
n4 = regN "neljä" ; n4 = regN "neljä" ;
n5 = reg3N "viisi" "viiden" "viisiä" ; n5 = reg3N "viisi" "viiden" "viisiä" ;
n6 = reg3N "kuusi" "kuuden" "kuusia" ; n6 = reg3N "kuusi" "kuuden" "kuusia" ;
n7 = mkSubst "ä" "seitsemän" "seitsemä" "seitsemä" "seitsemää" n7 = nhn (mkSubst "ä" "seitsemän" "seitsemä" "seitsemä" "seitsemää"
"seitsemään" "seitsemi" "seitsemi" "seitsemien" "seitsemiä" "seitsemään" "seitsemi" "seitsemi" "seitsemien" "seitsemiä"
"seitsemiin" ; "seitsemiin") ;
n8 = mkSubst "a" "kahdeksan" "kahdeksa" "kahdeksa" "kahdeksaa" n8 = nhn (mkSubst "a" "kahdeksan" "kahdeksa" "kahdeksa" "kahdeksaa"
"kahdeksaan" "kahdeksi" "kahdeksi" "kahdeksien" "kahdeksia" "kahdeksaan" "kahdeksi" "kahdeksi" "kahdeksien" "kahdeksia"
"kahdeksiin" ; "kahdeksiin") ;
n9 = mkSubst "ä" "yhdeksän" "yhdeksä" "yhdeksä" "yhdeksää" n9 = nhn (mkSubst "ä" "yhdeksän" "yhdeksä" "yhdeksä" "yhdeksää"
"yhdeksään" "yhdeksi" "yhdeksi" "yhdeksien" "yhdeksiä" "yhdeksiin" ; "yhdeksään" "yhdeksi" "yhdeksi" "yhdeksien" "yhdeksiä" "yhdeksiin") ;
pot01 = pot01 =
{s = table { {s = table {

View File

@@ -358,7 +358,8 @@ oper
mkN = \a,b,c,d,e,f,g,h,i,j,k -> mkN = \a,b,c,d,e,f,g,h,i,j,k ->
mkNoun a b c d e f g h i j ** {g = k ; lock_N = <>} ; mkNoun a b c d e f g h i j ** {g = k ; lock_N = <>} ;
regN = \vesi -> regN = \vesi ->
---- nhn (regNounH vesi) ** {g = NonHuman ; lock_N = <>} ;
let let
esi = Predef.dp 3 vesi ; -- analysis: suffixes esi = Predef.dp 3 vesi ; -- analysis: suffixes
si = Predef.dp 2 esi ; si = Predef.dp 2 esi ;
@@ -366,8 +367,9 @@ regN = \vesi ->
s = init si ; s = init si ;
a = if_then_Str (pbool2bool (Predef.occurs "aou" vesi)) "a" "ä" ; a = if_then_Str (pbool2bool (Predef.occurs "aou" vesi)) "a" "ä" ;
ves = init vesi ; -- synthesis: prefixes ves = init vesi ; -- synthesis: prefixes
vet = strongGrade ves ;
ve = init ves ; ve = init ves ;
in in nhn (
case esi of { case esi of {
"uus" | "yys" => sRakkaus vesi ; "uus" | "yys" => sRakkaus vesi ;
"nen" => sNainen (Predef.tk 3 vesi + ("st" + a)) ; "nen" => sNainen (Predef.tk 3 vesi + ("st" + a)) ;
@@ -376,26 +378,29 @@ regN = \vesi ->
"aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" => sPuu vesi ; "aa" | "ee" | "ii" | "oo" | "uu" | "yy" | "ää" | "öö" => sPuu vesi ;
"ie" | "uo" | "yö" => sSuo vesi ; "ie" | "uo" | "yö" => sSuo vesi ;
"ea" | "eä" => "ea" | "eä" =>
mkNoun mkSubst
vesi (vesi + "n") (vesi + "n"+a) (vesi + a) (vesi + a+"n") a
(ves + "in"+a) (ves + "iss"+a) (ves + "iden") (ves + "it"+a) vesi (vesi) (vesi) (vesi + a) (vesi + a+"n")
(ves + "i") (ves + "i") (ves + "iden") (ves + "it"+a)
(ves + "isiin") ; (ves + "isiin") ;
"is" => sNauris (vesi + ("t" + a)) ; "is" => sNauris (vesi + ("t" + a)) ;
"ut" | "yt" => sRae vesi (ves + ("en" + a)) ; "ut" | "yt" => sRae vesi (ves + ("en" + a)) ;
"as" | "äs" => sRae vesi (strongGrade ves + (a + "n" + a)) ; "as" | "äs" => sRae vesi (vet + (a + "n" + a)) ;
"ar" | "är" => sRae vesi (strongGrade ves + ("ren" + a)) ; "ar" | "är" => sRae vesi (vet + ("ren" + a)) ;
_ => case i of { _ => case i of {
"n" => sLiitin vesi (strongGrade (init vesi) + "men") ; "n" => sLiitin vesi (vet + "men") ;
"s" => sTilaus vesi (ves + ("ksen" + a)) ; "s" => sTilaus vesi (ves + ("ksen" + a)) ;
"i" => sBaari (vesi + a) ; "i" => sBaari (vesi + a) ;
"e" => sRae vesi (strongGrade (ves + "e") + "en" + a) ; "e" => sRae vesi (strongGrade vesi + "en" + a) ;
"a" | "o" | "u" | "y" | "ä" | "ö" => sLukko vesi ; "a" | "o" | "u" | "y" | "ä" | "ö" => sLukko vesi ;
_ => sLinux (vesi + "i" + a) _ => sLinux (vesi + "i" + a)
} }
} }
} ** {g = NonHuman ; lock_N = <>} ; }
) ** {g = NonHuman ; lock_N = <>} ;
reg2N : (savi,savia : Str) -> N = \savi,savia -> reg2N : (savi,savia : Str) -> N = \savi,savia ->
---- nhn (reg2NounH savi savia)
let let
savit = regN savi ; savit = regN savi ;
ia = Predef.dp 2 savia ; ia = Predef.dp 2 savia ;
@@ -405,14 +410,15 @@ reg2N : (savi,savia : Str) -> N = \savi,savia ->
savin = weakGrade savi + "n" ; savin = weakGrade savi + "n" ;
in in
case <o,ia> of { case <o,ia> of {
<"i","ia"> => sArpi savi ; <"i","ia"> => nhn (sArpi savi) ;
<"i","iä"> => sSylki savi ; <"i","iä"> => nhn (sSylki savi) ;
<"i","ta"> | <"i","tä"> => sTohtori (savi + a) ; <"i","ta"> | <"i","tä"> => nhn (sTohtori (savi + a)) ;
<"o","ta"> | <"ö","tä"> => sRadio savi ; <"o","ta"> | <"ö","tä"> => nhn (sRadio savi) ;
<"a","ta"> | <"ä","tä"> => sPeruna savi ; <"a","ta"> | <"ä","tä"> => nhn (sPeruna savi) ;
<"a","ia"> | <"a","ja"> => sKukko savi savin savia ; <"a","ia"> | <"a","ja"> => nhn (sKukko savi savin savia) ;
_ => savit _ => savit
} ** {g = NonHuman ; lock_N = <>} ; }
** {g = NonHuman ; lock_N = <>} ;
reg3N = \vesi,veden,vesiä -> reg3N = \vesi,veden,vesiä ->
let let
@@ -425,38 +431,38 @@ reg3N = \vesi,veden,vesi
case si of { case si of {
"us" | "ys" => "us" | "ys" =>
ifTok CommonNoun (Predef.dp 3 veden) "den" ifTok CommonNoun (Predef.dp 3 veden) "den"
(sRakkaus vesi) (nhn (sRakkaus vesi))
(sTilaus vesi (veden + a)) ; (nhn (sTilaus vesi (veden + a))) ;
"as" | "äs" => sRae vesi (veden + a) ; "as" | "äs" => nhn (sRae vesi (veden + a)) ;
"li" | "ni" | "ri" => sSusi vesi veden (Predef.tk 1 vesi + ("en" + a)) ; "li" | "ni" | "ri" => nhn (sSusi vesi veden (Predef.tk 1 vesi + ("en" + a))) ;
"si" => sSusi vesi veden (Predef.tk 2 vesi + ("ten" + a)) ; "si" => nhn (sSusi vesi veden (Predef.tk 2 vesi + ("ten" + a))) ;
"in" | "en" | "än" => sLiitin vesi veden ; "in" | "en" | "än" => nhn (sLiitin vesi veden) ;
_ => case i of { _ => case i of {
"a" | "o" | "u" | "y" | "ä" | "ö" => sKukko vesi veden vesiä ; "a" | "o" | "u" | "y" | "ä" | "ö" => nhn (sKukko vesi veden vesiä) ;
"i" => sKorpi vesi veden (init veden + "n" + a) ; "i" => nhn (sKorpi vesi veden (init veden + "n" + a)) ;
_ => vesit _ => vesit
} }
} ** {g = NonHuman ; lock_N = <>} ; } ** {g = NonHuman ; lock_N = <>} ;
nKukko = \a,b,c -> sKukko a b c ** {g = nonhuman ; lock_N = <>} ; nKukko = \a,b,c -> nhn (sKukko a b c) ** {g = nonhuman ; lock_N = <>} ;
humanN = \n -> {s = n.s ; lock_N = n.lock_N ; g = human} ; humanN = \n -> {s = n.s ; lock_N = n.lock_N ; g = human} ;
nLukko = \a -> sLukko a ** {g = nonhuman ; lock_N = <>} ; nLukko = \a -> nhn (sLukko a) ** {g = nonhuman ; lock_N = <>} ;
nTalo = \a -> sTalo a ** {g = nonhuman ; lock_N = <>} ; nTalo = \a -> nhn (sTalo a) ** {g = nonhuman ; lock_N = <>} ;
nArpi = \a -> sArpi a ** {g = nonhuman ; lock_N = <>} ; nArpi = \a -> nhn (sArpi a) ** {g = nonhuman ; lock_N = <>} ;
nSylki = \a -> sSylki a ** {g = nonhuman ; lock_N = <>} ; nSylki = \a -> nhn (sSylki a) ** {g = nonhuman ; lock_N = <>} ;
nLinux = \a -> sLinux a ** {g = nonhuman ; lock_N = <>} ; nLinux = \a -> nhn (sLinux a) ** {g = nonhuman ; lock_N = <>} ;
nPeruna = \a -> sPeruna a ** {g = nonhuman ; lock_N = <>} ; nPeruna = \a -> nhn (sPeruna a) ** {g = nonhuman ; lock_N = <>} ;
nRae = \a,b -> sRae a b ** {g = nonhuman ; lock_N = <>} ; nRae = \a,b -> nhn (sRae a b) ** {g = nonhuman ; lock_N = <>} ;
nSusi = \a,b,c -> sSusi a b c ** {g = nonhuman ; lock_N = <>} ; nSusi = \a,b,c -> nhn (sSusi a b c) ** {g = nonhuman ; lock_N = <>} ;
nPuu = \a -> sPuu a ** {g = nonhuman ; lock_N = <>} ; nPuu = \a -> nhn (sPuu a) ** {g = nonhuman ; lock_N = <>} ;
nSuo = \a -> sSuo a ** {g = nonhuman ; lock_N = <>} ; nSuo = \a -> nhn (sSuo a) ** {g = nonhuman ; lock_N = <>} ;
nNainen = \a -> sNainen a ** {g = nonhuman ; lock_N = <>} ; nNainen = \a -> nhn (sNainen a) ** {g = nonhuman ; lock_N = <>} ;
nTilaus = \a,b -> sTilaus a b ** {g = nonhuman ; lock_N = <>} ; nTilaus = \a,b -> nhn (sTilaus a b) ** {g = nonhuman ; lock_N = <>} ;
nKulaus = \a -> nTilaus a (init a + "ksen" + getHarmony (last nKulaus = \a -> nTilaus a (init a + "ksen" + getHarmony (last
(init a))) ; (init a))) ;
nNauris = \a -> sNauris a ** {g = nonhuman ; lock_N = <>} ; nNauris = \a -> nhn (sNauris a) ** {g = nonhuman ; lock_N = <>} ;
sgpartN noun part = { sgpartN noun part = {
s = table { s = table {
NCase Sg Part => part ; NCase Sg Part => part ;
@@ -495,83 +501,26 @@ reg3N = \vesi,veden,vesi
mkV a b c d e f g h i j k l = mkVerb a b c d e f g h i j k l ** mkV a b c d e f g h i j k l = mkVerb a b c d e f g h i j k l **
{sc = Nom ; lock_V = <>} ; {sc = Nom ; lock_V = <>} ;
regV soutaa = regV soutaa = v2v (regVerbH soutaa) ** {sc = Nom ; lock_V = <>} ;
let
taa = Predef.dp 3 soutaa ;
ta = init taa ;
aa = Predef.dp 2 taa ;
juo = Predef.tk 2 soutaa ;
souda = weakGrade (init soutaa) ;
soudan = juo + "en" ;
o = Predef.dp 1 juo ;
a = last aa ;
u = ifTok Str a "a" "u" "y" ;
joi = Predef.tk 2 juo + (o + "i")
in case ta of {
"it" => vHarkita soutaa ;
"st" | "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ;
_ => case aa of {
"aa" | "ää" => vOttaa soutaa (souda + "n") ;
"da" | "dä" => vJuoda soutaa joi ;
"ta" | "tä" => vOsata soutaa ;
_ => vHukkua soutaa souda
}} ** {sc = Nom ; lock_V = <>} ;
reg2V : (soutaa,souti : Str) -> V = \soutaa,souti -> reg2V : (soutaa,souti : Str) -> V = \soutaa,souti ->
let v2v (reg2VerbH soutaa souti) ** {sc = Nom ; lock_V = <>} ;
soudat = regV soutaa ;
soudan = weakGrade (init soutaa) + "n" ;
soudin = weakGrade souti + "n" ;
souden = init souti + "en" ;
juo = Predef.tk 2 soutaa ;
o = Predef.dp 1 juo ;
u = ifTok Str (last soutaa) "a" "u" "y" ;
aa = Predef.dp 2 soutaa ;
taa = Predef.dp 3 soutaa ;
ta = Predef.tk 1 taa ;
in
case aa of {
"aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
_ => case ta of {
"at" | "ät" => vPalkata soutaa souti ;
"st" => vJuosta soutaa souden (juo + o+u+"t") (juo + "t"+u) ;
_ => soudat
}} ** {sc = Nom ; lock_V = <>} ;
reg3V soutaa soudan souti = reg3V soutaa soudan souti =
let v2v (reg3VerbH soutaa soudan souti) ** {sc = Nom ; lock_V = <>} ;
taa = Predef.dp 3 soutaa ;
ta = init taa ;
aa = Predef.dp 2 taa ;
souda = init soudan ;
juo = Predef.tk 2 soutaa ;
o = last juo ;
a = last aa ;
u = ifTok Str a "a" "u" "y" ;
soudin = weakGrade souti + "n" ;
soudat = reg2V soutaa souti ;
in case ta of {
"ll" => vJuosta soutaa soudan (juo + o+u+"t") (juo + "t"+u) ;
"ot" | "öt" => vPudota soutaa souti ;
_ => case aa of {
"aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
"da" | "dä" => vJuoda soutaa souti ;
_ => soudat
}} ** {sc = Nom ; lock_V = <>} ;
vValua v = vSanoa v ** {sc = Nom ; lock_V = <>} ; vValua v = v2v (vSanoa v) ** {sc = Nom ; lock_V = <>} ;
vKattaa v u = vOttaa v u ** {sc = Nom ; lock_V = <>} ; vKattaa v u = v2v (vOttaa v u) ** {sc = Nom ; lock_V = <>} ;
vOstaa v = vPoistaa v ** {sc = Nom ; lock_V = <>} ; vOstaa v = v2v (vPoistaa v) ** {sc = Nom ; lock_V = <>} ;
vNousta v u = vJuosta v u [] [] ** {sc = Nom ; lock_V = <>} ; ----- vNousta v u = v2v (vJuosta v u [] []) ** {sc = Nom ; lock_V = <>} ; -----
vTuoda v = vJuoda v [] ** {sc = Nom ; lock_V = <>} ; ----- vTuoda v = v2v (vJuoda v []) ** {sc = Nom ; lock_V = <>} ; -----
caseV c v = {s = v.s ; sc = c ; lock_V = <>} ; caseV c v = {s = v.s ; sc = c ; lock_V = <>} ;
vOlla = verbOlla ** {sc = Nom ; lock_V = <>} ; vOlla = verbOlla ** {sc = Nom ; lock_V = <>} ;
vEi = verbEi ** {sc = Nom ; lock_V = <>} ; vEi = verbEi ** {sc = Nom ; lock_V = <>} ;
vHuoltaa : (_,_,_,_ : Str) -> Verb = \ottaa,otan,otti,otin -> vHuoltaa : (_,_,_,_ : Str) -> Verb = \ottaa,otan,otti,otin ->
SyntaxFin.vHuoltaa ottaa otan otti otin ** {sc = Nom ; lock_V = <>} ; v2v (SyntaxFin.vHuoltaa ottaa otan otti otin) ** {sc = Nom ; lock_V = <>} ;
mkV2 = \v,c -> v ** {s3 = c.s3 ; p = c.p ; c = c.c ; lock_V2 = <>} ; mkV2 = \v,c -> v ** {s3 = c.s3 ; p = c.p ; c = c.c ; lock_V2 = <>} ;
caseV2 = \v,c -> mkV2 v (caseP c) ; caseV2 = \v,c -> mkV2 v (caseP c) ;
dirV2 v = mkTransVerbDir v ** {lock_V2 = <>} ; dirV2 v = mkTransVerbDir v ** {lock_V2 = <>} ;

View File

@@ -53,8 +53,8 @@ concrete StructuralFin of Structural =
it_NP = nameNounPhrase pronSe ; it_NP = nameNounPhrase pronSe ;
many_Det = mkDeterminer singular moniPron ; many_Det = mkDeterminer singular moniPron ;
most8many_Det = useimmatDet ; most8many_Det = useimmatDet ;
most_Det = mkDeterminer singular (caseTable singular (sSuurin "enintä")) ; most_Det = mkDeterminer singular (caseTable singular (nhn (sSuurin "enintä"))) ;
much_Det = mkDeterminer singular (caseTable singular (sNauris "runsasta")) ; much_Det = mkDeterminer singular (caseTable singular (nhn (sNauris "runsasta"))) ;
---- must_VV = vHukkua "täytyä" "täydy" ** {c = CCase Gen} ; ---- must_VV = vHukkua "täytyä" "täydy" ** {c = CCase Gen} ;
no_Phr = ss ("Ei" ++ stopPunct) ; no_Phr = ss ("Ei" ++ stopPunct) ;
on_Prep = prepCase Adess ; on_Prep = prepCase Adess ;

View File

@@ -4,6 +4,8 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
** open ResourceFin, SyntaxFin, ParadigmsFin, ** open ResourceFin, SyntaxFin, ParadigmsFin,
BasicFin, Prelude in { BasicFin, Prelude in {
flags optimize=values ;
lin lin
-- Pronouns -- Pronouns
@@ -26,8 +28,8 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
all_NDet = ResourceFin.all_NDet ; all_NDet = ResourceFin.all_NDet ;
many_Det = many_Det ; many_Det = many_Det ;
some_Det = some_Det ; some_Det = some_Det ;
few_Det = mkDeterminer Pl (\\c => (sTalo "muutama").s ! NCase Pl c) ; few_Det = mkDeterminer Pl (\\c => (nhn (sTalo "muutama")).s ! NCase Pl c) ;
other_Det = mkDeterminer Pl (\\c => (sPuu "muu").s ! NCase Pl c) ; other_Det = mkDeterminer Pl (\\c => (nhn (sPuu "muu")).s ! NCase Pl c) ;
-- Adverbs -- Adverbs
@@ -157,7 +159,7 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
rain_N = regN "sade" ; rain_N = regN "sade" ;
river_N = river_N ; river_N = river_N ;
road_N = regN "tie" ; road_N = regN "tie" ;
root_N = reg3N "juuri" "juuren" "juuria" ; root_N = reg2N "juuri" "juuria" ;
rope_N = reg3N "köysi" "köyden" "köysiä" ; rope_N = reg3N "köysi" "köyden" "köysiä" ;
salt_N = regN "suola" ; salt_N = regN "suola" ;
sand_N = regN "hiekka" ; sand_N = regN "hiekka" ;
@@ -206,7 +208,7 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
freeze_V = regV "jäätyä" ; freeze_V = regV "jäätyä" ;
give_V = regV "antaa" ; give_V = regV "antaa" ;
hear_V = UseV2 hear_V2 ; hear_V = UseV2 hear_V2 ;
hit_V = regV "syödä" ; hit_V = regV "lyödä" ;
hold_V = regV "pitää" ; hold_V = regV "pitää" ;
hunt_V = regV "metsästää" ; hunt_V = regV "metsästää" ;
kill_V = regV "tappaa" ; kill_V = regV "tappaa" ;

View File

@@ -124,7 +124,7 @@ oper
f => pron.s ! npForm2PForm f f => pron.s ! npForm2PForm f
} ; } ;
n = pron.n ; n = pron.n ;
p = NPP pron.p p = NP3
} ; } ;
-- *Partitive noun phrases* use the partitive instead of the nominative -- *Partitive noun phrases* use the partitive instead of the nominative
@@ -202,9 +202,9 @@ oper
mkDeterminerGenNum : (_,_ : Case => Str) -> DeterminerNum = mkDeterminerGenNum : (_,_ : Case => Str) -> DeterminerNum =
mkDeterminerGen Pl ; mkDeterminerGen Pl ;
jokainenDet = mkDeterminer Sg (caseTable Sg (sNainen "jokaista")) ; jokainenDet = mkDeterminer Sg (caseTable Sg (nhn (sNainen "jokaista"))) ;
kaikkiDet : DeterminerNum = mkDeterminerNum (kaikkiPron Pl) ; kaikkiDet : DeterminerNum = mkDeterminerNum (kaikkiPron Pl) ;
useimmatDet = mkDeterminer Pl (caseTable Pl (sSuurin "useinta")) ; useimmatDet = mkDeterminer Pl (caseTable Pl (nhn (sSuurin "useinta"))) ;
mikaDet = mkDeterminerGen Sg (mikaInt ! Sg) (kukaInt ! Sg) ; mikaDet = mkDeterminerGen Sg (mikaInt ! Sg) (kukaInt ! Sg) ;
mitkaDet : DeterminerNum = mitkaDet : DeterminerNum =
mkDeterminerGenNum (mikaInt ! Pl) (kukaInt ! Pl) ; mkDeterminerGenNum (mikaInt ! Pl) (kukaInt ! Pl) ;
@@ -435,7 +435,7 @@ oper
appFunComm : Function -> NounPhrase -> CommNounPhrase = \vaimo, jussi -> appFunComm : Function -> NounPhrase -> CommNounPhrase = \vaimo, jussi ->
{s = \\p,n,c => case vaimo.c of { {s = \\p,n,c => case vaimo.c of {
NPCase Gen => jussi.s ! NPCase Gen ++ NPCase Gen => jussi.s ! NPCase Gen ++
ifPossSuffix vaimo jussi.p jussi.n c ; ifPossSuffix vaimo jussi.p n c ;
h => vaimo.s ! False ! n ! c ++ jussi.s ! h h => vaimo.s ! False ! n ! c ++ jussi.s ! h
} ; } ;
g = vaimo.g g = vaimo.g
@@ -636,7 +636,7 @@ oper
let let
vs = verb.s ; vs = verb.s ;
olla = verbOlla.s ; olla = verbOlla.s ;
tulla = (vJuosta "tulla" "tulen" "tullut" "tultu").s ; tulla = (v2v (vJuosta "tulla" "tulen" "tullut" "tultu")).s ;
eis = verbEi.s ; eis = verbEi.s ;
part = PastPartAct (AN (NCase n Nom)) ; part = PastPartAct (AN (NCase n Nom)) ;
abess = vs ! Inf3Abess ; abess = vs ! Inf3Abess ;
@@ -903,6 +903,7 @@ oper
-- To generate "sanoo että Jussi ui" / "ei sano että Jussi ui" -- To generate "sanoo että Jussi ui" / "ei sano että Jussi ui"
embedConj : Str = "," ++ "että" ;
--3 Verb-complement verbs --3 Verb-complement verbs
-- --

View File

@@ -91,6 +91,8 @@ param
| Impf Number Person | Impf Number Person
| Cond Number Person | Cond Number Person
| Imper Number | Imper Number
| ImperP3 Number
| ImperP1Pl
| ImpNegPl | ImpNegPl
| Pass Bool | Pass Bool
| PastPartAct AForm | PastPartAct AForm