msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

removed some clashes from Dictionary ; corrected the probability of IdRP after elimination of that_RP

Browse Source
This commit is contained in:
aarne
2014-05-06 21:43:51 +00:00
parent b0504d2c4a
commit f4ca89a416
21 changed files with 451 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/src/translator/todo/TopDictionaryEng.gf
View File

@@ -97,7 +97,7 @@ lin than_Subj = {s = "than"} ;
lin more_Adv = mkAdv "more";
lin about_Prep = mkPrep "about";
lin now_Adv = mkAdv "now";
lin last_A = irregAdv (mkA "last") "last";
lin last_A = variants{} ; --
lin last_1_A = irregAdv (mkA "last") "last";
lin last_2_A = irregAdv (mkA "last") "last";
lin other_A = compoundA (mkA "other");
@@ -150,8 +150,8 @@ lin thing_N = mkN "thing" "things";
lin tell_VV = mkVV (IrregEng.tell_V);
lin tell_VS = mkVS (IrregEng.tell_V);
lin tell_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
lin tell_1_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
lin tell_2_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
lin tell_1_V3 = variants{} ; --
lin tell_2_V3 = variants{} ; --
lin tell_V2V = mkV2V (IrregEng.tell_V) noPrep to_Prep;
lin tell_V2S = mkV2S (IrregEng.tell_V) noPrep;
lin tell_V2Q = mkV2Q (IrregEng.tell_V) noPrep;
@@ -273,7 +273,7 @@ lin high_A = mkA "high" "higher";
lin about_Adv = mkAdv "about";
lin something_NP = regNP "something" singular ;
lin school_N = mkN "school" "schools";
lin in_Adv = mkAdv "in";
lin in_Adv = variants{}; -- mkPrep "in";
lin in_1_Adv = mkAdv "in";
lin in_2_Adv = mkAdv "in";
lin small_A = mkA "small" "smaller";
@@ -418,7 +418,7 @@ lin hear_VS = mkVS (IrregEng.hear_V);
lin hear_V2V = mkV2V (IrregEng.hear_V) noPrep to_Prep ;
lin hear_V2 = mkV2 (IrregEng.hear_V);
lin hear_V = IrregEng.hear_V;
lin room_N = mkN "room" "rooms";
lin room_N = variants{} ; --
lin room_1_N = mkN "room" "rooms";
lin room_2_N = mkN "room" "rooms";
lin whether_Subj = mkSubj "whether" ;
@@ -436,7 +436,7 @@ lin meet_V = IrregEng.meet_V;
lin level_N = mkN "level" "levels";
lin level_2_N = mkN "level" "levels";
lin level_1_N = mkN "level" "levels";
lin until_Subj = mkSubj "until";
lin until_Subj = mkSubj "until" ;
lin though_Subj = mkSubj "though";
lin policy_N = mkN "policy" "policies";
lin include_VV = ingVV (mkV "include");
@@ -512,7 +512,7 @@ lin face_N = mkN "face" "faces";
lin sit_VA = mkVA (IrregEng.sit_V);
lin sit_V2 = mkV2 (IrregEng.sit_V);
lin sit_V = IrregEng.sit_V;
lin market_N = mkN "market" "markets";
lin market_N = variants{} ; --
lin market_1_N = mkN "market" "markets";
lin market_2_N = mkN "market" "markets";
lin appear_VV = mkVV (mkV "appear" "appears" "appeared" "appeared" "appearing");
@@ -630,7 +630,7 @@ lin position_N = mkN "position" "positions";
lin low_A = mkA "low" "lower";
lin cost_N = mkN "cost" "costs";
lin little_Det = mkDeterminer singular "little" ;
lin matter_N = mkN "matter" "matters";
lin matter_N = variants{} ; --
lin matter_1_N = mkN "matter" "matters";
lin matter_2_N = mkN "matter" "matters";
lin community_N = mkN "community" "communities";
@@ -703,7 +703,7 @@ lin build_V = IrregEng.build_V;
lin spend_V2 = mkV2 (IrregEng.spend_V);
lin spend_V = IrregEng.spend_V;
lin force_N = mkN "force" "forces";
lin condition_N = mkN "condition" "conditions";
lin condition_N = variants{} ; --
lin condition_1_N = mkN "condition" "conditions";
lin condition_2_N = mkN "condition" "conditions";
lin paper_N = mkN "paper" "papers";
@@ -776,7 +776,7 @@ lin department_N = mkN "department" "departments";
lin management_N = mkN "management" "managements";
lin morning_N = mkN "morning" "mornings";
lin draw_V2V = mkV2V (IrregEng.draw_V) noPrep to_Prep ;
lin draw_V2 = mkV2 (IrregEng.draw_V);
lin draw_V2 = variants{}; -- mkV2V (IrregEng.draw_V) noPrep to_Prep ;
lin draw_1_V2 = mkV2 (IrregEng.draw_V);
lin draw_2_V2 = mkV2 (IrregEng.draw_V);
lin draw_V = IrregEng.draw_V;
@@ -858,7 +858,7 @@ lin land_N = mkN "land" "lands";
lin trade_N = mkN "trade" "trades";
lin watch_VS = mkVS (mkV "watch" "watches" "watched" "watched" "watching");
lin watch_V2V = mkV2V (mkV "watch" "watches" "watched" "watched" "watching") noPrep to_Prep ;
lin watch_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
lin watch_V2 = variants{}; -- mkV2V (mkV "watch" "watches" "watched" "watched" "watching") noPrep to_Prep ;
lin watch_1_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
lin watch_2_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
lin watch_V = mkV "watch" "watches" "watched" "watched" "watching";
@@ -1374,7 +1374,7 @@ lin train_V = mkV "train" "trains" "trained" "trained" "training";
lin maintain_VS = mkVS (mkV "maintain" "maintains" "maintained" "maintained" "maintaining");
lin maintain_V2 = mkV2 (mkV "maintain" "maintains" "maintained" "maintained" "maintaining");
lin maintain_V = mkV "maintain";
lin attempt_N = mkN "attempt" "attempts";
lin attempt_N = variants{} ; --
lin leg_N = mkN "leg" "legs";
lin investment_N = mkN "investment" "investments";
lin save_V2 = mkV2 (mkV "save" "saves" "saved" "saved" "saving");
@@ -2131,7 +2131,7 @@ lin insist_VS = mkVS (mkV "insist" "insists" "insisted" "insisted" "insisting");
lin insist_V2 = mkV2 (mkV "insist" "insists" "insisted" "insisted" "insisting");
lin insist_V = mkV "insist" "insists" "insisted" "insisted" "insisting";
lin farmer_N = mkN "farmer" "farmers";
lin until_Prep = mkPrep "until";
lin until_Prep = mkPrep "until" | mkPrep "till" | mkPrep "til" | mkPrep "'til" ;
lin traffic_N = mkN "traffic" ;
lin dinner_N = mkN "dinner" "dinners";
lin consumer_N = mkN "consumer" "consumers";
@@ -3888,7 +3888,7 @@ lin pretend_VS = mkVS (mkV "pretend" "pretends" "pretended" "pretended" "pretend
lin pretend_V2 = mkV2 (mkV "pretend" "pretends" "pretended" "pretended" "pretending");
lin pretend_V = mkV "pretend" "pretends" "pretended" "pretended" "pretending";
lin plant_V2 = mkV2 (mkV "plant" "plants" "planted" "planted" "planting");
lin till_Prep = mkPrep "till";
lin till_Prep = variants{} ; --
lin known_A = mkA "known" ;
lin admission_N = mkN "admission" "admissions";
lin tissue_N = mkN "tissue" "tissues";
@@ -7195,7 +7195,7 @@ lin manipulation_N = mkN "manipulation" "manipulations";
lin inquest_N = mkN "inquest" "inquests";
lin decrease_N = mkN "decrease" "decreases";
lin cellar_N = mkN "cellar" "cellars";
lin counsellor_N = mkN "counsellor" "counsellors";
lin counsellor_N = mkN (variants {"counsellor"; "counselor"});
lin avenue_N = mkN "avenue" "avenues";
lin rubber_A = mkA "rubber" ;
lin labourer_N = mkN "labourer" "labourers";