mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-07-02 03:58:34 -06:00
(Pes) Remove redundant parameters in V*, VP and Cl
Keep VerbForm at VP level, and rename VPHTense to use Tense and Anteriority instead of custom names that are then mapped to Tense and Anteriority in Use*Cl functions. WIP: Remove Aux type and use beVerb instead of beAux. There were a lot of comments along the lines "check the right form"; will do that with a native speaker.
This commit is contained in:
@@ -9,7 +9,7 @@ lin
|
||||
GenericCl vp = mkSClause "آدم" (agrP3 Sg) vp ;
|
||||
|
||||
CleftNP np rs =
|
||||
let cl = mkSClause (np.s ! Bare) (np.a) (predAux auxBe);
|
||||
let cl = mkSClause (np.s ! Bare) (np.a) (predV beVerb);
|
||||
in
|
||||
{s = \\t,p,o => cl.s ! t ! p ! o ++ rs.s ! np.a };
|
||||
|
||||
@@ -17,10 +17,10 @@ lin
|
||||
|
||||
ExistNP np =
|
||||
mkSClause " " (agrP3 (fromAgr np.a).n)
|
||||
(insertComp (\\_ => np.s ! Bare) (predAux auxBe)) ;
|
||||
(insertComp (\\_ => np.s ! Bare) (predV beVerb)) ;
|
||||
|
||||
ExistIP ip =
|
||||
let cl = mkSClause ( ip.s ) (agrP3 ip.n) (predAux auxBe);
|
||||
let cl = mkSClause ( ip.s ) (agrP3 ip.n) (predV beVerb);
|
||||
in {s = \\t,p,qf => case qf of {
|
||||
QDir => cl.s ! t ! p ! ODir;
|
||||
QIndir => cl.s ! t! p ! ODir
|
||||
@@ -30,8 +30,8 @@ lin
|
||||
|
||||
ProgrVP vp = predProg vp ;
|
||||
|
||||
ImpPl1 vp = {s = "بیایید" ++ vp.s ! VVForm (agrP1 Pl)} ;
|
||||
ImpP3 np vp = {s = "بگذارید" ++ np.s!Bare ++ vp.s ! VVForm np.a};
|
||||
ImpPl1 vp = {s = "بیایید" ++ vp.s ! Vvform (agrP1 Pl)} ;
|
||||
ImpP3 np vp = {s = "بگذارید" ++ np.s!Bare ++ vp.s ! Vvform np.a};
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user