msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests 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

99
src/estonian/ConjunctionEst.gf
View File

@@ -1,4 +1,4 @@
concrete ConjunctionEst of Conjunction = concrete ConjunctionEst of Conjunction =
CatEst ** open ResEst, Coordination, Prelude in { CatEst ** open ResEst, Coordination, Prelude in {
flags optimize=all_subs ; coding=utf8; flags optimize=all_subs ; coding=utf8;
@@ -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} ;
@@ -48,67 +42,64 @@ concrete ConjunctionEst of Conjunction =
[Adv] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ;
[CN] = {s1,s2 : NForm => Str} ; [CN] = {s1,s2 : NForm => Str} ;
[NP] = {s1,s2 : NPForm => Str ; a : Agr} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr} ;
[AP] = {s1,s2 : {s : Bool => NForm => Str ; infl : Infl }} ; [AP] = {s1,s2 : {s : Bool => NForm => Str ; infl : Infl }} ;
[RS] = {s1,s2 : Agr => Str ; c : NPForm} ; [RS] = {s1,s2 : Agr => Str ; c : NPForm} ;
oper oper
--Modified from prelude/Coordination.gf generic functions --Modified from prelude/Coordination.gf generic functions
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 ->
let let
ap1 = xs.s1 ; ap1 = xs.s1 ;
ap2 = xs.s2 ap2 = xs.s2
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 = <>
} ; } ;
conjunctDistrTableAdj : ConjunctionDistr -> [AP] -> AP = \or,xs -> conjunctDistrTableAdj : ConjunctionDistr -> [AP] -> AP = \or,xs ->
let let
ap1 = xs.s1 ; ap1 = xs.s1 ;
ap2 = xs.s2 ; ap2 = xs.s2 ;
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 = <> } ;
} ;
} }