GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-06-25 02:56:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solved some problems from todo

Browse Source
This commit is contained in:
Roman Suzi
2020-07-27 18:58:09 +03:00
parent 118240d38d
commit 1f1dec615b
11 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/russian/NounRus.gf
+51 -10
View File
@@ -9,7 +9,20 @@ lin
-- : Det -> CN -> NP ; -- the man
DetCN det cn =
let n = numSizeNumber det.size in {
s=\\cas => det.s ! cn.g ! cn.anim ! cas ++ cn.s ! numSizeNum cas det.size ! numSizeCase cas det.size;
s=case det.type of {
EmptyIndef => \\cas =>
let d=case (numSizeNum cas det.size ) of {Pl=>a_Pl_Det; _=>a_Det} in
d.s ! det.g ! Inanimate ! cas
++ det.s ! cn.g ! cn.anim ! cas
++ cn.s ! numSizeNum cas det.size ! numSizeCase cas det.size ;
EmptyDef => \\cas =>
let d=case (numSizeNum cas det.size ) of {Pl=>the_Pl_Det; _=>the_Det} in
d.s ! det.g ! Inanimate ! cas
++ det.s ! cn.g ! cn.anim ! cas
++ cn.s ! numSizeNum cas det.size ! numSizeCase cas det.size ;
_ => \\cas => det.s ! cn.g ! cn.anim ! cas
++ cn.s ! numSizeNum cas det.size ! numSizeCase cas det.size
} ;
pron=False ;
a=Ag (gennum det.g n) P3
} ;
@@ -42,7 +55,11 @@ lin
-- : Det -> NP ; -- these five
DetNP det = {
s=\\cas => det.s ! det.g ! Inanimate ! cas ;
s=case det.type of {
EmptyIndef => \\cas => a_Det.s ! det.g ! Inanimate ! cas ++ det.s ! det.g ! Inanimate ! cas ;
EmptyDef => \\cas => the_Det.s ! det.g ! Inanimate ! cas ++ det.s ! det.g ! Inanimate ! cas ;
_ => \\cas => det.s ! det.g ! Inanimate ! cas
} ;
pron=False ;
a=Ag (gennum det.g (numSizeNumber det.size)) P3
} ;
@@ -78,7 +95,8 @@ lin
-- : Quant -> Num -> Det ; -- these five
DetQuant quant num = {
s=\\g,a,cas => quant.s ! (gennum g (numSizeNumber num.size)) ! a ! cas ++ num.s ! g ! a ! cas ;
s=\\g,anim,cas => quant.s ! (gennum g (numSizeNumber num.size)) ! anim ! cas ++ num.s ! g ! anim ! cas ;
type=quant.type ;
g=quant.g ;
c=quant.c ;
size=num.size
@@ -89,6 +107,7 @@ lin
s=\\g,a,cas => num.s ! g ! a ! cas
++ quant.s ! (gennum g (numSizeNumber num.size)) ! a ! cas
++ (adjFormsAdjective ord).s ! gennum quant.g (numSizeNum cas num.size) ! Inanimate ! numSizeCase cas num.size ;
type=quant.type ;
g=quant.g ;
c=quant.c ;
size=num.size
@@ -109,7 +128,14 @@ lin
OrdSuperl a = long_superlative a ;
-- : Pron -> Quant ; -- my (house)
PossPron pron = {s=mkPronTable pron.poss ; short=\\a=>[] ; g=Neut; c=Nom; preferShort=PrefFull} ;
PossPron pron = {
s=mkPronTable pron.poss ;
type=NormalDet ;
short=\\a=>[] ;
g=Neut ;
c=Nom ;
preferShort=PrefFull
} ;
-- : AdN -> Card -> Card
AdNum adn card = card ** {
@@ -165,7 +191,7 @@ lin
CountNP det np = {
s=\\cas => det.s ! Neut ! Inanimate ! cas ++ selectCase np.s from2 ;
pron=False ;
a=np.a
a=numSizeGenAgr det.size Neut P3
} ;
---------------------------------------------------
@@ -176,16 +202,31 @@ lin
s=\\g,anim,cas => ap.s ! GSg g ! anim ! cas ++ dap.s ! g ! anim ! cas
} ;
-- DetDAP : Det -> DAP ; -- this (or that)
-- : Det -> DAP ; -- this (or that)
DetDAP det = det ;
---------------------------------------------------
-- Backwards compatibility
-- : Quant ; -- the (house), the (houses)
DefArt = adjFormsAdjective the_forms ** {preferShort=PrefFull ; g=Neut ; c=Nom} ;
DefArt = {
s=\\gn,anim,cas=>[] ;
type=EmptyDef ;
short=\\a=>[] ;
c=Nom ;
g=Neut ;
size=Num1 ;
preferShort=PrefFull
} ;
-- DefArt = adjFormsAdjective the_forms ** {preferShort=PrefFull ; g=Neut ; c=Nom} ;
-- : Quant ; -- a (house), (houses)
-- IndefArt = {s = \\gn,anim,cas=>[] ; short=\\a=>[] ; c=Nom; g = Neut; size = Num1 ; preferShort=PrefFull};
IndefArt = adjFormsAdjective a_forms ** {preferShort=PrefFull ; g=Neut ; c=Nom} ;
IndefArt = {
s=\\gn,anim,cas=>[] ;
type=EmptyIndef ;
short=\\a=>[] ;
c=Nom ;
g=Neut ;
size=Num1 ;
preferShort=PrefFull
} ;
}