1
0
forked from GitHub/gf-rgl

change determiners in np and fix emptynp

This commit is contained in:
Herbert Lange
2019-11-12 14:53:10 +01:00
parent b49cd9afc3
commit 5b04dbffa0
3 changed files with 16 additions and 14 deletions
+7 -7
View File
@@ -11,7 +11,7 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
adv = cn.adv ;
preap = cn.preap ;
postap = cn.postap ;
det = det
det = { s = det.s ! cn.g ; sp = det.sp ! cn.g } ;
} ;
-- UsePN : PN -> NP ; -- John
@@ -22,7 +22,7 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
p = P3 ;
adv = "" ;
preap, postap = { s = \\_ => "" } ;
det = { s,sp = \\_,_ => "" ; n = Sg }
det = { s,sp = \\_ => "" ; n = Sg }
} ;
-- UsePron : Pron -> NP ; -- he
@@ -33,13 +33,13 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
s = \\pd,c => p.pers.s ! pd ! PronNonRefl ! c;
adv = "" ;
preap, postap = { s = \\_ => "" } ;
det = { s,sp = \\_,_ => "" ; n = p.pers.n } ;
det = { s,sp = \\_ => "" ; n = p.pers.n } ;
} ;
-- PredetNP : Predet -> NP -> NP ; -- only the man
PredetNP predet np =
np ** {
det = np.det ** { s = \\g,c => predet.s ++ np.det.s ! g ! c }
det = { s = \\c => predet.s ++ np.det.s ! c ; sp = np.det.sp }
} ;
-- PPartNP : NP -> V2 -> NP ; -- the man seen
@@ -74,7 +74,7 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
p = P3 ;
adv = "" ;
preap, postap = { s = \\_ => "" } ;
det = { s,sp = \\_,_ => "" ; n = det.n } ;
det = { s,sp = \\_ => "" ; n = det.n } ;
} ;
--
-- DetQuantOrd quant num ord = {
@@ -130,7 +130,7 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
-- s = case cn.massable of { True => cn.s ! Sg ; False => \\_ => nonExist } ;
n = Sg ;
p = P3 ;
det = { s,sp = \\_,_ => "" ; n = Sg } ;
det = { s,sp = \\_ => "" ; n = Sg } ;
};
UseN n = -- N -> CN
@@ -182,6 +182,6 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
-- CountNP : Det -> NP -> NP ; -- three of them, some of the boys
CountNP det np = np ** {
det = det ** { s = \\g,c => det.s ! g ! c++ np.det.s ! g ! c } ;
det = { s = \\c => det.s ! np.g ! c ++ np.det.s ! c ; sp = \\c => det.sp ! np.g ! c ++ np.det.sp ! c } ;
};
}