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

a couple of changes in DictEng/DictEngBul. Added infVV in ParadigmsEng which allows the definition of VVs that take a bare infinitive

Browse Source
This commit is contained in:
kr.angelov
2013-09-03 08:06:44 +00:00
parent b9192ccccf
commit 69881dccac
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/src/bulgarian/DictEngBul.gf
View File

@@ -7360,7 +7360,7 @@ lin brief_A = mkA076 "къс" ;
lin brief_N = mkN065 "досие" ; lin brief_N = mkN065 "досие" ;
lin brief_V2 = dirV2 (stateV (mkV186 "информирам")); lin brief_V2 = dirV2 (stateV (mkV186 "информирам"));
lin briefcase_N = variants {}; lin briefcase_N = variants {};
lin briefing_N = variants {}; lin briefing_N = mkN007 "брифинг";
lin briefless_A = variants {}; lin briefless_A = variants {};
lin briefness_N = variants {}; lin briefness_N = variants {};
lin brier_N = variants {}; lin brier_N = variants {};
@@ -7394,7 +7394,7 @@ lin brindled_A = variants {};
lin brine_N = mkN041 "саламура" ; ---- lin brine_N = mkN041 "саламура" ; ----
lin bring_V2 = variants {}; lin bring_V2 = variants {};
lin bring_V2V = variants {}; lin bring_V2V = variants {};
lin bring_V3 = variants {}; lin bring_V3 = mkV3 (actionV (mkV186 "давам") (mkV168 "дам")) (mkPrep "на" Acc) noPrep;
lin brininess_N = variants {}; lin brininess_N = variants {};
lin brink_N = mkN041 "граница" ; ---- lin brink_N = mkN041 "граница" ; ----
lin brinkmanship_N = variants {}; lin brinkmanship_N = variants {};
@@ -9805,8 +9805,8 @@ lin chelonian_N = variants {};
lin chelsea_PN = variants {}; lin chelsea_PN = variants {};
lin cheltenham_PN = variants {}; lin cheltenham_PN = variants {};
lin chelyabinsk_PN = variants {}; lin chelyabinsk_PN = variants {};
lin chemical_A = mkA078 "химически" ; lin chemical_A = mkA078 "химически";
lin chemical_N = mkN007 "химикал"; lin chemical_N = relativeN (mkN007 "химикал") (mkA078 "химически");
lin chemiluminescence_N = variants {}; lin chemiluminescence_N = variants {};
lin chemiluminescent_A = variants {}; lin chemiluminescent_A = variants {};
lin chemise_N = variants {}; lin chemise_N = variants {};
@@ -13030,22 +13030,22 @@ lin cpl_PN = variants {};
lin crab_N = mkN041 "скарида" ; ---- lin crab_N = mkN041 "скарида" ; ----
lin crab_V = variants {}; lin crab_V = variants {};
lin crab_V2 = variants {}; lin crab_V2 = variants {};
lin crab_apple_N = mkN041 "киселица" ; ---- lin crab_apple_N = mkN041 "киселица";
lin crabbiness_N = variants {}; lin crabbiness_N = variants {};
lin crabgrass_N = variants {}; lin crabgrass_N = variants {};
lin crabwise_A = variants {}; lin crabwise_A = variants {};
lin crack_N = mkN041 "цепнатина" ; ---- lin crack_N = mkN041 "цепнатина";
lin crack_V = variants {}; lin crack_V = variants {};
lin crack_V2 = variants {}; lin crack_V2 = variants {};
lin crack_down_N = variants {}; lin crack_down_N = variants {};
lin crack_up_N = variants {}; lin crack_up_N = variants {};
lin crackbrained_A = variants {}; lin crackbrained_A = variants {};
lin crackdown_N = variants {}; lin crackdown_N = mkN071 "овладяване";
lin cracker_N = variants {}; lin cracker_N = variants {};
lin crackers_A = variants {}; lin crackers_A = variants {};
lin cracking_N = variants {}; lin cracking_N = variants {};
lin crackle_A = variants {}; lin crackle_A = variants {};
lin crackle_N = mkN071 "пукане" ; ---- lin crackle_N = mkN071 "пукане";
lin crackle_V = variants {}; lin crackle_V = variants {};
lin crackle_china_N = variants {}; lin crackle_china_N = variants {};
lin crackleware_N = variants {}; lin crackleware_N = variants {};
@@ -15336,8 +15336,8 @@ lin devastation_N = mkN072 "опустошение";
lin develop_V = medialV (actionV (mkV186 "развивам") (mkV163 "развия")) Acc; lin develop_V = medialV (actionV (mkV186 "развивам") (mkV163 "развия")) Acc;
lin develop_V2 = dirV2 (actionV (mkV186 "развивам") (mkV163 "развия")); lin develop_V2 = dirV2 (actionV (mkV186 "развивам") (mkV163 "развия"));
lin developer_N = mkN014 "разработчик"; lin developer_N = mkN014 "разработчик";
lin development_N = mkN071 "развиване"; lin development_N = mkN072 "развитие";
lin developmental_A = variants {}; lin developmental_A = mkA085 "развоен";
lin deviant_A = variants {}; lin deviant_A = variants {};
lin deviant_N = variants {}; lin deviant_N = variants {};
lin deviate_V = variants {}; lin deviate_V = variants {};
@@ -20068,7 +20068,6 @@ lin favism_N = variants {};
lin favor_V = variants {}; lin favor_V = variants {};
lin favor_V2 = dirV2 (actionV (mkV186 "предпочитам") (mkV145 "предпочета")); lin favor_V2 = dirV2 (actionV (mkV186 "предпочитам") (mkV145 "предпочета"));
lin favor_VS = variants {}; lin favor_VS = variants {};
lin favorable_A = variants {};
lin favorableness_N = variants {}; lin favorableness_N = variants {};
lin favoritism_N = variants {}; lin favoritism_N = variants {};
lin favour_N = mkN041 "услуга" ; lin favour_N = mkN041 "услуга" ;
@@ -58690,10 +58689,9 @@ lin unreadable_A = variants {};
lin unready_A = variants {}; lin unready_A = variants {};
lin unreal_A = variants {}; lin unreal_A = variants {};
lin unrealistic_A = mkA079 "нереален"; lin unrealistic_A = mkA079 "нереален";
lin unrealistically_Adv = variants {};
lin unreality_N = variants {}; lin unreality_N = variants {};
lin unrealized_A = variants {}; lin unrealized_A = variants {};
lin unreasonable_A = mkA079 "неразумен" ; ---- lin unreasonable_A = mkA079 "неразумен";
lin unreasoning_A = variants {}; lin unreasoning_A = variants {};
lin unreassuring_A = variants {}; lin unreassuring_A = variants {};
lin unreceptive_A = variants {}; lin unreceptive_A = variants {};

20
lib/src/english/DictEng.gf
View File

@@ -5345,7 +5345,8 @@ lin beggarwoman_N = mkN feminine (mkN "beggarwoman" "beggarwomen");
lin beggary_N = mkN "beggary" ; lin beggary_N = mkN "beggary" ;
lin begin_V = IrregEng.begin_V; lin begin_V = IrregEng.begin_V;
lin begin_V2 = mkV2 (IrregEng.begin_V); lin begin_V2 = mkV2 (IrregEng.begin_V);
lin begin_VV = ingVV (IrregEng.begin_V); lin begin_to_VV = mkVV (IrregEng.begin_V);
lin begin_ing_VV = ingVV (IrregEng.begin_V);
lin beginner_N = mkN "beginner" "beginners"; lin beginner_N = mkN "beginner" "beginners";
lin beginning_N = mkN "beginning" "beginnings"; lin beginning_N = mkN "beginning" "beginnings";
lin begonia_N = mkN "begonia" "begonias"; lin begonia_N = mkN "begonia" "begonias";
@@ -11990,7 +11991,7 @@ lin consider_V2A = mkV2A (mkV "consider" "considers" "considered" "considered" "
lin consider_V2V = mkV2V (mkV "consider" "considers" "considered" "considered" "considering") noPrep to_Prep ; lin consider_V2V = mkV2V (mkV "consider" "considers" "considered" "considered" "considering") noPrep to_Prep ;
lin consider_V3 = mkV3 (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_V3 = mkV3 (mkV "consider" "considers" "considered" "considered" "considering");
lin consider_VS = mkVS (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_VS = mkVS (mkV "consider" "considers" "considered" "considered" "considering");
lin consider_VV = mkVV (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_VV = ingVV (mkV "consider" "considers" "considered" "considered" "considering");
lin considerable_A = compoundA (mkA "considerable"); lin considerable_A = compoundA (mkA "considerable");
lin considerate_A = compoundA (mkA "considerate"); lin considerate_A = compoundA (mkA "considerate");
lin considerateness_N = mkN "considerateness" ; lin considerateness_N = mkN "considerateness" ;
@@ -17780,7 +17781,7 @@ lin ejector_N = mkN "ejector" "ejectors";
lin ejector_seat_N = mkN "ejector - seat" "ejector - seats"; lin ejector_seat_N = mkN "ejector - seat" "ejector - seats";
lin eke_V2 = mkV2 (mkV "eke" "ekes" "eked" "eked" "eking"); lin eke_V2 = mkV2 (mkV "eke" "ekes" "eked" "eked" "eking");
lin el_dorado_N = mkN "el dorado" "el doradi"; lin el_dorado_N = mkN "el dorado" "el doradi";
lin el_salvador_PN = mkPN "El salvador"; lin el_salvador_PN = mkPN "El Salvador";
lin elaborate_A = compoundA (mkA "elaborate"); lin elaborate_A = compoundA (mkA "elaborate");
lin elaborate_V = mkV "elaborate"; lin elaborate_V = mkV "elaborate";
lin elaborate_V2 = mkV2 (mkV "elaborate" "elaborates" "elaborated" "elaborated" "elaborating"); lin elaborate_V2 = mkV2 (mkV "elaborate" "elaborates" "elaborated" "elaborated" "elaborating");
@@ -20039,12 +20040,11 @@ lin favism_N = mkN "favism" ;
lin favor_V = mkV "favor"; lin favor_V = mkV "favor";
lin favor_V2 = mkV2 (mkV "favor" "favored"); lin favor_V2 = mkV2 (mkV "favor" "favored");
lin favor_VS = mkVS (mkV "favor" "favored"); lin favor_VS = mkVS (mkV "favor" "favored");
lin favorable_A = mkA "favorable" ;
lin favorableness_N = mkN "favorableness" ; lin favorableness_N = mkN "favorableness" ;
lin favoritism_N = mkN "favoritism" ; lin favoritism_N = mkN "favoritism" ;
lin favour_N = mkN (variants {"favour"; "favor"}); lin favour_N = mkN (variants {"favour"; "favor"});
lin favour_V2 = mkV2 (mkV "favour" "favours" "favoured" "favoured" "favouring"); lin favour_V2 = mkV2 (mkV "favour" "favours" "favoured" "favoured" "favouring");
lin favourable_A = compoundA (mkA "favourable"); lin favourable_A = mkA (variants {"favourable"; "favorable"}) ;
lin favourite_A = compoundA (mkA (variants {"favourite"; "favorite"})); lin favourite_A = compoundA (mkA (variants {"favourite"; "favorite"}));
lin favourite_N = mkN (variants {"favourite"; "favorite"}); lin favourite_N = mkN (variants {"favourite"; "favorite"});
lin favouritism_N = mkN "favouritism" ; lin favouritism_N = mkN "favouritism" ;
@@ -24974,7 +24974,8 @@ lin help_V = mkV "help" "helps" "helped" "helped" "helping";
lin help_V2 = mkV2 (mkV "help" "helps" "helped" "helped" "helping"); lin help_V2 = mkV2 (mkV "help" "helps" "helped" "helped" "helping");
lin help_V2V = mkV2V (mkV "help" "helps" "helped" "helped" "helping") noPrep noPrep ; lin help_V2V = mkV2V (mkV "help" "helps" "helped" "helped" "helping") noPrep noPrep ;
lin help_VS = mkVS (mkV "help" "helps" "helped" "helped" "helping"); lin help_VS = mkVS (mkV "help" "helps" "helped" "helped" "helping");
lin help_VV = mkVV (mkV "help" "helps" "helped" "helped" "helping"); lin help_VV = infVV (mkV "help" "helps" "helped" "helped" "helping");
lin help_to_VV = mkVV (mkV "help" "helps" "helped" "helped" "helping");
lin helper_N = mkN "helper" "helpers"; lin helper_N = mkN "helper" "helpers";
lin helpful_A = compoundA (mkA "helpful"); lin helpful_A = compoundA (mkA "helpful");
lin helpfulness_N = mkN "helpfulness" ; lin helpfulness_N = mkN "helpfulness" ;
@@ -30724,7 +30725,7 @@ lin lest_Prep = mkPrep "lest";
lin let_N = mkN "let" "lets"; lin let_N = mkN "let" "lets";
lin let_V = IrregEng.let_V; lin let_V = IrregEng.let_V;
lin let_V2 = mkV2 (IrregEng.let_V); lin let_V2 = mkV2 (IrregEng.let_V);
lin let_V2V = mkV2V (IrregEng.let_V) noPrep to_Prep ; lin let_V2V = mkV2V (IrregEng.let_V) noPrep noPrep ;
lin let_VS = mkVS (IrregEng.let_V); lin let_VS = mkVS (IrregEng.let_V);
lin let_down_N = mkN "let - down" "let - downs"; lin let_down_N = mkN "let - down" "let - downs";
lin let_up_N = mkN "let - up" "let - ups"; lin let_up_N = mkN "let - up" "let - ups";
@@ -31650,7 +31651,7 @@ lin lorn_A = compoundA (mkA "lorn");
lin lorna_PN = mkPN "Lorna"; lin lorna_PN = mkPN "Lorna";
lin lorry_N = mkN "lorry" "lorries"; lin lorry_N = mkN "lorry" "lorries";
lin lory_N = mkN "lory" ; lin lory_N = mkN "lory" ;
lin los_angeles_PN = mkPN "Los angeles"; lin los_angeles_PN = mkPN "Los Angeles";
lin lose_V = IrregEng.lose_V; lin lose_V = IrregEng.lose_V;
lin lose_V2 = mkV2 (IrregEng.lose_V); lin lose_V2 = mkV2 (IrregEng.lose_V);
lin loser_N = mkN "loser" "losers"; lin loser_N = mkN "loser" "losers";
@@ -58602,8 +58603,7 @@ lin unread_A = compoundA (mkA "unread");
lin unreadable_A = compoundA (mkA "unreadable"); lin unreadable_A = compoundA (mkA "unreadable");
lin unready_A = compoundA (mkA "unready"); lin unready_A = compoundA (mkA "unready");
lin unreal_A = compoundA (mkA "unreal"); lin unreal_A = compoundA (mkA "unreal");
lin unrealistic_A = compoundA (mkA "unrealistic"); lin unrealistic_A = irregAdv (compoundA (mkA "unrealistic")) (variants {"unrealistically"; "unrealisticly"});
lin unrealistically_Adv = mkAdv "unrealistically";
lin unreality_N = mkN "unreality" ; lin unreality_N = mkN "unreality" ;
lin unrealized_A = compoundA (mkA "unrealized"); lin unrealized_A = compoundA (mkA "unrealized");
lin unreasonable_A = compoundA (mkA "unreasonable"); lin unreasonable_A = compoundA (mkA "unreasonable");

6
lib/src/english/DictEngAbs.gf
View File

@@ -5341,7 +5341,8 @@ fun beggarwoman_N : N;
fun beggary_N : N; fun beggary_N : N;
fun begin_V : V; fun begin_V : V;
fun begin_V2 : V2; fun begin_V2 : V2;
fun begin_VV : VV; fun begin_to_VV : VV;
fun begin_ing_VV : VV;
fun beginner_N : N; fun beginner_N : N;
fun beginning_N : N; fun beginning_N : N;
fun begonia_N : N; fun begonia_N : N;
@@ -20017,7 +20018,6 @@ fun favism_N : N;
fun favor_V : V; fun favor_V : V;
fun favor_V2 : V2; fun favor_V2 : V2;
fun favor_VS : VS; fun favor_VS : VS;
fun favorable_A : A;
fun favorableness_N : N; fun favorableness_N : N;
fun favoritism_N : N; fun favoritism_N : N;
fun favour_N : N; fun favour_N : N;
@@ -24948,6 +24948,7 @@ fun help_V2 : V2;
fun help_V2V : V2V; fun help_V2V : V2V;
fun help_VS : VS; fun help_VS : VS;
fun help_VV : VV; fun help_VV : VV;
fun help_to_VV : VV;
fun helper_N : N; fun helper_N : N;
fun helpful_A : A; fun helpful_A : A;
fun helpfulness_N : N; fun helpfulness_N : N;
@@ -58521,7 +58522,6 @@ fun unreadable_A : A;
fun unready_A : A; fun unready_A : A;
fun unreal_A : A; fun unreal_A : A;
fun unrealistic_A : A; fun unrealistic_A : A;
fun unrealistically_Adv : Adv;
fun unreality_N : N; fun unreality_N : N;
fun unrealized_A : A; fun unrealized_A : A;
fun unreasonable_A : A; fun unreasonable_A : A;

6
lib/src/english/ParadigmsEng.gf
View File

@@ -306,6 +306,7 @@ oper
mkVS : V -> VS ; -- sentence-compl e.g. say (that S) mkVS : V -> VS ; -- sentence-compl e.g. say (that S)
mkV2S : V -> Prep -> V2S ; -- e.g. tell (NP) (that S) mkV2S : V -> Prep -> V2S ; -- e.g. tell (NP) (that S)
mkVV : V -> VV ; -- e.g. want (to VP) mkVV : V -> VV ; -- e.g. want (to VP)
infVV : V -> VV ; -- e.g. want (to VP)
ingVV : V -> VV ; -- e.g. start (VPing) ingVV : V -> VV ; -- e.g. start (VPing)
mkV2V : V -> Prep -> Prep -> V2V ; -- e.g. want (noPrep NP) (to VP) mkV2V : V -> Prep -> Prep -> V2V ; -- e.g. want (noPrep NP) (to VP)
ingV2V : V -> Prep -> Prep -> V2V ; -- e.g. prevent (noPrep NP) (from VP-ing) ingV2V : V -> Prep -> Prep -> V2V ; -- e.g. prevent (noPrep NP) (from VP-ing)
@@ -548,6 +549,11 @@ mkSubj : Str -> Subj = \s -> lin Subj {s = s} ; --%
p = v.p ; p = v.p ;
typ = VVInf typ = VVInf
} ; } ;
infVV v = lin VV {
s = table {VVF vf => v.s ! vf ; _ => v.s ! VInf} ;
p = v.p ;
typ = VVAux
} ;
ingVV v = lin VV { ingVV v = lin VV {
s = table {VVF vf => v.s ! vf ; _ => v.s ! VInf} ; s = table {VVF vf => v.s ! vf ; _ => v.s ! VInf} ;
p = v.p ; p = v.p ;