mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-02 15:52:50 -06:00
QForm is more appropriate parameter than Species in IAdv and IP
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user