mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-11 04:02:52 -06:00
updated TopDictionary files after refactoring of Dictionary
This commit is contained in:
@@ -11,6 +11,7 @@ flags coding=utf8 ;
|
||||
oper tehda_V = mkV (lin VK {s = c71 "tehdä"}) ;
|
||||
oper nahda_V = mkV (lin VK {s = c71 "nähdä"}) ;
|
||||
oper optProDrop : Pron -> Pron = \p -> p | E.ProDrop p ;
|
||||
oper luokse_Prep : Prep = mkPrep "luokse" ; -- to enable (luo|luokse)-luokseni
|
||||
|
||||
mika_NForms : R.NForm => Str =
|
||||
let {
|
||||
@@ -33,16 +34,16 @@ lin have_VV = S.must_VV ;
|
||||
lin have_V2 = S.have_V2 ;
|
||||
lin have_V = lin V S.have_V2 ;
|
||||
lin it_Pron = S.it_Pron ;
|
||||
lin to_Prep = S.to_Prep | mkPrep "luo" | mkPrep "luokse" | mkPrep "tykö" ; ---- split
|
||||
lin to_Prep = mkPrep illative | mkPrep allative ; ---- | luokse_Prep | luokse_Prep ** {s = luokse_Prep.s ** {p2 = "luo"}} | mkPrep "tykö" ;
|
||||
lin for_Prep = S.for_Prep ;
|
||||
lin i_Pron = optProDrop S.i_Pron ;
|
||||
lin iFem_Pron = optProDrop S.i_Pron ;
|
||||
lin that_Subj = S.that_Subj ;
|
||||
lin he_Pron = S.he_Pron ;
|
||||
lin on_Prep = S.on_Prep ;
|
||||
lin with_Prep = S.with_Prep ;
|
||||
lin on_Prep = mkPrep adessive | mkPrep "päällä" | mkPrep "päälle" ;
|
||||
lin with_Prep = mkPrep "kanssa" | mkPrep "luona" | mkPrep "tykönä" ; ---- split
|
||||
lin do_V2 = mkV2 tehda_V ;
|
||||
lin at_Prep = casePrep inessive | casePrep adessive | mkPrep "luona" | mkPrep "tykönä" ; ---- split
|
||||
lin at_Prep = casePrep adessive | casePrep inessive ; ---- | mkPrep "luona" | mkPrep "tykönä" ; ---- split
|
||||
lin by_Prep = postPrep genitive "kautta" ;
|
||||
lin but_Conj = mkConj "mutta" ;
|
||||
lin from_Prep = casePrep elative | casePrep ablative | mkPrep "luota" | mkPrep "tyköä" ; ---- split
|
||||
@@ -84,7 +85,7 @@ lin time_1_N = mkN "aika" "ajan" "aikoja" ;
|
||||
lin take_V2 = mkV2 "ottaa" ;
|
||||
lin so_Adv = mkAdv "niin" ;
|
||||
lin year_N = L.year_N ;
|
||||
lin into_Prep = casePrep illative ;
|
||||
lin into_Prep = casePrep illative | mkPrep "sisään" | mkPrep "sisälle" ;
|
||||
lin then_Adv = mkAdv "silloin" ; -- mkAdv "siinä tapauksessa"
|
||||
lin think_VS = mkVS (mkV "ajatella") ;
|
||||
lin think_V2 = mkV2 (mkV "ajatella") partitive ;
|
||||
@@ -155,7 +156,7 @@ lin here_Adv = mkAdv "täällä" ;
|
||||
lin over_Prep = postPrep genitive "yli" ;
|
||||
lin too_Adv = mkAdv "myös" ;
|
||||
lin put_V2 = L.put_V2 ;
|
||||
lin on_Adv = mkAdv "päällä" ; -- mkAdv "eteenpäin" ;
|
||||
lin on_Adv = mkAdv "päällä" ;
|
||||
lin no_Interj = mkInterj "ei" | mkInterj "en" ;
|
||||
lin work_V2 = mkV2 "työstää" ;
|
||||
lin work_V = mkV "toimia" ;
|
||||
@@ -227,7 +228,7 @@ lin company_1_N = mkN "yhtiö" ;
|
||||
lin under_Prep = S.under_Prep ;
|
||||
lin problem_N = mkN "ongelma" ;
|
||||
lin against_Prep = postPrep partitive "vastaan" ;
|
||||
lin never_Adv = mkAdv "koskaan" | mkAdv "ei koskaan" ; ---- will look weird in sentences
|
||||
lin never_Adv = mkAdv "ei koskaan" | mkAdv "koskaan" ; ---- will look weird in sentences
|
||||
lin most_Adv = mkAdv "suurin osa" ;
|
||||
lin service_N = mkWN (k2 "palvelu") ;
|
||||
lin try_VV = mkVV (mkV "yrittää") ;
|
||||
@@ -1184,7 +1185,7 @@ lin compare_V = mkV "verrata" ;
|
||||
lin suffer_V2 = mkV2 "kärsiä" ;
|
||||
lin suffer_V = mkV "kärsiä" ;
|
||||
lin individual_A = mkA "yksilöllinen" ;
|
||||
lin forward_Adv = mkAdv "edelleen" ;
|
||||
lin forward_Adv = mkAdv "eteenpäin" | mkAdv "edelleen" ;
|
||||
lin announce_VS = mkVS "julkistaa" | mkVS "tiedottaa" ;
|
||||
lin announce_V2 = mkV2 "julkistaa" ;
|
||||
lin userMasc_N = mkN "käyttäjä" ;
|
||||
@@ -1889,7 +1890,7 @@ lin battle_N = mkN "taistelu" ;
|
||||
lin generation_N = mkN "suku" (mkN "polvi") ; --f62
|
||||
lin currently_Adv = mkAdv "tällä hetkellä" ;
|
||||
lin winter_N = mkN "talvi" ;
|
||||
lin inside_Prep = mkPrep "sisällä" ;
|
||||
lin inside_Prep = mkPrep "sisällä" | mkPrep "sisälle" ; ---- split
|
||||
lin impossible_A = mkWA (k34A "mahdoton") ;
|
||||
lin somewhere_Adv = S.somewhere_Adv ;
|
||||
lin arrange_V2 = mkV2 "järjestää" | mkWV2 (k67A "asetella") ;
|
||||
@@ -3647,7 +3648,7 @@ lin mystery_N = mkWN (k12 "asia") "tuntematon" ; --UNCHK
|
||||
lin pose_V2 = mkWV2 (k53A "sekoittaa") ;
|
||||
lin pose_V = mkWV (k53A "sekoittaa") ; --UNCHK
|
||||
lin violent_A = mkWA (k1 "raju") ; --UNCHK
|
||||
lin march_N = mkN "marssi" ; --WN (k39 "kehitys") ;
|
||||
lin march_N = variants{} ; --
|
||||
lin found_V2 = mkV2 "perustaa" ;
|
||||
lin dig_V2 = mkWV2 (k74 "tajuta") ; --UNCHK
|
||||
lin dig_V = L.dig_V ;
|
||||
|
||||
Reference in New Issue
Block a user