mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
(Pes) Remove unnecessary parameters from Imp
This commit is contained in:
@@ -18,7 +18,7 @@ concrete CatPes of Cat = CommonX ** open ResPes, Prelude in {
|
||||
vp : ResPes.TAnt => Polarity => Order => Str ;
|
||||
c2 : ResPes.Compl
|
||||
} ;
|
||||
Imp = {s : Polarity => ImpForm => Str} ;
|
||||
Imp = {s : Polarity => Number => Str} ;
|
||||
|
||||
---- Question
|
||||
QCl = {s : ResPes.TAnt => Polarity => Str} ;
|
||||
|
||||
@@ -3,9 +3,9 @@ concrete PhrasePes of Phrase = CatPes ** open Prelude, ResPes in {
|
||||
lin
|
||||
PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
|
||||
UttS s = {s = s.s ! Indic} ;
|
||||
UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg False} ;
|
||||
UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Pl False} ;
|
||||
UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg True} ;
|
||||
UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! Sg} ;
|
||||
UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ;
|
||||
UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ;
|
||||
|
||||
UttIP, --- Acc also
|
||||
UttQS,
|
||||
|
||||
@@ -11,8 +11,8 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in {
|
||||
|
||||
ImpVP vp = {
|
||||
s = \\pol,n =>
|
||||
let agr = Ag (numImp n) P2 ;
|
||||
vps = vp.prefix ++ vp.s ! VImp pol (numImp n)
|
||||
let agr = Ag n P2 ;
|
||||
vps = vp.prefix ++ vp.s ! VImp pol n
|
||||
in case vp.vvtype of {
|
||||
NoVV => vp.ad ++ vp.comp ! agr ++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vps ++ vp.embComp ;
|
||||
_ => vps ++ vp.ad ++ vp.comp ! agr ++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vp.embComp }
|
||||
|
||||
Reference in New Issue
Block a user