msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

fix the agreement for ConjCN,BaseCN & ConsCN

Browse Source
This commit is contained in:
Krasimir Angelov
2023-02-15 15:03:32 +01:00
parent 7b3b49400a
commit ef1d9a0cbc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scandinavian/ConjunctionScand.gf
View File

@@ -28,7 +28,7 @@ incomplete concrete ConjunctionScand of Conjunction =
ConjIAdv = conjunctDistrSS ; ConjIAdv = conjunctDistrSS ;
ConjCN co ns = conjunctDistrTable3 Number DetSpecies Case co ns ** ConjCN co ns = conjunctDistrTable3 Number DetSpecies Case co ns **
{g = neutrum ; isMod = False} ; ---- {g = ns.g ; isMod = ns.isMod} ;
ConjDet conj ss = let css = (conjunctDistrTable2 Bool NGender conj ss).s in { ConjDet conj ss = let css = (conjunctDistrTable2 Bool NGender conj ss).s in {
s,sp = css ; s,sp = css ;
@@ -57,8 +57,8 @@ incomplete concrete ConjunctionScand of Conjunction =
ConsRS xs x = consrTable2 Agr RCase comma xs x ** {c = xs.c} ; ConsRS xs x = consrTable2 Agr RCase comma xs x ** {c = xs.c} ;
BaseIAdv = twoSS ; BaseIAdv = twoSS ;
ConsIAdv = consrSS comma ; ConsIAdv = consrSS comma ;
BaseCN = twoTable3 Number DetSpecies Case ; BaseCN x y = twoTable3 Number DetSpecies Case x y ** {g = x.g; isMod=x.isMod} ;
ConsCN = consrTable3 Number DetSpecies Case comma ; ConsCN x xs = consrTable3 Number DetSpecies Case comma x xs ** {g = x.g; isMod=x.isMod} ;
BaseDAP x y = twoTable2 Bool NGender x y ** {n = y.n ; det = y.det} ; BaseDAP x y = twoTable2 Bool NGender x y ** {n = y.n ; det = y.det} ;
ConsDAP x xs = consrTable2 Bool NGender comma x xs ** {n = xs.n ; det = xs.det} ; ConsDAP x xs = consrTable2 Bool NGender comma x xs ** {n = xs.n ; det = xs.det} ;
@@ -70,7 +70,7 @@ incomplete concrete ConjunctionScand of Conjunction =
[NP] = {s1,s2 : NPForm => Str ; a : Agr} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr} ;
[AP] = {s1,s2 : AFormPos => Str ; isPre : Bool} ; [AP] = {s1,s2 : AFormPos => Str ; isPre : Bool} ;
[RS] = {s1,s2 : Agr => RCase => Str ; c : NPForm} ; [RS] = {s1,s2 : Agr => RCase => Str ; c : NPForm} ;
[CN] = {s1,s2 : Number => DetSpecies => Case => Str} ; --- g : NGender ; isMod : Bool} ; [CN] = {s1,s2 : Number => DetSpecies => Case => Str ; g : NGender ; isMod : Bool} ;
[DAP] = {s1,s2 : Bool => NGender => Str ; n : Number ; det : DetSpecies} ; [DAP] = {s1,s2 : Bool => NGender => Str ; n : Number ; det : DetSpecies} ;