Merge branch 'master' into master

This commit is contained in:
kitukb
2018-11-29 16:47:13 +03:00
committed by GitHub
153 changed files with 7454 additions and 194712 deletions
+6
View File
@@ -23,7 +23,9 @@ lin
n=agr.n; g=agr.g
in {s = table {
NCase c => pron.s!Pers ;
NPoss => pron.s!Poss n g };
a = Ag agr.g agr.n agr.p;
} ;
-- Predet -> NP -> NP
@@ -140,11 +142,13 @@ lin
-- PossNP : CN -> NP -> CN
-- e.g. 'house of Paris', 'house of mine'
PossNP cn np =let agr = detAgr np.a in
{s = \\n,c => cn.s ! n ! Nom ++ possess_Prep.s! n!cn.g ++ np.s ! NPoss;
s2 =\\n => []; g = cn.g} ;
-- PartNP : CN -> NP -> CN
-- e.g. 'glass of wine'
PartNP cn np = {s = \\n,c => cn.s ! n ! Nom ++ part_Prep.s! n!cn.g ++ np.s ! NCase Nom ; s2 =\\n => []; g = cn.g} ;
-- CountNP : Det -> NP -> NP
-- e.g. 'three of them', 'some of the boys'
@@ -161,8 +165,10 @@ lin
DetDAP d = { s=d.s; n=d.n };
-- ApposCN cn np = let agr = complAgr np.a in
-- {s = \\n,c => np.s ! NCase Nom --++ possess_Prep.s!n!agr.g
-- ++ cn.s !n ! Nom ; s2 =\\n => ""; g = cn.g} ;
}