mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-28 12:26:30 -06:00
(Pes) Remove unnecessary QForm from QS and QCl
Y/N questions are formed the same way in direct and indirect, not like English "do you sleep / if you sleep".
This commit is contained in:
+16
-31
@@ -4,41 +4,26 @@ concrete QuestionPes of Question = CatPes ** open ResPes, Prelude in {
|
||||
|
||||
lin
|
||||
|
||||
QuestCl cl = {
|
||||
s = \\t,p,qf => case qf of {
|
||||
QDir => cl.s ! t ! p ! OQuest;
|
||||
QIndir => cl.s ! t! p ! ODir
|
||||
}
|
||||
};
|
||||
QuestCl cl = {
|
||||
s = \\t,p => cl.s ! t ! p ! OQuest
|
||||
};
|
||||
|
||||
QuestVP qp vp =
|
||||
let cl = mkSClause ("") (Ag qp.n P3) vp;
|
||||
-- qp1 = qp.s;
|
||||
-- qp2 = qp.s ! Obl ++ "nE"
|
||||
in { s = \\t,p,o => qp.s ++ cl.s ! t ! p ! ODir } ;
|
||||
-- _ => qp1 ++ cl.s ! t ! p ! ODir
|
||||
-- }
|
||||
QuestVP qp vp =
|
||||
let cl = mkSClause [] (Ag qp.n P3) vp;
|
||||
in {s = \\t,p => qp.s ++ cl.s ! t ! p ! ODir} ;
|
||||
|
||||
QuestSlash ip slash = {
|
||||
s = \\t,p,o =>
|
||||
slash.subj ++ slash.c2.s ++ ip.s ++ slash.c2.ra ++
|
||||
slash.vp ! t ! p ! ODir;
|
||||
-- order of whome and john needs to be changed
|
||||
-- AR 18/9/2017 now changed by making ClSlash discontinuous
|
||||
};
|
||||
QuestSlash ip slash = {
|
||||
s = \\t,p => slash.subj ++ slash.c2.s ++ ip.s ++ slash.c2.ra
|
||||
++ slash.vp ! t ! p ! ODir
|
||||
};
|
||||
|
||||
QuestIAdv iadv cl = {
|
||||
s = \\t,p,_ => iadv.s ++ cl.s ! t ! p ! ODir;
|
||||
};
|
||||
QuestIAdv iadv cl = {
|
||||
s = \\t,p => iadv.s ++ cl.s ! t ! p ! ODir
|
||||
};
|
||||
|
||||
QuestIComp icomp np =
|
||||
let cl = mkSClause (np.s ! Bare ++ icomp.s) np.a (predV beVerb);
|
||||
in {
|
||||
s = \\t,p,qf => case qf of {
|
||||
QDir => cl.s ! t ! p ! ODir;
|
||||
QIndir => cl.s ! t! p ! ODir
|
||||
}
|
||||
};
|
||||
QuestIComp icomp np =
|
||||
let cl = mkSClause (np.s ! Bare ++ icomp.s) np.a (predV beVerb)
|
||||
in {s = \\t,p => cl.s ! t ! p ! ODir};
|
||||
|
||||
PrepIP p ip = {s = p.s ++ ip.s } ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user