mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
several updates to DictEng and ParseEng
This commit is contained in:
@@ -4149,10 +4149,10 @@ lin boxing_day_PN = mkPN "Boxing day";
|
||||
lin boxing_glove_N = mkN "boxing - glove" "boxing - gloves";
|
||||
lin boxing_match_N = mkN "boxing - match" "boxing - matches";
|
||||
lin boxwood_N = mkN "boxwood" ;
|
||||
lin boy_N = mkN "boy" "boys";
|
||||
lin boy_N = mkN human (mkN "boy" "boys");
|
||||
lin boycott_N = mkN "boycott" "boycotts";
|
||||
lin boycott_V2 = mkV2 (mkV "boycott" "boycotts" "boycotted" "boycotted" "boycotting");
|
||||
lin boyfriend_N = mkN "boyfriend" "boyfriends";
|
||||
lin boyfriend_N = mkN human (mkN "boyfriend" "boyfriends");
|
||||
lin boyhood_N = mkN "boyhood" ;
|
||||
lin boyish_A = compoundA (mkA "boyish");
|
||||
lin bra_N = mkN "bra" "bras";
|
||||
@@ -8813,7 +8813,7 @@ lin custom_N = mkN "custom" "customs";
|
||||
lin custom_built_A = compoundA (mkA "custom - built");
|
||||
lin custom_made_A = compoundA (mkA "custom - made");
|
||||
lin customary_A = compoundA (mkA "customary");
|
||||
lin customer_N = mkN "customer" "customers";
|
||||
lin customer_N = mkN human (mkN "customer" "customers");
|
||||
lin customize_V2 = mkV2 (mkV "customize");
|
||||
lin cut_N = mkN "cut" "cuts";
|
||||
lin cut_V = IrregEng.cut_V;
|
||||
@@ -15263,8 +15263,8 @@ lin gird_V2 = mkV2 (mkV "gird" "girds" "girded" "girded" "girding");
|
||||
lin girder_N = mkN "girder" "girders";
|
||||
lin girdle_N = mkN "girdle" "girdles";
|
||||
lin girdle_V2 = mkV2 (mkV "girdle" "girdles" "girdled" "girdled" "girdling");
|
||||
lin girl_N = mkN "girl" "girls";
|
||||
lin girlfriend_N = mkN "girlfriend" "girlfriends";
|
||||
lin girl_N = mkN human (mkN "girl" "girls");
|
||||
lin girlfriend_N = mkN human (mkN "girlfriend" "girlfriends");
|
||||
lin girlhood_N = mkN "girlhood" ;
|
||||
lin girlish_A = compoundA (mkA "girlish");
|
||||
lin girlishness_N = mkN "girlishness" ;
|
||||
@@ -19770,6 +19770,7 @@ lin jury_mast_N = mkN "jury - mast" "jury - masts";
|
||||
lin jury_rigge_V2 = mkV2 (mkV "jury - rigge");
|
||||
lin juryman_N = mkN "juryman" "jurymen" {- FIXME: guessed plural form -};
|
||||
lin just_Adv = mkAdv "just";
|
||||
lin just_AdV = mkAdV "just";
|
||||
lin just_Predet = {s="just"};
|
||||
lin justice_N = mkN "justice" "justices";
|
||||
lin justiciary_N = mkN "justiciary" "justiciaries";
|
||||
@@ -24371,7 +24372,7 @@ lin nickel_V2 = mkV2 (mkV "nickel" "nickels" "nickelled" "nickelled" "nickelling
|
||||
lin nicknack_N = mkN "nicknack" "nicknacks";
|
||||
lin nickname_N = mkN "nickname" "nicknames";
|
||||
lin nickname_V2 = mkV2 (mkV "nickname" "nicknames" "nicknamed" "nicknamed" "nicknaming");
|
||||
lin nickname_VS = mkVS (mkV "nickname");
|
||||
lin nickname_V3 = mkV3 (mkV "nickname");
|
||||
lin nicola_PN = mkPN "Nicola";
|
||||
lin nicole_PN = mkPN "Nicole";
|
||||
lin nicotine_N = mkN "nicotine" ;
|
||||
@@ -24485,6 +24486,7 @@ lin nobleman_N = mkN "nobleman" "noblemen" {- FIXME: guessed plural form -};
|
||||
lin noblesse_N = mkN "noblesse" "IRREG";
|
||||
lin noblesse_oblige_N = mkN "noblesse oblige" ;
|
||||
lin nobly_Adv = mkAdv "nobly";
|
||||
lin nobody_NP = regNP "nobody" singular;
|
||||
lin noctambulist_N = mkN "noctambulist" "noctambulists";
|
||||
lin nocturnal_A = compoundA (mkA "nocturnal");
|
||||
lin nocturne_N = mkN "nocturne" "nocturnes";
|
||||
@@ -25041,7 +25043,7 @@ lin office_boy_N = mkN "office - boy" "office - boys";
|
||||
lin office_holder_N = mkN "office - holder" "office - holders";
|
||||
lin officer_N = mkN "officer" "officers";
|
||||
lin official_A = compoundA (mkA "official");
|
||||
lin official_N = mkN "official" "officials";
|
||||
lin official_N = mkN human (mkN "official" "officials");
|
||||
lin officialdom_N = mkN "officialdom" "officialdoms";
|
||||
lin officialese_N = mkN "officialese" ;
|
||||
lin officiate_V = mkV "officiate" "officiates" "officiated" "officiated" "officiating";
|
||||
@@ -29613,8 +29615,8 @@ lin quire_N = mkN "quire" "quires";
|
||||
lin quirk_N = mkN "quirk" "quirks";
|
||||
lin quisling_N = mkN "quisling" "quislings";
|
||||
lin quit_A = compoundA (mkA "quit");
|
||||
lin quit_V = mkV "quit";
|
||||
lin quit_V2 = mkV2 (mkV "quit" "quits" "quitted" "quitted" "quitting");
|
||||
lin quit_V = variants {mkV "quit" "quits" "quit" "quit" "quitting"; mkV "quit" "quits" "quitted" "quitted" "quitting"};
|
||||
lin quit_V2 = mkV2 (variants {mkV "quit" "quits" "quit" "quit" "quitting"; mkV "quit" "quits" "quitted" "quitted" "quitting"});
|
||||
lin quite_Predet = ss "quite";
|
||||
lin quito_PN = mkPN "Quito";
|
||||
lin quits_A = compoundA (mkA "quits");
|
||||
@@ -30705,7 +30707,7 @@ lin remunerative_A = compoundA (mkA "remunerative");
|
||||
lin renaissance_N = mkN "renaissance" "renaissances";
|
||||
lin renal_A = compoundA (mkA "renal");
|
||||
lin rename_V2 = mkV2 (mkV "rename" "renames" "renamed" "renamed" "renaming");
|
||||
lin rename_VS = mkVS (mkV "rename");
|
||||
lin rename_V3 = mkV3 (mkV "rename");
|
||||
lin renascence_N = mkN "renascence" "renascences";
|
||||
lin renascent_A = compoundA (mkA "renascent");
|
||||
lin rend_V2 = mkV2 (mkV "rend" "IRREG" "IRREG" "IRREG" "IRREG");
|
||||
@@ -30892,6 +30894,7 @@ lin reputable_A = compoundA (mkA "reputable");
|
||||
lin reputation_N = mkN "reputation" "reputations";
|
||||
lin repute_N = mkN "repute" ;
|
||||
lin repute_V2 = mkV2 (mkV "repute" "reputes" "reputed" "reputed" "reputing");
|
||||
lin repute_V2V = mkV2V (mkV "repute" "reputes" "reputed" "reputed" "reputing") noPrep to_Prep;
|
||||
lin reputed_A = compoundA (mkA "reputed");
|
||||
lin request_N = mkN "request" "requests";
|
||||
lin request_V2 = mkV2 (mkV "request" "requests" "requested" "requested" "requesting");
|
||||
@@ -33002,6 +33005,7 @@ lin see_V2 = mkV2 (IrregEng.see_V);
|
||||
lin see_V2V = mkV2V (IrregEng.see_V) noPrep to_Prep ;
|
||||
lin see_VA = mkVA (IrregEng.see_V);
|
||||
lin see_VS = mkVS (IrregEng.see_V);
|
||||
lin see_VQ = mkVQ (IrregEng.see_V);
|
||||
lin see_through_A = compoundA (mkA "see - through");
|
||||
lin seed_N = mkN "seed" "seed";
|
||||
lin seed_V = mkV "seed" "seeds" "seeded" "seeded" "seeding";
|
||||
@@ -40897,12 +40901,13 @@ lin usage_N = mkN "usage" "usages";
|
||||
lin use_N = mkN "use" "uses";
|
||||
lin use_V = mkV "use";
|
||||
lin use_V2 = mkV2 (mkV "use" "uses" "used" "used" "using");
|
||||
lin use_V2V = mkV2V (mkV "use" "uses" "used" "used" "using") noPrep to_Prep;
|
||||
lin use_VV = mkVV (mkV "use");
|
||||
lin useful_A = compoundA (mkA "useful");
|
||||
lin usefulness_N = mkN "usefulness" ;
|
||||
lin useless_A = compoundA (mkA "useless");
|
||||
lin uselessness_N = mkN "uselessness" ;
|
||||
lin user_N = mkN "user" "users";
|
||||
lin user_N = mkN human (mkN "user" "users");
|
||||
lin ushaw_moor_PN = mkPN "Ushaw moor";
|
||||
lin usher_N = mkN "usher" "ushers";
|
||||
lin usher_V2 = mkV2 (mkV "usher" "ushers" "ushered" "ushered" "ushering");
|
||||
@@ -41619,10 +41624,10 @@ lin wait_N = mkN "wait" "waits";
|
||||
lin wait_V = mkV "wait" "waits" "waited" "waited" "waiting";
|
||||
lin wait_V2 = mkV2 (mkV "wait" "waits" "waited" "waited" "waiting");
|
||||
lin wait_VV = mkVV (mkV "wait" "waits" "waited" "waited" "waiting");
|
||||
lin waiter_N = mkN "waiter" "waiters";
|
||||
lin waiter_N = mkN human (mkN "waiter" "waiters");
|
||||
lin waiting_list_N = mkN "waiting - list" "waiting - lists";
|
||||
lin waiting_room_N = mkN "waiting - room" "waiting - rooms";
|
||||
lin waitress_N = mkN "waitress" "waitresses";
|
||||
lin waitress_N = mkN human (mkN "waitress" "waitresses");
|
||||
lin waive_V2 = mkV2 (mkV "waive" "waives" "waived" "waived" "waiving");
|
||||
lin waiver_N = mkN "waiver" "waivers";
|
||||
lin waiver_V = mkV "waiver";
|
||||
|
||||
@@ -19746,6 +19746,7 @@ fun jury_mast_N : N;
|
||||
fun jury_rigge_V2 : V2;
|
||||
fun juryman_N : N;
|
||||
fun just_Adv : Adv;
|
||||
fun just_AdV : AdV;
|
||||
fun just_Predet : Predet;
|
||||
fun justice_N : N;
|
||||
fun justiciary_N : N;
|
||||
@@ -24321,7 +24322,7 @@ fun nickel_V2 : V2;
|
||||
fun nicknack_N : N;
|
||||
fun nickname_N : N;
|
||||
fun nickname_V2 : V2;
|
||||
fun nickname_VS : VS;
|
||||
fun nickname_V3 : V3;
|
||||
fun nicola_PN : PN;
|
||||
fun nicole_PN : PN;
|
||||
fun nicotine_N : N;
|
||||
@@ -24435,6 +24436,7 @@ fun nobleman_N : N;
|
||||
fun noblesse_N : N;
|
||||
fun noblesse_oblige_N : N;
|
||||
fun nobly_Adv : Adv;
|
||||
fun nobody_NP : NP;
|
||||
fun noctambulist_N : N;
|
||||
fun nocturnal_A : A;
|
||||
fun nocturne_N : N;
|
||||
@@ -30653,7 +30655,7 @@ fun remunerative_A : A;
|
||||
fun renaissance_N : N;
|
||||
fun renal_A : A;
|
||||
fun rename_V2 : V2;
|
||||
fun rename_VS : VS;
|
||||
fun rename_V3 : V3;
|
||||
fun renascence_N : N;
|
||||
fun renascent_A : A;
|
||||
fun rend_V2 : V2;
|
||||
@@ -30840,6 +30842,7 @@ fun reputable_A : A;
|
||||
fun reputation_N : N;
|
||||
fun repute_N : N;
|
||||
fun repute_V2 : V2;
|
||||
fun repute_V2V : V2V;
|
||||
fun reputed_A : A;
|
||||
fun request_N : N;
|
||||
fun request_V2 : V2;
|
||||
@@ -32950,6 +32953,7 @@ fun see_V2 : V2;
|
||||
fun see_V2V : V2V;
|
||||
fun see_VA : VA;
|
||||
fun see_VS : VS;
|
||||
fun see_VQ : VQ;
|
||||
fun see_through_A : A;
|
||||
fun seed_N : N;
|
||||
fun seed_V : V;
|
||||
@@ -40829,6 +40833,7 @@ fun usage_N : N;
|
||||
fun use_N : N;
|
||||
fun use_V : V;
|
||||
fun use_V2 : V2;
|
||||
fun use_V2V : V2V;
|
||||
fun use_VV : VV;
|
||||
fun useful_A : A;
|
||||
fun usefulness_N : N;
|
||||
|
||||
@@ -11,6 +11,7 @@ concrete ParseEng of ParseEngAbs =
|
||||
AdverbEng,
|
||||
PhraseEng,
|
||||
SentenceEng,
|
||||
QuestionEng,
|
||||
RelativeEng,
|
||||
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
||||
ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
|
||||
|
||||
@@ -10,6 +10,7 @@ abstract ParseEngAbs =
|
||||
Adverb,
|
||||
Phrase,
|
||||
Sentence,
|
||||
Question,
|
||||
Relative,
|
||||
Idiom [NP, VP, Cl, ProgrVP, ExistNP],
|
||||
Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash,
|
||||
|
||||
Reference in New Issue
Block a user