GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-06-29 04:46:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Pes) Fix bug in DetQuant: "a one N"

Browse Source
This commit is contained in:
Inari Listenmaa
2019-03-20 16:01:55 +01:00
parent 8452076636
commit 24ff11c63d
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/persian/NounPes.gf
+19 -9
View File
@@ -41,17 +41,27 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
s = \\ez => np.s ! Ezafe ++ adv.s
} ;
DetQuantOrd quant num ord = {
s = quant.s ! num.n ! NotCmpd ++ num.s ++ ord.s ;
sp = quant.s ! num.n ! IsCmpd ++ num.s ++ ord.s ; -- only matters for PossPron
DetQuantOrd quant num ord =
let cs : CmpdStatus => Str = case <num.isNum,num.n,quant.isDef> of {
<True,Sg,False> => \\_ => num.s ++ ord.s ;
_ => \\c => quant.s ! num.n ! c ++ num.s ++ ord.s} ;
in {
s = cs ! NotCmpd ;
sp = cs ! IsCmpd ; -- only matters for PossPron
isNum = orB num.isNum ord.isNum ;
mod = quant.mod ;
n = num.n
} ;
DetQuant quant num = {
s = quant.s ! num.n ! NotCmpd ++ num.s ;
sp = quant.s ! num.n ! IsCmpd ++ num.s ; -- only matters for PossPron
DetQuant quant num =
let cs : CmpdStatus => Str = case <num.isNum,num.n,quant.isDef> of {
<True,Sg,False> => \\_ => num.s ;
_ => \\c => quant.s ! num.n ! c ++ num.s } ;
in {
s = cs ! NotCmpd ;
sp = cs ! IsCmpd ; -- only matters for PossPron
isNum = num.isNum;
mod = quant.mod ;
n = num.n
@@ -65,7 +75,7 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
relpron = Ance -- TODO check if this works for all Dets
} ;
PossPron p = {
PossPron p = DefArt ** {
s = \\_ => table {
NotCmpd => BIND ++ p.ps ;
IsCmpd => p.s } ; -- is a compound
@@ -87,8 +97,8 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
OrdSuperl a = {s = a.s ! Bare ++ taryn; n = Sg ; isNum=False ; isPre = True} ; -- check the form of adjective
DefArt = {s = \\_,_ => [] ; mod = Bare} ;
IndefArt = {s = table {Sg => \\_ => IndefArticle ; Pl => \\_ => []} ; mod = Bare} ;
DefArt = makeQuant [] [] ;
IndefArt = makeQuant IndefArticle [] ** {isDef = False} ;
MassNP cn = emptyNP ** cn ** {
s = \\m => cn.s ! Sg ! m ++ cn.compl ! Sg ;