GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-07 02:02:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

updates to ParseEng and ParseEngBul

Browse Source
This commit is contained in:
kr.angelov
2012-09-06 13:27:08 +00:00
parent e34d18310a
commit 1d8fb27656
7 changed files with 136 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -662,6 +662,7 @@ lin aft_Adv = mkAdv "aft";
lin after_A = compoundA (mkA "after");
lin after_Adv = mkAdv "after";
lin after_Prep = mkPrep "after";
lin after_Subj = mkSubj "after";
lin aftercare_N = mkN "aftercare" ;
lin afterdamp_N = mkN "afterdamp" ;
lin aftereffect_N = mkN "aftereffect" "aftereffects";
@@ -5319,8 +5320,8 @@ lin carlisle_PN = mkPN "Carlisle";
lin carlow_PN = mkPN "Carlow";
lin carluke_PN = mkPN "Carluke";
lin carmarthen_PN = mkPN "Carmarthen";
lin carmelite_A = compoundA (mkA "carmelite");
lin carmelite_N = mkN "carmelite" "carmelites";
lin carmelite_A = compoundA (mkA "Carmelite");
lin carmelite_N = mkN "Carmelite" "Carmelites";
lin carmine_A = compoundA (mkA "carmine");
lin carmine_N = mkN "carmine" "carmines";
lin carnage_N = mkN "carnage" ;
@@ -5666,7 +5667,7 @@ lin central_N = mkN "central" "centrals";
lin centralization_N = mkN "centralization" "centralizations";
lin centralize_V = mkV "centralize" "centralizes" "centralized" "centralized" "centralizing";
lin centralize_V2 = mkV2 (mkV "centralize" "centralizes" "centralized" "centralized" "centralizing");
lin centre_N = mkN "centre" "centres";
lin centre_N = mkN (variants {"centre"; "center"});
lin centre_V = mkV "centre" "centres" "centred" "centred" "centring";
lin centre_V2 = mkV2 (mkV "centre" "centres" "centred" "centred" "centring");
lin centre_bit_N = mkN "centre - bit" "centre - bits";
@@ -8831,7 +8832,7 @@ lin customize_V2 = mkV2 (mkV "customize");
lin cut_N = mkN "cut" "cuts";
lin cut_V = IrregEng.cut_V;
lin cut_V2 = mkV2 (IrregEng.cut_V);
lin cut_VS = mkVS (IrregEng.cut_V);
lin cut_V2A = mkV2A (IrregEng.cut_V) noPrep;
lin cut_out_N = mkN "cut - out" "cut - outs";
lin cut_price_A = compoundA (mkA "cut - price");
lin cut_rate_A = compoundA (mkA "cut - rate");
@@ -13045,7 +13046,6 @@ lin fall_N = mkN "fall" "falls";
lin fall_V = IrregEng.fall_V;
lin fall_V2 = mkV2 (IrregEng.fall_V);
lin fall_VA = mkVA (IrregEng.fall_V);
lin fall_VS = mkVS (IrregEng.fall_V);
lin fallacious_A = compoundA (mkA "fallacious");
lin fallacy_N = mkN "fallacy" "fallacies";
lin fallibility_N = mkN "fallibility" ;
@@ -13306,7 +13306,6 @@ lin fell_A = compoundA (mkA "fell");
lin fell_V2 = mkV2 (mkV "fell" "fells" "felled" "felled" "felling");
lin fell_V2V = mkV2V (mkV "fell") noPrep to_Prep ;
lin fell_VA = mkVA (mkV "fell");
lin fell_VS = mkVS (mkV "fell");
lin fellah_N = mkN "fellah" (variants {"fellahin"; "fellaheen"});
lin fellow_N = mkN "fellow" "fellows";
lin fellow_feeling_N = mkN "fellow - feeling" ;
@@ -19875,7 +19874,8 @@ lin keenness_N = mkN "keenness" ;
lin keep_N = mkN "keep" "keeps";
lin keep_V = IrregEng.keep_V;
lin keep_V2 = mkV2 (IrregEng.keep_V);
lin keep_V2V = mkV2V (IrregEng.keep_V) noPrep to_Prep;
lin keep_to_V2V = mkV2V (IrregEng.keep_V) noPrep to_Prep;
lin keep_ing_V2V = ingV2V (IrregEng.keep_V) noPrep noPrep;
lin keep_VA = mkVA (IrregEng.keep_V);
lin keep_VS = mkVS (IrregEng.keep_V);
lin keep_VV = ingVV (IrregEng.keep_V);
@@ -20125,6 +20125,7 @@ lin know_V = mkV "know" "knows" "knew" "known" "knowing";
lin know_V2 = mkV2 (mkV "know" "knows" "knew" "known" "knowing");
lin know_V2V = mkV2V (mkV "know" "knows" "knew" "known" "knowing") noPrep to_Prep ;
lin know_VS = mkVS (mkV "know" "knows" "knew" "known" "knowing");
lin know_VQ = mkVQ (mkV "know" "knows" "knew" "known" "knowing");
lin know_all_N = mkN "know - all" "know - alls";
lin know_how_N = mkN "know - how" ;
lin knowing_A = compoundA (mkA "knowing");
@@ -24722,7 +24723,7 @@ lin notecase_N = mkN "notecase" "notecases";
lin noted_A = compoundA (mkA "noted");
lin notepaper_N = mkN "notepaper" ;
lin noteworthy_A = compoundA (mkA "noteworthy");
lin nothing_Adv = mkAdv "nothing";
lin nothing_NP = regNP "nothing" singular;
lin nothingness_N = mkN "nothingness" ;
lin notice_N = mkN "notice" "notices";
lin notice_V = mkV "notice" "notices" "noticed" "noticed" "noticing";
@@ -29669,6 +29670,7 @@ lin quit_A = compoundA (mkA "quit");
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 quite_AdA = mkAdA "quite";
lin quito_PN = mkPN "Quito";
lin quits_A = compoundA (mkA "quits");
lin quittance_N = mkN "quittance" "quittances";
@@ -31534,7 +31536,7 @@ lin risible_A = compoundA (mkA "risible");
lin rising_N = mkN "rising" "risings";
lin risk_N = mkN "risk" "risks";
lin risk_V2 = mkV2 (mkV "risk" "risks" "risked" "risked" "risking");
lin risk_VS = mkVS (mkV "risk");
lin risk_VV = ingVV (mkV "risk");
lin riskily_Adv = mkAdv "riskily";
lin riskiness_N = mkN "riskiness" ;
lin risky_A = mkA "risky" "riskier";
@@ -36001,7 +36003,6 @@ lin start_V = mkV "start" "starts" "started" "started" "starting";
lin start_V2 = mkV2 (mkV "start" "starts" "started" "started" "starting");
lin start_to_VV = mkVV (mkV "start" "starts" "started" "started" "starting");
lin start_ing_VV = ingVV (mkV "start" "starts" "started" "started" "starting");
lin start_VS = mkVS (mkV "start" "starts" "started" "started" "starting");
lin starter_N = mkN "starter" "starters";
lin starting_gate_N = mkN "starting - gate" "starting - gates";
lin starting_point_N = mkN "starting - point" "starting - points";
@@ -37591,7 +37592,7 @@ lin take_V = IrregEng.take_V;
lin take_V2 = mkV2 (IrregEng.take_V);
lin take_V2V = mkV2V (IrregEng.take_V) noPrep to_Prep;
lin take_VA = mkVA (IrregEng.take_V);
lin take_VS = mkVS (IrregEng.take_V);
lin take_V2A = mkV2A (IrregEng.take_V) noPrep;
lin take_home_A = compoundA (mkA "take - home");
lin take_off_N = mkN "take - off" "take - offs";
lin take_up_N = mkN "take - up" ;
@@ -38187,7 +38188,7 @@ lin thankful_A = compoundA (mkA "thankful");
lin thankfulness_N = mkN "thankfulness" ;
lin thankless_A = compoundA (mkA "thankless");
lin thanksgiving_N = mkN "thanksgiving" "thanksgivings";
lin that_Prep = mkPrep "that";
lin that_Subj = mkSubj "that";
lin that_Quant = mkQuant "that" "those" ;
lin thatch_N = mkN "thatch" ;
lin thatch_V2 = mkV2 (mkV "thatch" "thatches" "thatched" "thatched" "thatching");
@@ -39533,6 +39534,7 @@ lin truthfulness_N = mkN "truthfulness" ;
lin try_N = mkN "try" "tries";
lin try_V = mkV "try" "tries" "tried" "tried" "trying";
lin try_V2 = mkV2 (mkV "try" "tries" "tried" "tried" "trying");
lin try_V2V = mkV2V (mkV "try" "tries" "tried" "tried" "trying") noPrep to_Prep;
lin try_VV = mkVV (mkV "try" "tries" "tried" "tried" "trying");
lin try_VS = mkVS (mkV "try" "tries" "tried" "tried" "trying");
lin try_on_N = mkN "try - on" "try - ons";

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

@@ -657,6 +657,7 @@ fun aft_Adv : Adv;
fun after_A : A;
fun after_Adv : Adv;
fun after_Prep : Prep ;
fun after_Subj : Subj ;
fun aftercare_N : N;
fun afterdamp_N : N;
fun aftereffect_N : N;
@@ -8813,7 +8814,7 @@ fun customize_V2 : V2;
fun cut_N : N;
fun cut_V : V;
fun cut_V2 : V2;
fun cut_VS : VS;
fun cut_V2A : V2A;
fun cut_out_N : N;
fun cut_price_A : A;
fun cut_rate_A : A;
@@ -13025,7 +13026,6 @@ fun fall_N : N;
fun fall_V : V;
fun fall_V2 : V2;
fun fall_VA : VA;
fun fall_VS : VS;
fun fallacious_A : A;
fun fallacy_N : N;
fun fallibility_N : N;
@@ -13286,7 +13286,6 @@ fun fell_A : A;
fun fell_V2 : V2;
fun fell_V2V : V2V;
fun fell_VA : VA;
fun fell_VS : VS;
fun fellah_N : N;
fun fellow_N : N;
fun fellow_feeling_N : N;
@@ -19851,7 +19850,8 @@ fun keenness_N : N;
fun keep_N : N;
fun keep_V : V;
fun keep_V2 : V2;
fun keep_V2V : V2V;
fun keep_to_V2V : V2V;
fun keep_ing_V2V : V2V;
fun keep_VA : VA;
fun keep_VS : VS;
fun keep_VV : VV;
@@ -20101,6 +20101,7 @@ fun know_V : V;
fun know_V2 : V2;
fun know_V2V : V2V;
fun know_VS : VS;
fun know_VQ : VQ;
fun know_all_N : N;
fun know_how_N : N;
fun knowing_A : A;
@@ -24670,7 +24671,7 @@ fun notecase_N : N;
fun noted_A : A;
fun notepaper_N : N;
fun noteworthy_A : A;
fun nothing_Adv : Adv;
fun nothing_NP : NP;
fun nothingness_N : N;
fun notice_N : N;
fun notice_V : V;
@@ -29617,6 +29618,7 @@ fun quit_A : A;
fun quit_V : V;
fun quit_V2 : V2;
fun quite_Predet : Predet;
fun quite_AdA : AdA;
fun quito_PN : PN;
fun quits_A : A;
fun quittance_N : N;
@@ -31480,7 +31482,7 @@ fun risible_A : A;
fun rising_N : N;
fun risk_N : N;
fun risk_V2 : V2;
fun risk_VS : VS;
fun risk_VV : VV;
fun riskily_Adv : Adv;
fun riskiness_N : N;
fun risky_A : A;
@@ -35936,7 +35938,6 @@ fun start_V : V;
fun start_V2 : V2;
fun start_to_VV : VV;
fun start_ing_VV : VV;
fun start_VS : VS;
fun starter_N : N;
fun starting_gate_N : N;
fun starting_point_N : N;
@@ -37526,7 +37527,7 @@ fun take_V : V;
fun take_V2 : V2;
fun take_V2V : V2V;
fun take_VA : VA;
fun take_VS : VS;
fun take_V2A : V2A;
fun take_home_A : A;
fun take_off_N : N;
fun take_up_N : N;
@@ -38121,7 +38122,7 @@ fun thankful_A : A;
fun thankfulness_N : N;
fun thankless_A : A;
fun thanksgiving_N : N;
fun that_Prep : Prep;
fun that_Subj : Subj;
fun that_Quant : Quant;
fun thatch_N : N;
fun thatch_V2 : V2;
@@ -39463,6 +39464,7 @@ fun truthfulness_N : N;
fun try_N : N;
fun try_V : V;
fun try_V2 : V2;
fun try_V2V : V2V;
fun try_VV : VV;
fun try_VS : VS;
fun try_on_N : N;

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

@@ -134,7 +134,16 @@ lin
a = np.a
} ;
{- GerundRS rp vp = {
{-
PastPartRS ant pol vp = {
s = let
be = predAux auxBe ;
ppt = vps.ptp
in \\c => np.s ! c ++ vps.ad ++ vps.ptp ++ vps.s2 ! np.a ;
a = np.a
} ;
PresPartRS rp vp = {
s = \\t,ant,b,ag =>
let
agr = case rp.a of {
@@ -144,10 +153,17 @@ lin
cl = mkClause (rp.s ! RC (fromAgr agr).g npNom) agr vp
in
cl.s ! t ! ant ! b ! ODir ;
c = npNom
c = npNom
} ;
-}
ApposNP np1 np2 = {
s = \\c => np1.s ! c ++ "," ++ np2.s ! npNom ;
a = np1.a
} ;
AdAdV = cc2 ;
lin
PPos = {s = [] ; p = CPos} ;
PNeg = {s = [] ; p = CNeg True} ; -- contracted: don't

7
lib/src/english/ParseEngAbs.gf
View File

@@ -58,6 +58,11 @@ fun CompoundCN : Num -> N -> CN -> CN ;
UncNeg : Pol ;
-- GerundRS : Anter -> Pol -> VP -> RS ;
-- PastPartRS : Anter -> Pol -> VP -> RS ;
-- PresPartRS : Anter -> Pol -> VP -> RS ;
ApposNP : NP -> NP -> NP ;
AdAdV : AdA -> AdV -> AdV ;
}