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

(Pes) Small cleanup and typofix

Browse Source
This commit is contained in:
Inari Listenmaa
2019-04-25 11:19:25 +02:00
parent 8c4c9bcf32
commit 0d5cd13aea
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/persian/CatPes.gf
View File

@@ -72,7 +72,7 @@ concrete CatPes of Cat = CommonX ** open ResPes, Prelude in {
-----b Conj = {s : Str ; n : Number} ; -----b Conj = {s : Str ; n : Number} ;
-----b DConj = {s1,s2 : Str ; n : Number} ; -----b DConj = {s1,s2 : Str ; n : Number} ;
Subj = {s : Str ; compl : VVForm} ; -- subjunctive or indicative Subj = {s : Str ; compl : VVForm} ; -- subjunctive or indicative
VS = ResPes.Verb ** {compl : VVForm} ; -- subjunctive or indicative VS = ResPes.Verb ** {compl : VVForm} ; -- subjunctive or indicative
Prep = Compl ; Prep = Compl ;
---- Open lexical classes, e.g. Lexicon ---- Open lexical classes, e.g. Lexicon
V, VQ = ResPes.Verb ; V, VQ = ResPes.Verb ;

2
src/persian/MorphoPes.gf
View File

@@ -316,7 +316,7 @@ oper
haveVerb : Verb = haveRegV ** {s = table { haveVerb : Verb = haveRegV ** {s = table {
ImpPrefix _ => [] ; ImpPrefix _ => [] ;
VAor Neg agr => imperfectSuffix agr (addN "دار") ; VAor Neg agr => imperfectSuffixD agr (addN "دار") ;
VSubj pol agr => haveRegV.s ! VPerf pol agr ; VSubj pol agr => haveRegV.s ! VPerf pol agr ;
vf => haveRegV.s ! vf } vf => haveRegV.s ! vf }
} where { haveRegV = mkVerb "داشتن" "دار" } ; } where { haveRegV = mkVerb "داشتن" "دار" } ;

7
src/persian/ParadigmsPes.gf
View File

@@ -124,7 +124,7 @@ oper
mkV3 = overload { mkV3 = overload {
mkV3 : Str -> V3 -- Predictable V3, را for direct object, no prepositions. mkV3 : Str -> V3 -- Predictable V3, را for direct object, no prepositions.
= \s -> lin V3 (regV s ** {c2 = prepOrRa "را" ; c3 = prepOrRa []}) ; = \s -> lin V3 (regV s ** {c2 = prepOrRa "را" ; c3 = noPrep}) ;
mkV3 : V -> (dir,indir : Str) -> V3 -- Takes a verb and two prepositions or را as strings (can be empty). mkV3 : V -> (dir,indir : Str) -> V3 -- Takes a verb and two prepositions or را as strings (can be empty).
= \v,p,q -> lin V3 (v ** {c2 = prepOrRa p ; c3 = prepOrRa q}) ; = \v,p,q -> lin V3 (v ** {c2 = prepOrRa p ; c3 = prepOrRa q}) ;
mkV3 : V -> (dir,indir : Prep) -> V3 -- Takes a verb and two prepositions mkV3 : V -> (dir,indir : Prep) -> V3 -- Takes a verb and two prepositions
@@ -140,9 +140,9 @@ oper
mkVA = overload { mkVA = overload {
mkVA : Str -> VA -- predictable verb with adjective complement mkVA : Str -> VA -- predictable verb with adjective complement
= \s -> lin VA (regV s ** {c2 = prepOrRa []}) ; = \s -> lin VA (regV s ** {c2 = noPrep}) ;
mkVA : V -> VA -- VA out of a verb mkVA : V -> VA -- VA out of a verb
= \v -> lin VA (v ** {c2 = prepOrRa []}) ; = \v -> lin VA (v ** {c2 = noPrep}) ;
mkVA : V -> Prep -> VA -- VA out of a verb and preposition mkVA : V -> Prep -> VA -- VA out of a verb and preposition
= \v,p -> lin VA (v ** {c2 = p}) ; = \v,p -> lin VA (v ** {c2 = p}) ;
} ; } ;
@@ -360,6 +360,7 @@ oper
"را" => {s = [] ; ra = "را" ; mod=Bare} ; "را" => {s = [] ; ra = "را" ; mod=Bare} ;
prep => {s = prep ; ra = []; mod=Bare} prep => {s = prep ; ra = []; mod=Bare}
} ; } ;
noPrep = prepOrRa [] ;
mkPost : Str -> Prep = \s -> lin Prep {s=[] ; ra=s ; mod=Bare} ; mkPost : Str -> Prep = \s -> lin Prep {s=[] ; ra=s ; mod=Bare} ;