From 143a9e9686785691e4d76a26559aaa81b3798529 Mon Sep 17 00:00:00 2001 From: David Bamutura Date: Mon, 20 May 2019 03:12:04 +0200 Subject: [PATCH] =Implemented SlashVP in sentence --- src/rukiga/CatCgg.gf | 10 +++++++++- src/rukiga/SentenceCgg.gf | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/rukiga/CatCgg.gf b/src/rukiga/CatCgg.gf index 106bec4f..3cdc04b0 100755 --- a/src/rukiga/CatCgg.gf +++ b/src/rukiga/CatCgg.gf @@ -56,7 +56,15 @@ lincat s : Str ; --subject subjAgr : Res.Agreement; root : Str; - morphs : Res.VFormMini => Res.VerbMorphPos =>Str --; compl : Str -- after verb: complement, adverbs + pres: Str; + perf:Str; + morphs : Res.VFormMini => Res.VerbMorphPos =>Str; --; compl : Str -- after verb: complement, adverbs + ap:Str; + isRegular:Bool; + adv:Str; + containsAdv:Bool; + adV:Str; + containsAdV:Bool } ; Numeral = {s : Res.CardOrd=>Res.Agreement=> Str ; g : Res.Gender; n: Res.Number} ; Digits = {s : Res.CardOrd => Res.Agreement=>Str ; n : Res.Number ; tail : Px.DTail} ; diff --git a/src/rukiga/SentenceCgg.gf b/src/rukiga/SentenceCgg.gf index 7f937860..ef4308de 100755 --- a/src/rukiga/SentenceCgg.gf +++ b/src/rukiga/SentenceCgg.gf @@ -108,6 +108,20 @@ lin -- *Note* the set is not complete and lacks e.g. verbs with more than 2 places. --SlashVP : NP -> VPSlash -> ClSlash ; -- (whom) he sees + SlashVP np vpslash ={ + s = np.s ! Nom; + subjAgr = np.agr; + root = vpslash.s; + pres = vpslash.pres; + perf = vpslash.perf; + morphs = vpslash.morphs; + ap = vpslash.ap; + isRegular = vpslash.isRegular; + adv = vpslash.adv; + containsAdv = vpslash.containsAdv; + adV = vpslash.adV; + containsAdV = vpslash.containsAdV + }; --SlashVP np vpslash = --AdvSlash : ClSlash -> Adv -> ClSlash ; -- (whom) he sees today