(Ara) Add inherent state field in IDet

This commit is contained in:
Inari Listenmaa
2018-11-16 15:02:59 +01:00
parent 9171a1b612
commit 9d59e59387
3 changed files with 12 additions and 5 deletions

View File

@@ -71,7 +71,7 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA
IdetCN idet cn = { IdetCN idet cn = {
s = \\isPred,g,s,c s = \\isPred,g,s,c
=> idet.s ! cn.g ! s ! c ++ => idet.s ! cn.g ! s ! c ++
cn2str cn idet.n Indef Gen ; --idaafa cn2str cn idet.n idet.d Gen ;
a = { pgn = agrP3 NoHum cn.g idet.n ; isPron = False } a = { pgn = agrP3 NoHum cn.g idet.n ; isPron = False }
} ; } ;
@@ -80,6 +80,7 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA
s = \\g,s,c => s = \\g,s,c =>
let gend = detGender g num.n -- gender flips with some numbers let gend = detGender g num.n -- gender flips with some numbers
in iquant.s ! s ! c ++ num.s ! gend ! s ! c ; in iquant.s ! s ! c ++ num.s ! gend ! s ! c ;
n = sizeToNumber num.n n = sizeToNumber num.n ;
d = Indef ---- TODO check
} ; } ;
} }

View File

@@ -1368,8 +1368,10 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
IDet : Type = { IDet : Type = {
s : Gender -- IdetCN needs to choose the gender of the CN s : Gender -- IdetCN needs to choose the gender of the CN
=> State => Case => Str ; => State -- Needs to be retained variable for IP; PrepIP chooses the state of IP
n : Number => Case => Str ;
n : Number ;
d : State -- in IdetCN, chooses the state of the CN
} ; } ;
IQuant : Type = { IQuant : Type = {

View File

@@ -40,7 +40,11 @@ concrete StructuralAra of Structural = CatAra **
-- here7to_Adv = ss ["تْ هري"] ; -- here7to_Adv = ss ["تْ هري"] ;
-- here7from_Adv = ss ["فرْم هري"] ; -- here7from_Adv = ss ["فرْم هري"] ;
how_IAdv = ss "كَيفَ" ; how_IAdv = ss "كَيفَ" ;
-- how8many_IDet = mkDet "كَمْ" Pl Const ; -- IL: check (was ["هْو مَني"]) ; how8many_IDet = {
s = \\g,s,c => "كَمْ عَدَد" + caseTbl ! c ;
n = Pl ; d = Def
} ; -- IL
-- if_Subj = ss "ِف" ; -- if_Subj = ss "ِف" ;
in8front_Prep = mkPrep "مُقَابِلَ" ; in8front_Prep = mkPrep "مُقَابِلَ" ;
i_Pron = ResAra.i_Pron ; i_Pron = ResAra.i_Pron ;