GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Est) Minor cleanup+formatting

Browse Source
This commit is contained in:
Inari Listenmaa
2019-07-19 10:22:07 +03:00
parent 89217ee9cc
commit 54870ec678
1 changed files with 45 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/estonian/ConjunctionEst.gf
View File

@@ -16,11 +16,7 @@ concrete ConjunctionEst of Conjunction =
isPron = False isPron = False
} ; } ;
-- ConjAP conj ss = conjunctDistrTable2 Bool NForm conj ss ** { ConjAP conj ss = conjunctDistrTableAdj conj ss ;
ConjAP conj ss = conjunctDistrTableAdj conj ss ** {
infl = ss.s2.infl ; ---- was: True, which is of wrong type. AR 1/2/2014
lock_AP = <>
} ;
ConjRS conj ss = conjunctDistrTable Agr conj ss ** { ConjRS conj ss = conjunctDistrTable Agr conj ss ** {
c = ss.c c = ss.c
@@ -38,8 +34,6 @@ concrete ConjunctionEst of Conjunction =
ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ; ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ;
BaseAP x y = twoTableAdj x y ; BaseAP x y = twoTableAdj x y ;
ConsAP xs x = consrTableAdj comma x xs ; ConsAP xs x = consrTableAdj comma x xs ;
-- BaseAP x y = twoTable2 Bool NForm x y ;
-- ConsAP xs x = consrTable2 Bool NForm comma xs x ;
BaseRS x y = twoTable Agr x y ** {c = y.c} ; BaseRS x y = twoTable Agr x y ** {c = y.c} ;
ConsRS xs x = consrTable Agr comma xs x ** {c = xs.c} ; ConsRS xs x = consrTable Agr comma xs x ** {c = xs.c} ;
@@ -56,8 +50,7 @@ concrete ConjunctionEst of Conjunction =
twoTableAdj : (_,_ : AP) -> [AP] = \x,y -> twoTableAdj : (_,_ : AP) -> [AP] = \x,y ->
lin ListAP { lin ListAP {
s1 = x ; s1 = x ;
s2 = y ; s2 = y
lock_ListAP = <>
} ; } ;
consrTableAdj : Str -> [AP] -> {s : Bool => NForm => Str ; infl : Infl} -> [AP] = \c,xs,x -> consrTableAdj : Str -> [AP] -> {s : Bool => NForm => Str ; infl : Infl} -> [AP] = \c,xs,x ->
@@ -67,20 +60,19 @@ concrete ConjunctionEst of Conjunction =
in in
lin ListAP {s1 = lin ListAP {s1 =
{s = \\isMod,nf => {s = \\isMod,nf =>
case isMod of { case isMod of {
True => case <ap1.infl, ap2.infl> of { True => case <ap1.infl, ap2.infl> of {
<(Participle|Invariable),(Participle|Invariable)> => <(Participle|Invariable),(Participle|Invariable)> =>
ap1.s ! isMod ! (NCase Sg Nom) ++ c ++ ap2.s ! isMod ! (NCase Sg Nom) ; --valmis ja täis kassid ap1.s ! isMod ! (NCase Sg Nom) ++ c ++ ap2.s ! isMod ! (NCase Sg Nom) ; --valmis ja täis kassid
<(Participle|Invariable),Regular> => <(Participle|Invariable),Regular> =>
ap1.s ! isMod ! (NCase Sg Nom) ++ c++ ap2.s ! isMod ! nf ; --valmis ja suured kassid ap1.s ! isMod ! (NCase Sg Nom) ++ c++ ap2.s ! isMod ! nf ; --valmis ja suured kassid
<Regular,(Participle|Invariable)> => <Regular,(Participle|Invariable)> =>
ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! (NCase Sg Nom) ; --suured ja valmis kassid ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! (NCase Sg Nom) ; --suured ja valmis kassid
_ => ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! nf --suured ja mustad kassid _ => ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! nf --suured ja mustad kassid
} ; } ;
False => ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! nf --kassid on valmid ja suured False => ap1.s ! isMod ! nf ++ c ++ ap2.s ! isMod ! nf --kassid on valmid ja suured
} ; } ;
infl = Regular ; infl = Regular } ;
lock_AP = <> } ;
s2 = x ; s2 = x ;
lock_ListAP = <> lock_ListAP = <>
} ; } ;
@@ -93,22 +85,21 @@ concrete ConjunctionEst of Conjunction =
in in
lin AP {s = \\isMod,nf => lin AP {s = \\isMod,nf =>
case isMod of { case isMod of {
True => case <ap1.infl, ap2.infl> of { True => case <ap1.infl, ap2.infl> of {
<(Participle|Invariable),(Participle|Invariable)> => <(Participle|Invariable),(Participle|Invariable)> =>
or.s1 ++ ap1.s ! isMod ! (NCase Sg Nom) ++ or.s1 ++ ap1.s ! isMod ! (NCase Sg Nom) ++
or.s2 ++ ap2.s ! isMod ! (NCase Sg Nom) ; or.s2 ++ ap2.s ! isMod ! (NCase Sg Nom) ;
<(Participle|Invariable),Regular> => <(Participle|Invariable),Regular> =>
or.s1 ++ ap1.s ! isMod ! (NCase Sg Nom) ++ or.s1 ++ ap1.s ! isMod ! (NCase Sg Nom) ++
or.s2 ++ ap2.s ! isMod ! nf ; or.s2 ++ ap2.s ! isMod ! nf ;
<Regular,(Participle|Invariable)> => <Regular,(Participle|Invariable)> =>
or.s1 ++ ap1.s ! isMod ! nf ++ or.s1 ++ ap1.s ! isMod ! nf ++
or.s2 ++ ap2.s ! isMod ! (NCase Sg Nom) ; or.s2 ++ ap2.s ! isMod ! (NCase Sg Nom) ;
_ => or.s1 ++ ap1.s ! isMod ! nf ++ or.s2 ++ ap2.s ! isMod ! nf _ => or.s1 ++ ap1.s ! isMod ! nf ++ or.s2 ++ ap2.s ! isMod ! nf
} ; } ;
False => or.s1 ++ ap1.s ! isMod ! nf ++ or.s2 ++ ap2.s ! isMod ! nf False => or.s1 ++ ap1.s ! isMod ! nf ++ or.s2 ++ ap2.s ! isMod ! nf
} ; } ;
infl = Regular ; infl = Regular
lock_AP = <>
} ; } ;
} }