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

Merge pull request #409 from inariksit/misc-estonian

Browse Source 
Minor fixes/cleanup in Estonian
This commit is contained in:
Inari Listenmaa
2022-07-26 09:28:27 +02:00
committed by GitHub
parent df93a21d79 afe76e1fe0
commit 43fbf928fd
17 changed files with 103 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/estonian/CatEst.gf
View File

@@ -13,7 +13,7 @@ concrete CatEst of Cat = CommonX ** open HjkEst, ResEst, Prelude in {
-- Sentence -- Sentence
Cl = {s : ResEst.Tense => Anteriority => Polarity => SType => Str} ; Cl = {s : ResEst.Tense => Anteriority => Polarity => Str} ;
ClSlash = {s : ResEst.Tense => Anteriority => Polarity => Str ; c2 : Compl} ; ClSlash = {s : ResEst.Tense => Anteriority => Polarity => Str ; c2 : Compl} ;
Imp = {s : Polarity => Agr => Str} ; Imp = {s : Polarity => Agr => Str} ;

32
src/estonian/ConjunctionEst.gf
View File

@@ -7,7 +7,9 @@ concrete ConjunctionEst of Conjunction =
ConjS = conjunctDistrSS ; ConjS = conjunctDistrSS ;
ConjAdv = conjunctDistrSS ; ConjAdv,
ConjAdV,
ConjIAdv = conjunctDistrSS ;
ConjCN conj ss = conjunctDistrTable NForm conj ss ** ss ; ConjCN conj ss = conjunctDistrTable NForm conj ss ** ss ;
@@ -27,8 +29,8 @@ concrete ConjunctionEst of Conjunction =
BaseS = twoSS ; BaseS = twoSS ;
ConsS = consrSS comma ; ConsS = consrSS comma ;
BaseAdv = twoSS ; BaseAdv, BaseAdV, BaseIAdv = twoSS ;
ConsAdv = consrSS comma ; ConsAdv, ConsAdV, ConsIAdv = consrSS comma ;
BaseCN x y = twoTable NForm (mergeCN x) y ** {postmod = y.postmod} ; BaseCN x y = twoTable NForm (mergeCN x) y ** {postmod = y.postmod} ;
ConsCN x xs = consrTable NForm comma (mergeCN x) xs ** xs ; ConsCN x xs = consrTable NForm comma (mergeCN x) xs ** xs ;
BaseNP x y = twoTable NPForm (mergeNP x) y ** {a = conjAgr x.a y.a ; postmod = y.postmod} ; BaseNP x y = twoTable NPForm (mergeNP x) y ** {a = conjAgr x.a y.a ; postmod = y.postmod} ;
@@ -41,26 +43,29 @@ concrete ConjunctionEst of Conjunction =
lincat lincat
[S] = {s1,s2 : Str} ; [S] = {s1,s2 : Str} ;
[Adv] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ;
[AdV] = {s1,s2 : Str} ;
[IAdv] = {s1,s2 : Str} ;
[CN] = {s1,s2 : NForm => Str ; postmod : Str} ; [CN] = {s1,s2 : NForm => Str ; postmod : Str} ;
[NP] = {s1,s2 : NPForm => Str ; a : Agr ; postmod : Str} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr ; postmod : Str} ;
[AP] = {s1,s2 : {s : Bool => NForm => Str ; infl : Infl }} ; [AP] = LinListAP ;
[RS] = {s1,s2 : Agr => Str ; c : NPForm} ; [RS] = {s1,s2 : Agr => Str ; c : NPForm} ;
oper oper
LinListAP : Type = {s1,s2 : {s : Bool => NForm => Str ; infl : Infl}} ;
--Modified from prelude/Coordination.gf generic functions --Modified from prelude/Coordination.gf generic functions
twoTableAdj : (_,_ : AP) -> [AP] = \x,y -> twoTableAdj : (_,_ : ResEst.APhrase) -> LinListAP = \x,y -> {
lin ListAP {
s1 = x ; s1 = x ;
s2 = y s2 = y
} ; } ;
consrTableAdj : Str -> APhrase -> [AP] -> [AP] = \c,x,xs -> consrTableAdj : Str -> ResEst.APhrase -> LinListAP -> LinListAP = \c,x,xs ->
let let
ap1 = xs.s1 ; ap1 = xs.s1 ;
ap2 = xs.s2 ap2 = xs.s2
in in {
lin ListAP {s1 = 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)> =>
@@ -74,16 +79,15 @@ concrete ConjunctionEst of Conjunction =
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 } ;
s2 = x ; s2 = x ;
} ; } ;
conjunctDistrTableAdj : ConjunctionDistr -> [AP] -> AP = \or,xs -> conjunctDistrTableAdj : ConjunctionDistr -> LinListAP -> APhrase = \or,xs ->
let let
ap1 = xs.s1 ; ap1 = xs.s1 ;
ap2 = xs.s2 ; ap2 = xs.s2 ;
in in {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)> =>

13
src/estonian/ConstructionEst.gf
View File

@@ -16,12 +16,12 @@ lin
let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N))) let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N)))
in mkVP (mkAP n_years_AdA L.old_A) ; in mkVP (mkAP n_years_AdA L.old_A) ;
have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ; have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) <lin NP y : NP> ;
married_Cl x y = mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (ParadigmsEst.mkAdv "abielus") ; married_Cl x y = mkCl (mkNP and_Conj <lin NP x : NP> <lin NP y : NP>) (ParadigmsEst.mkAdv "abielus") ;
what_name_QCl x = mkQCl (mkIComp whatSg_IP) (mkNP (E.GenNP x) L.name_N) ; what_name_QCl x = mkQCl (mkIComp whatSg_IP) (mkNP (E.GenNP x) L.name_N) ;
how_old_QCl x = mkQCl (E.ICompAP (mkAP L.old_A)) (lin NP x) ; how_old_QCl x = mkQCl (E.ICompAP (mkAP L.old_A)) <lin NP x : NP> ;
how_far_QCl x = mkQCl (E.IAdvAdv L.far_Adv) (lin NP x) ; how_far_QCl x = mkQCl (E.IAdvAdv L.far_Adv) <lin NP x : NP> ;
-- some more things -- some more things
weather_adjCl ap = mkCl (mkVP (lin AP ap)) ; weather_adjCl ap = mkCl (mkVP (lin AP ap)) ;
@@ -29,7 +29,10 @@ lin
is_right_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "õigus"))) ; is_right_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "õigus"))) ;
is_wrong_VP = mkVP (ParadigmsEst.mkV "eksima") ; is_wrong_VP = mkVP (ParadigmsEst.mkV "eksima") ;
n_units_AP card cn a = mkAP (lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> (lin CN cn))))) (lin A a) ; n_units_AP card cn a =
let x_inches_NP : NP = mkNP <lin Card card : Card> <lin CN cn : CN> ;
x_inches_AdA : AdA = lin AdA (mkUtt x_inches_NP) ;
in mkAP x_inches_AdA <lin A a : A> ;
{- {-
glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "klaas") (casePrep partitive))) (lin NP np) | mkCN (lin N2 (mkN2 (mkN "klaasitäis") (casePrep partitive))) (lin NP np) ; glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "klaas") (casePrep partitive))) (lin NP np) | mkCN (lin N2 (mkN2 (mkN "klaasitäis") (casePrep partitive))) (lin NP np) ;

31
src/estonian/DocumentationEstFunctor.gf
View File

@@ -23,7 +23,7 @@ lincat
oper oper
heading : N -> Str = \n -> (nounHeading n).s ; heading : N -> Str = \n -> (nounHeading n).s ;
caseplus2nf : N -> ResEst.Number -> CasePlus -> Str = \noun,num,cas -> caseplus2nf : ResEst.Noun -> ResEst.Number -> CasePlus -> Str = \noun,num,cas ->
noun.s ! NCase num cas.c ++ cas.suf ; noun.s ! NCase num cas.c ++ cas.suf ;
caseplus2af : (AForm => Str) -> ResEst.Number -> CasePlus -> Str = \adj,num,cas -> caseplus2af : (AForm => Str) -> ResEst.Number -> CasePlus -> Str = \adj,num,cas ->
@@ -65,77 +65,77 @@ lin
InflectionV v = { InflectionV v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v)) ; paragraph (verbExample (S.mkCl S.she_NP <lin V v : V>)) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV2 v = { InflectionV2 v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.something_NP)) ; paragraph (verbExample (S.mkCl S.she_NP <lin V2 v : V2> S.something_NP)) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV3 v = { InflectionV3 v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.something_NP S.something_NP)) ; paragraph (verbExample (S.mkCl S.she_NP <lin V3 v : V3> S.something_NP S.something_NP)) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV2V v = { InflectionV2V v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.we_NP (S.mkVP (L.sleep_V)))) ; paragraph (verbExample (S.mkCl S.she_NP <lin V2V v : V2V> S.we_NP (S.mkVP (L.sleep_V)))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV2S v = { InflectionV2S v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.we_NP (lin S (ss "...")))) ; paragraph (verbExample (S.mkCl S.she_NP <lin V2S v : V2S> S.we_NP (lin S (ss "...")))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV2Q v = { InflectionV2Q v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.we_NP (lin QS (ss "...")))) ; paragraph (verbExample (S.mkCl S.she_NP <lin V2Q v : V2Q> S.we_NP (lin QS (ss "...")))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionV2A v = { InflectionV2A v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v S.we_NP L.beautiful_A)) ; paragraph (verbExample (S.mkCl S.she_NP <lin V2A v : V2A> S.we_NP L.beautiful_A)) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionVV v = { InflectionVV v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v (S.mkVP (L.sleep_V)))) ; paragraph (verbExample (S.mkCl S.she_NP <lin VV v : VV> (S.mkVP (L.sleep_V)))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionVS v = { InflectionVS v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v (lin S (ss "...")))) ; paragraph (verbExample (S.mkCl S.she_NP <lin VS v : VS> (lin S (ss "...")))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionVQ v = { InflectionVQ v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v (lin QS (ss "...")))) ; paragraph (verbExample (S.mkCl S.she_NP <lin VQ v : VQ> (lin QS (ss "...")))) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
InflectionVA v = { InflectionVA v = {
t = "v" ; t = "v" ;
s1 = heading1 (heading verb_Category) ++ s1 = heading1 (heading verb_Category) ++
paragraph (verbExample (S.mkCl S.she_NP v L.beautiful_A)) ; paragraph (verbExample (S.mkCl S.she_NP <lin VA v : VA> L.beautiful_A)) ;
s2 = inflVerb v s2 = inflVerb v
} ; } ;
@@ -143,16 +143,15 @@ oper
verbExample : CatEst.Cl -> Str = \cl -> (S.mkUtt cl).s ; verbExample : CatEst.Cl -> Str = \cl -> (S.mkUtt cl).s ;
{- {-
-} --# notpresent -} --# notpresent
inflVerb : CatEst.V -> Str = \verb -> inflVerb : ResEst.Verb -> Str = \verb ->
let let
--verb = sverb2verbSep verb0 ;
vfin : ResEst.VForm -> Str = \f -> vfin : ResEst.VForm -> Str = \f ->
verb.s ! f ; verb.s ! f ;
vinf : ResEst.InfForms -> Str = \if -> vinf : ResEst.InfForms -> Str = \if ->
applyInfFormsV if verb.s ; applyInfFormsV if verb.s ;
nounNounHeading : Parameter -> Parameter -> Str = \n1,n2 -> nounNounHeading : Parameter -> Parameter -> Str = \n1,n2 ->
(S.mkUtt (G.PossNP (S.mkCN n1) (S.mkNP n2))).s ; (S.mkUtt (G.PossNP (S.mkCN <lin N n1 : N>) (S.mkNP <lin N n2 : N>))).s ;
in in
heading3 (nounNounHeading present_Parameter indicative_Parameter) ++ heading3 (nounNounHeading present_Parameter indicative_Parameter) ++
frameTable ( frameTable (
@@ -254,7 +253,7 @@ oper
td (vfin (PastPart Pass ))) td (vfin (PastPart Pass )))
) ; --} ) ; --}
inflNoun : (Number -> CasePlus -> Str) -> Str = \nouns -> inflNoun : (ResEst.Number -> CasePlus -> Str) -> Str = \nouns ->
frameTable ( frameTable (
tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++ tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++
tr (th (heading nominative_Parameter) ++ td (nouns Sg Nominative) ++ td (nouns Pl Nominative)) ++ tr (th (heading nominative_Parameter) ++ td (nouns Sg Nominative) ++ td (nouns Pl Nominative)) ++

4
src/estonian/ExtendEst.gf
View File

@@ -260,12 +260,12 @@ concrete ExtendEst of Extend =
-- : NP -> VS -> Utt -> Cl ; -- "I am here", she said -- : NP -> VS -> Utt -> Cl ; -- "I am here", she said
FrontComplDirectVS np vs utt = FrontComplDirectVS np vs utt =
let cl : Cl = PredVP np (UseV vs) ; let cl : Cl = PredVP np (UseV vs) ;
in cl ** {s = \\t,a,p,o => utt.s ++ bindComma ++ cl.s ! t ! a ! p ! o} ; in cl ** {s = \\t,a,p => utt.s ++ bindComma ++ cl.s ! t ! a ! p} ;
-- : NP -> VQ -> Utt -> Cl ; -- "where", she asked -- : NP -> VQ -> Utt -> Cl ; -- "where", she asked
FrontComplDirectVQ np vq utt = FrontComplDirectVQ np vq utt =
let cl : Cl = PredVP np (UseV vq) ; let cl : Cl = PredVP np (UseV vq) ;
in cl ** {s = \\t,a,p,o => utt.s ++ bindComma ++ cl.s ! t ! a ! p ! o} ; in cl ** {s = \\t,a,p => utt.s ++ bindComma ++ cl.s ! t ! a ! p} ;
--------------------------------- ---------------------------------

28
src/estonian/ExtraEst.gf
View File

@@ -23,7 +23,7 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
--- a = RAg (agrP3 num.n) --- a = RAg (agrP3 num.n)
} ; } ;
oper oper
caseCN : CasePlus -> NP -> CN -> CN = \c,np,cn -> cn ** { caseCN : CasePlus -> NPhrase -> CNoun -> CNoun = \c,np,cn -> cn ** {
s = \\nf => appCompl True Pos (P.casePrep c) np ++ cn.s ! nf s = \\nf => appCompl True Pos (P.casePrep c) np ++ cn.s ! nf
} ; } ;
@@ -38,7 +38,7 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
linVPI : InfForms -> LinVPI -> Str = \inf,vpi -> vpi.s ! inf.stem ; linVPI : InfForms -> LinVPI -> Str = \inf,vpi -> vpi.s ! inf.stem ;
-- Version that uses InfStem -- Version that uses InfStem
infVPIF : NPForm -> Polarity -> Agr -> VP -> InfStem -> Str = \sc,pol,agr,vp,if -> infVPIF : NPForm -> Polarity -> Agr -> ResEst.VP -> InfStem -> Str = \sc,pol,agr,vp,if ->
infVPAnt Simul sc pol agr vp {stem=if ; suf="a"} ; infVPAnt Simul sc pol agr vp {stem=if ; suf="a"} ;
lin lin
@@ -135,7 +135,7 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
(\\_,b,_ => linNP (NPCase Nom) np) (\\_,b,_ => linNP (NPCase Nom) np)
(predV (verbOlema ** {sc = NPCase Nom}))) ; (predV (verbOlema ** {sc = NPCase Nom}))) ;
in in
cl.s ! t ! ant ! bo ! SDecl ; cl.s ! t ! ant ! bo ;
c = NPCase Nom c = NPCase Nom
} ; } ;
@@ -144,18 +144,20 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
(\\_,b,_ => linNP (NPCase Nom) np) (predV v)) ; (\\_,b,_ => linNP (NPCase Nom) np) (predV v)) ;
ICompExistNP adv np = ICompExistNP adv np =
let cl = mkClause (\_ -> adv.s ! np.a) np.a (insertObj let subj : Polarity -> Str = \_ -> adv.s ! np.a ;
(\\_,b,_ => linNP (NPCase Nom) np) (predV (verbOlema ** {sc = NPCase Nom}))) ; pred : ResEst.VP = insertObj
in { (\\_,b,_ => linNP (NPCase Nom) np)
s = \\t,a,p => cl.s ! t ! a ! p ! SDecl (predV (verbOlema ** {sc = NPCase Nom})) ;
} ; in mkClause subj np.a pred ;
IAdvPredNP iadv v np = IAdvPredNP iadv v np =
let cl = mkClause (\_ -> iadv.s) np.a (insertObj let subj : Polarity -> Str = \_ -> iadv.s ;
(\\_,b,_ => linNP v.sc np) (predV v)) ; pred : ResEst.VP = insertObj
in { (\\_,b,_ => linNP v.sc np)
s = \\t,a,p => cl.s ! t ! a ! p ! SDecl (predV v) ;
} ; in mkClause subj np.a pred ;
-- i_implicPron = mkPronoun [] "minun" "minua" "minuna" "minuun" Sg P1 ; -- i_implicPron = mkPronoun [] "minun" "minua" "minuna" "minuun" Sg P1 ;
whatPart_IP = emptyIP ** { whatPart_IP = emptyIP ** {

4
src/estonian/ExtraEstAbs.gf
View File

@@ -1,6 +1,6 @@
abstract ExtraEstAbs = Extra [ abstract ExtraEstAbs = Extra [
GenNP,GenIP,GenRP, GenNP,GenIP,GenRP,IP,IQuant,Num,CN,RP,
PassVPSlash, PassAgentVPSlash, PassVPSlash, PassAgentVPSlash, VPSlash,
VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI,
VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,ConjVPS,Tense,Temp,Pol,S, VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,ConjVPS,Tense,Temp,Pol,S,
VV,VP,Conj,NP,Quant,IAdv,IComp,ICompAP,IAdvAdv,Adv,AP, Pron, ProDrop] ** { VV,VP,Conj,NP,Quant,IAdv,IComp,ICompAP,IAdvAdv,Adv,AP, Pron, ProDrop] ** {

24
src/estonian/IdiomEst.gf
View File

@@ -5,23 +5,17 @@ concrete IdiomEst of Idiom = CatEst **
lin lin
ExistNP np = ExistNP np =
let let cas : Polarity -> NPForm = \p -> case p of {
cas : Polarity -> NPForm = \p -> case p of { Pos => NPCase Nom ; -- on olemas lammas
Pos => NPCase Nom ; -- on olemas lammas Neg => NPCase Part } ; -- ei ole olemas lammast
Neg => NPCase Part -- ei ole olemas lammast vp = insertObj (\\_,b,_ => "olemas" ++ linNP (cas b) np) (predV olla)
} ; in existClause noSubj (agrP3 Sg) vp ;
vp = insertObj (\\_,b,_ => "olemas" ++ linNP (cas b) np) (predV olla)
in
existClause noSubj (agrP3 Sg) vp ;
ExistIP ip = ExistIP ip =
let let cas : NPForm = NPCase Nom ; ---- also partitive in Extra
cas : NPForm = NPCase Nom ; ---- also partitive in Extra vp : MorphoEst.VP = insertObj (\\_,b,_ => "olemas") (predV olla) ;
vp = insertObj (\\_,b,_ => "olemas") (predV olla) ; subj : MorphoEst.NPhrase = ip ** {isPron = False ; a = agrP3 ip.n} ;
cl = existClause (subjForm (ip ** {isPron = False ; a = agrP3 ip.n}) cas) (agrP3 Sg) vp in existClause (subjForm subj cas) (agrP3 Sg) vp ;
in {
s = \\t,a,p => cl.s ! t ! a ! p ! SDecl
} ;
-- Notice the nominative in the cleft $NP$: "se on Matti josta Liisa pitää" -- Notice the nominative in the cleft $NP$: "se on Matti josta Liisa pitää"
-- Est: "see on Mati, kellest Liis lugu peab" -- Est: "see on Mati, kellest Liis lugu peab"

3
src/estonian/NounEst.gf
View File

@@ -216,8 +216,7 @@ concrete NounEst of Noun = CatEst ** open ResEst, HjkEst, MorphoEst, Prelude in
oper oper
numN : NForm -> Number = \nf -> case nf of { numN : NForm -> Number = \nf -> case nf of {
NCase n _ => n ; NCase n _ => n
_ => Sg ---
} ; } ;

2
src/estonian/NumeralEst.gf
View File

@@ -73,7 +73,7 @@ oper
} }
} ; } ;
nBIND : Number -> Str = \n -> case n of {Sg => [] ; _ => BIND} ; -- no BIND after silent 1 nBIND : MorphoEst.Number -> Str = \n -> case n of {Sg => [] ; _ => BIND} ; -- no BIND after silent 1
param param
NumPlace = NumIndep | NumAttr ; NumPlace = NumIndep | NumAttr ;

10
src/estonian/ParadigmsEst.gf
View File

@@ -617,9 +617,10 @@ oper
mkA : N -> A = \n -> noun2adjDeg n ** {infl = Regular} ; mkA : N -> A = \n -> noun2adjDeg n ** {infl = Regular} ;
mkA : N -> (parem,parim : Str) -> A = regAdjective ; mkA : N -> (parem,parim : Str) -> A = regAdjective ;
mkA : N -> (infl : Infl) -> A = \n,infl -> noun2adjDeg n ** {infl = infl} ; mkA : N -> (infl : Infl) -> A = \n,infl -> noun2adjDeg n ** {infl = infl} ;
-- TODO: temporary usage of regAdjective1
mkA : N -> (valmim,valmeim : Str) -> (infl : Infl) -> A = mkA : N -> (valmim,valmeim : Str) -> (infl : Infl) -> A =
\n,c,s,infl -> (regAdjective1 n c s) ** {infl = infl} ; \n,c,s,infl ->
let regA : A = regAdjective n c s
in regA ** {infl = infl} ;
} ; } ;
invA balti = lin A {s = \\_,_ => balti ; infl = Invariable} ; invA balti = lin A {s = \\_,_ => balti ; infl = Invariable} ;
@@ -644,11 +645,6 @@ oper
(noun2adjComp False (nForms2N (hjk_type_IVb_audit compar "a"))) (noun2adjComp False (nForms2N (hjk_type_IVb_audit compar "a")))
(noun2adjComp False (nForms2N (hjk_type_IVb_audit superl "a"))) ; (noun2adjComp False (nForms2N (hjk_type_IVb_audit superl "a"))) ;
-- TODO: this is a temporary hack that converts A ~> Adjective.
-- The caller needs this otherwise ** fails.
-- This should be cleaned up but I don't know how (K).
regAdjective1 : Noun -> Str -> Str -> Adjective = regAdjective ;
-- Adjectives whose comparison forms can be derived from the sg gen. -- Adjectives whose comparison forms can be derived from the sg gen.
-- In case of comparative this fails only for 70 adjectives. -- In case of comparative this fails only for 70 adjectives.
-- Superlative is more complex, and does not always exist, -- Superlative is more complex, and does not always exist,

13
src/estonian/QuestionEst.gf
View File

@@ -5,15 +5,10 @@ concrete QuestionEst of Question = CatEst ** open ResEst, Prelude in {
lin lin
QuestCl cl = { QuestCl cl = {
s = \\t,a,p => cl.s ! t ! a ! p ! SQuest s = \\t,a,p => "kas" ++ cl.s ! t ! a ! p
} ; } ;
QuestVP ip vp = QuestVP ip vp = mkClause (subjForm (ip ** {isPron = False ; a = agrP3 ip.n}) vp.sc) (agrP3 ip.n) vp ;
let
cl = mkClause (subjForm (ip ** {isPron = False ; a = agrP3 ip.n}) vp.sc) (agrP3 ip.n) vp
in {
s = \\t,a,p => cl.s ! t ! a ! p ! SDecl
} ;
QuestSlash ip slash = { QuestSlash ip slash = {
s = \\t,a,p => s = \\t,a,p =>
@@ -25,7 +20,7 @@ concrete QuestionEst of Question = CatEst ** open ResEst, Prelude in {
} ; } ;
QuestIAdv iadv cl = { QuestIAdv iadv cl = {
s = \\t,a,p => iadv.s ++ cl.s ! t ! a ! p ! SDecl s = \\t,a,p => iadv.s ++ cl.s ! t ! a ! p
} ; } ;
QuestIComp icomp np = { QuestIComp icomp np = {
@@ -34,7 +29,7 @@ concrete QuestionEst of Question = CatEst ** open ResEst, Prelude in {
vp = predV (verbOlema ** {sc = NPCase Nom}) ; vp = predV (verbOlema ** {sc = NPCase Nom}) ;
cl = mkClause (subjForm np vp.sc) np.a vp ; cl = mkClause (subjForm np vp.sc) np.a vp ;
in in
icomp.s ! np.a ++ cl.s ! t ! a ! p ! SDecl icomp.s ! np.a ++ cl.s ! t ! a ! p
} ; } ;
PrepIP p ip = {s = PrepIP p ip = {s =

4
src/estonian/RelativeEst.gf
View File

@@ -5,7 +5,7 @@ concrete RelativeEst of Relative = CatEst ** open Prelude, ResEst, MorphoEst in
lin lin
RelCl cl = { RelCl cl = {
s = \\t,a,p,_ => "nii" ++ "et" ++ cl.s ! t ! a ! p ! SDecl ; s = \\t,a,p,_ => "nii" ++ "et" ++ cl.s ! t ! a ! p ;
---- sellainen ---- sellainen
c = NPCase Nom c = NPCase Nom
} ; } ;
@@ -23,7 +23,7 @@ concrete RelativeEst of Relative = CatEst ** open Prelude, ResEst, MorphoEst in
vp.sc) vp.sc)
agr vp agr vp
in in
cl.s ! t ! ant ! b ! SDecl ; cl.s ! t ! ant ! b ;
c = NPCase Nom c = NPCase Nom
} ; } ;

41
src/estonian/ResEst.gf
View File

@@ -180,8 +180,6 @@ oper
glue (vf ! Inf if.stem) if.suf ; glue (vf ! Inf if.stem) if.suf ;
param param
SType = SDecl | SQuest | SInv ;
--2 For $Relative$ --2 For $Relative$
RAgr = RNoAg | RAg Agr ; RAgr = RNoAg | RAg Agr ;
@@ -365,51 +363,34 @@ oper
-- For $Sentence$. -- For $Sentence$.
Clause : Type = { Clause : Type = {
s : Tense => Anteriority => Polarity => SType => Str s : Tense => Anteriority => Polarity => Str
} ; } ;
ClausePlus : Type = { ClausePlus : Type = {
s : Tense => Anteriority => Polarity => {subj,fin,inf,compl,adv,p,ext : Str} s : Tense => Anteriority => Polarity => {subj,fin,inf,compl,adv,p,ext : Str}
} ; } ;
-- The Finnish version of SQuest featured a word order change and
-- the question particle "ko". The Estonian version just prefixes the
-- declarative sentence with the yes/no-queryword "kas".
-- SQuest: "kas" + SDecl
-- It would be also correct to use the Finnish structure, just without the ko-particle.
-- Inari: added a third SType, SInv.
-- Not sure if SInv is needed, but keeping it for possible future use.
-- There's need for an inverted word order with auxiliary verbs; infVP handles that. ComplVV calls infVP, which inverts the word order for the complement VP, and puts it into the resulting VP's `compl' field.
-- SInv made by mkClause would be for cases where you just need to construct an inverted word order, and then call it from some other place; application grammar (TODO: api oper for SType) or ExtraEst.
mkClause : (Polarity -> Str) -> Agr -> VP -> Clause = \sub,agr,vp -> mkClause : (Polarity -> Str) -> Agr -> VP -> Clause = \sub,agr,vp ->
{ s = \\t,a,b => { s = \\t,a,b =>
let let
c = (mkClausePlus sub agr vp).s ! t ! a ! b ; c = (mkClausePlus sub agr vp).s ! t ! a ! b ;
-- saan sinust aru 0
-- ma olen täna sinust aru saanud
declCl = c.subj ++ c.fin ++ c.adv ++ c.compl ++ c.p ++ c.inf ++ c.ext ;
-- [sind näha] 0 tahtnud
-- täna olen ma sinust aru saanud
invCl = c.adv ++ c.fin ++ c.subj ++ c.compl ++ c.p ++ c.inf ++ c.ext
in in
table { -- saan sinust aru
SDecl => declCl ; -- ma olen täna sinust aru saanud
SQuest => "kas" ++ declCl ; c.subj ++ c.fin ++ c.adv ++ c.compl ++ c.p ++ c.inf ++ c.ext ;
SInv => invCl } ;
}
} ;
existClause : (Polarity -> Str) -> Agr -> VP -> Clause = \sub,agr,vp -> existClause : (Polarity -> Str) -> Agr -> VP -> Clause = \sub,agr,vp ->
{ s = \\t,a,b => { s = \\t,a,b =>
let let
c = (mkClausePlus sub agr vp).s ! t ! a ! b ; c = (mkClausePlus sub agr vp).s ! t ! a ! b ;
-- (mis) on olnud olemas (lammas)
declCl = c.subj ++ c.fin ++ c.inf ++ c.compl ;
in in
table { -- c.subj ++ c.fin ++ c.inf ++ c.compl ;
SQuest => "kas" ++ declCl ; -- saan sinust aru
_ => declCl -- ma olen täna sinust aru saanud
} -- (mis) on olnud täna olemas …
c.subj ++ c.fin ++ c.inf ++ c.adv ++ c.p ++ c.compl ++ c.ext ;
} ; } ;
mkClausePlus : (Polarity -> Str) -> Agr -> VP -> ClausePlus = mkClausePlus : (Polarity -> Str) -> Agr -> VP -> ClausePlus =

22
src/estonian/SentenceEst.gf
View File

@@ -19,8 +19,7 @@ concrete SentenceEst of Sentence = CatEst ** open Prelude, ResEst in {
-- The object case is formed at the use site of $c2$, in $Relative$ and $Question$. -- The object case is formed at the use site of $c2$, in $Relative$ and $Question$.
SlashVP np vp = { SlashVP np vp = mkClause (subjForm np vp.sc) np.a vp ** {
s = \\t,a,p => (mkClause (subjForm np vp.sc) np.a vp).s ! t ! a ! p ! SDecl ;
c2 = vp.c2 c2 = vp.c2
} ; } ;
@@ -29,26 +28,23 @@ concrete SentenceEst of Sentence = CatEst ** open Prelude, ResEst in {
c2 = slash.c2 c2 = slash.c2
} ; } ;
SlashPrep cl prep = { SlashPrep cl prep = cl ** {
s = \\t,a,p => cl.s ! t ! a ! p ! SDecl ;
c2 = prep c2 = prep
} ; } ;
SlashVS np vs slash = { SlashVS np vs slash =
s = \\t,a,p => let cl : Clause =
(mkClause (subjForm np vs.sc) np.a mkClause
(insertExtrapos (etta_Conj ++ slash.s) (subjForm np vs.sc) np.a
(predV vs)) (insertExtrapos (etta_Conj ++ slash.s) (predV vs))
).s ! t ! a ! p ! SDecl ; in cl ** {c2 = slash.c2} ;
c2 = slash.c2
} ;
EmbedS s = {s = etta_Conj ++ s.s} ; EmbedS s = {s = etta_Conj ++ s.s} ;
EmbedQS qs = {s = qs.s} ; EmbedQS qs = {s = qs.s} ;
EmbedVP vp = {s = infVP (NPCase Nom) Pos (agrP3 Sg) vp InfDa} ; --- case,pol,agr,infform EmbedVP vp = {s = infVP (NPCase Nom) Pos (agrP3 Sg) vp InfDa} ; --- case,pol,agr,infform
UseCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! SDecl} ; UseCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p} ;
UseQCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p} ; UseQCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p} ;
UseRCl t p cl = { UseRCl t p cl = {
s = \\r => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! r ; s = \\r => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! r ;

2
src/estonian/TerminologyEst.gf
View File

@@ -91,7 +91,7 @@ lin
nounHeading n = ss (n.s ! NCase Sg Nom) ; nounHeading n = ss (n.s ! NCase Sg Nom) ;
nounPluralHeading n = ss (n.s ! NCase Pl Nom) ; nounPluralHeading n = ss (n.s ! NCase Pl Nom) ;
formGF_N = mkN "vorm" ; formGr_N = mkN "vorm" ;
exampleGr_N = mkN "näide" ; exampleGr_N = mkN "näide" ;
} }

2
src/estonian/VerbEst.gf
View File

@@ -83,7 +83,7 @@ concrete VerbEst of Verb = CatEst ** open Prelude, ResEst in {
ReflVP v = insertObjPre (\\fin,b,agr => appCompl fin b v.c2 (reflPron agr)) v ; ReflVP v = insertObjPre (\\fin,b,agr => appCompl fin b v.c2 (reflPron agr)) v ;
PassV2 v = let vp : VP = passiveVP (predV v) in vp ** { PassV2 v = let vp : ResEst.VP = passiveVP (predV v) in vp ** {
sc = compl2subjcase v.c2 -- koer valitakse ; koerale räägitakse sc = compl2subjcase v.c2 -- koer valitakse ; koerale räägitakse
} ; } ;