fixes in Attempto

This commit is contained in:
aarne
2010-01-04 21:19:13 +00:00
parent 14efc8a8a5
commit 234a3d3633
10 changed files with 48 additions and 33 deletions

View File

@@ -4,7 +4,7 @@ concrete TestAttemptoFin of TestAttempto = AttemptoFin **
open SyntaxFin, ParadigmsFin, (C = ConstructX) in {
lin card_N = mkkN "kortti" ;
lin water_MCN = mkCN (mkN "vesi" "vesiä") ;
lin water_MCN = mkCN (mkN "vesi" "veden" "vesiä") ;
lin john_PN = mkPN "John" ;
lin apple_N = mkkN "omena" ;
lin sleep_V = mkV "nukkua" ;
@@ -18,7 +18,7 @@ lin give_V3 = dirV3 (mkV "antaa") allative ;
lin tired_A = mkA "väsynyt" ;
lin rich_A = mkA "rikas" ;
lin customer_N = mkkN "asiakas" ;
lin enter_V2 = mkV2 (mkV "astua") illative ; ----
lin enter_V2 = mkV2 (mkV "astua") illative ; ---- astua sisään
lin bank_N = mkkN "pankki" ;
lin satisfied_A = mkA "tyytyväinen" ;
lin lucky_A = mkA "onnekas" ;
@@ -30,8 +30,8 @@ lin form_N = mkkN "kaavake" ;
lin age_N = mkkN "ikä" ;
lin teacher_N = mkkN "opettaja" ;
lin successful_A = mkA "menestyksekäs" ;
lin fond_A2 = mkA2 (mkA "kiintynyt") (casePrep illative) ; ----
lin garden_N = mkkN "puutarha" ; ----
lin fond_A2 = mkA2 (mkA "kiintynyt") (casePrep illative) ;
lin garden_N = mkCN (mkN "puu" (mkN "tarha")) ;
lin morning_N = mkkN "aamu" ;
lin code_N = mkkN "koodi" ;
lin drinkable_A = mkA "juotava" ;
@@ -40,21 +40,21 @@ lin admitted_A = mkA "hyv
lin eat_V2 = mkV2 (mkV "syödä") partitive ;
lin burger_N = mkkN "hampurilainen" ;
lin earn_V2 = mkV2 "ansaita" ;
lin income_N = mkkN "tulo" ; ----
lin income_N = mkkN "tulo" ; ---- tulot
lin england_PN = mkPN "Englanti" ;
lin beginning_N = mkkN "alku" ;
lin office_N = mkkN "toimisto" ;
lin interested_A2 = mkA2 (mkA "kiinnostunut") (casePrep elative) ; ----
lin interested_A2 = mkA2 (mkA "kiinnostunut") (casePrep elative) ;
lin classroom_N = mkkN "luokkahuone" ;
lin manually_Adv = mkAdv "käsin" ;
lin slot_N = mkkN "aukko" ;
lin patiently_Adv = mkAdv "kärsivällisesti" ;
lin course_N = mkkN "kurssi" ;
lin carefully_Adv = mkAdv "huolellisesti" ;
lin time_N = mkkN "aika" ;
lin time_N = mkCN (mkN "aika" "ajan" "aikoja") ;
lin believe_VS = mkVS (mkV "uskoa") ;
lin seriously_Adv = mkAdv "vakavasti" ;
lin clerk_N = mkkN "virkailija" ;
lin clerk_N = mkCN (mkN "virkailija" "virkailijoita") ;
lin screen_N = mkkN "kuvaruutu" ;
lin blink_V = mkV "vilkkua" ;
lin bed_N = mkkN "sänky" ;
@@ -62,15 +62,15 @@ lin container_N = mkkN "astia" ;
lin automated_teller_N = mkkN "pankkiautomaatti" ;
lin reject_V2 = mkV2 "hylätä" ;
lin accept_V2 = mkV2 "hyväksyä" ;
lin type_V2 = mkV2 "kirjoittaa" ; ----
lin type_V2 = mkV2 "konekirjoittaa" ; ---- kirjoittaa koneella
lin know_VS = mkVS (mkV "tietää") ;
lin manager_N = mkkN "johtaja" ;
lin oversleep_V = mkV "nukkua" ; ----
lin oversleep_V = mkV "nukkua" ; ---- nukkua pommiin
lin valid_A = mkA "pätevä" ;
lin see_V2 = mkV2 (mkV "nähdä") ;
lin bark_V = mkV "haukkua" ;
lin go_V2 = mkV2 (mkV "mennä") illative ;
lin brother_N = mkkN "veli" ;
lin brother_N = mkCN (mkN "veli" "veljen" "veljiä") ;
lin mary_PN = mkPN "Mary" ; ----
lin machine_N = mkkN "kone" ;
lin correct_A = mkA "oikea" ;