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

Add comitative and elative modifiers of type NP -> CN -> CN; use shortPronoun in ma_Pron,sa_Pron etc

Browse Source
This commit is contained in:
Inari Listenmaa
2017-08-28 17:17:04 +02:00
parent 919d8c74cf
commit c0f3f43350
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/estonian/ExtraEst.gf
View File

@@ -9,7 +9,9 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
isNeg = False isNeg = False
} ; } ;
GenCN n1 n2 = {s = \\nf => n1.s ! NPCase Gen ++ n2.s ! nf} ; GenCN = caseCN Gen ; -- auton merkki
ComitCN = caseCN Comit ; -- puudega mets
ElatCN = caseCN Elat ; -- puust laud
GenIP ip = {s = \\_,_ => ip.s ! NPCase Gen} ; GenIP ip = {s = \\_,_ => ip.s ! NPCase Gen} ;
@@ -18,6 +20,9 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
a = RNoAg a = RNoAg
--- a = RAg (agrP3 num.n) --- a = RAg (agrP3 num.n)
} ; } ;
oper
caseCN : Case -> NP -> CN -> CN = \c,np,cn ->
lin CN { s = \\nf => np.s ! NPCase c ++ cn.s ! nf } ;
lincat lincat
VPI = {s : InfForm => Str} ; VPI = {s : InfForm => Str} ;
@@ -137,15 +142,13 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
isPron = False ; isNeg = False isPron = False ; isNeg = False
} ; } ;
vai_Conj = {s1 = [] ; s2 = "vai" ; n = Sg} ;
--The reflexive possessive "oma" --The reflexive possessive "oma"
--for "ta näeb oma koera" instead of *"tema koera" --for "ta näeb oma koera" instead of *"tema koera"
OmaPoss = {s,sp = \\_,_ => "oma" ; isDef,isNeg,isNum = False} ; OmaPoss = {s,sp = \\_,_ => "oma" ; isDef,isNeg,isNum = False} ;
ma_Pron = mkPronoun "ma" "mu" "mind" Sg P1 ; ma_Pron = shortPronoun "ma" "mu" "mind" "minu" Sg P1 ;
sa_Pron = mkPronoun "sa" "su" "sind" Sg P2; sa_Pron = shortPronoun "sa" "su" "sind" "sinu" Sg P2;
ta_Pron = mkPronoun "ta" "ta" "teda" Sg P3 ; ta_Pron = shortPronoun "ta" "ta" "teda" "tema" Sg P3 ;
me_Pron = me_Pron =
{s = table { {s = table {
NPCase Nom => "me" ; NPCase Nom => "me" ;

4
src/estonian/ExtraEstAbs.gf
View File

@@ -8,6 +8,8 @@ abstract ExtraEstAbs = Extra [
flags coding=utf8 ; flags coding=utf8 ;
fun fun
GenCN : NP -> CN -> CN ; -- auton merkki GenCN : NP -> CN -> CN ; -- auton merkki
ComitCN : NP -> CN -> CN ; -- põlenud puudega mets
ElatCN : NP -> CN -> CN ; -- puust laud
AdvExistNP : Adv -> NP -> Cl ; -- kuvassa olemme me AdvExistNP : Adv -> NP -> Cl ; -- kuvassa olemme me
AdvPredNP : Adv -> V -> NP -> Cl ; -- kuvassa hymyilee Veikko AdvPredNP : Adv -> V -> NP -> Cl ; -- kuvassa hymyilee Veikko
@@ -22,8 +24,6 @@ abstract ExtraEstAbs = Extra [
PartCN : CN -> NP ; -- olutta PartCN : CN -> NP ; -- olutta
vai_Conj : Conj ; -- minä vai sinä? ("or" in question)
--Short forms of the pronouns --Short forms of the pronouns
ma_Pron : Pron ; ma_Pron : Pron ;
sa_Pron : Pron ; sa_Pron : Pron ;