QForm is more appropriate parameter than Species in IAdv and IP

This commit is contained in:
krasimir
2008-06-15 12:38:12 +00:00
parent 89bd8eeb74
commit 49eefbb2ad
6 changed files with 25 additions and 25 deletions

View File

@@ -522,13 +522,13 @@ resource ResBul = ParamX ** open Prelude in {
DNeutDef => addDef dve
} ;
mkIP : Str -> Str -> GenNum -> {s : Role => Species => Str ; gn : GenNum} =
mkIP : Str -> Str -> GenNum -> {s : Role => QForm => Str ; gn : GenNum} =
\koi,kogo,gn -> {
s = table {
RSubj => table {Indef=>koi; Def=>koi+"òî"} ;
RObj Acc => table {Indef=>kogo; Def=>kogo+"òî"} ;
RObj Dat => table {Indef=>"íà" ++ kogo; Def=>"íà" ++ kogo+"òî"} ;
RVoc => table {Indef=>koi; Def=>koi+"òî"}
RSubj => table QForm [koi; koi+"òî"] ;
RObj Acc => table QForm [kogo; kogo+"òî"] ;
RObj Dat => table QForm ["íà" ++ kogo; kogo+"òî"] ;
RVoc => table QForm [koi; koi+"òî"]
} ;
gn = gn
} ;
@@ -575,15 +575,15 @@ resource ResBul = ParamX ** open Prelude in {
Preposition : Type = {s : Str; c : Case};
mkQuestion :
{s : Species => Str} -> Clause ->
{s : QForm => Str} -> Clause ->
{s : Tense => Anteriority => Polarity => QForm => Str} = \wh,cl ->
{
s = \\t,a,p =>
s = \\t,a,p,qform =>
let cls = cl.s ! t ! a ! p ;
in table {
QDir => wh.s ! Indef ++ cls ! Inv ;
QIndir => wh.s ! Def ++ cls ! Main
}
in wh.s ! qform ++ cls ! case qform of {
QDir => Inv ;
QIndir => Main
}
} ;
whichRP : GenNum => Str