mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-19 16:12:52 -06:00
Proper reflexive and medial verbs support together with completelly reworked case system.
This commit is contained in:
@@ -14,18 +14,18 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
|
||||
} ;
|
||||
|
||||
QuestVP ip vp =
|
||||
let cl = mkClause (ip.s ! Nom) {gn = ip.gn ; p = P3} vp
|
||||
let cl = mkClause (ip.s ! RSubj) {gn = ip.gn ; p = P3} vp
|
||||
in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! Main} ;
|
||||
|
||||
QuestSlash ip slash =
|
||||
mkQuestion (ss (slash.c2.s ++ ip.s ! slash.c2.c)) slash ;
|
||||
mkQuestion {s1 = slash.c2.s ++ ip.s ! (RObj slash.c2.c); s2 = slash.c2.s ++ ip.s ! (RObj slash.c2.c)} slash ;
|
||||
|
||||
QuestIAdv iadv cl = mkQuestion iadv cl ;
|
||||
|
||||
QuestIComp icomp np =
|
||||
mkQuestion icomp (mkClause (np.s ! Nom) np.a (predV auxBe)) ;
|
||||
mkQuestion icomp (mkClause (np.s ! RSubj) np.a (predV verbBe)) ;
|
||||
|
||||
PrepIP p ip = {s = p.s ++ ip.s ! Nom} ;
|
||||
PrepIP p ip = {s1 = p.s ++ ip.s ! RSubj; s2 = p.s ++ ip.s ! RSubj} ;
|
||||
|
||||
AdvIP ip adv = {
|
||||
s = \\c => ip.s ! c ++ adv.s ;
|
||||
@@ -38,8 +38,8 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
|
||||
_ => NF idet.n Indef
|
||||
}
|
||||
in idet.s ! gennum cn.g idet.n ++
|
||||
num.s ! dgenderSpecies cn.g Indef Nom ++
|
||||
ord.s ! aform (gennum cn.g num.n) Indef Nom ++
|
||||
num.s ! dgenderSpecies cn.g Indef RSubj ++
|
||||
ord.s ! aform (gennum cn.g num.n) Indef RSubj ++
|
||||
cn.s ! nf ;
|
||||
gn = gennum cn.g idet.n
|
||||
} ;
|
||||
|
||||
Reference in New Issue
Block a user