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

(Pes) Rename N2's c to c2 for consistency

Browse Source
This commit is contained in:
Inari Listenmaa
2019-03-01 15:18:55 +01:00
parent 4fe2e38e9b
commit a51a31ca7f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/persian/CatPes.gf
View File

@@ -89,7 +89,7 @@ concrete CatPes of Cat = CommonX - [Adv] ** open ResPes, Prelude in {
N = ResPes.Noun ;
N2 = ResPes.Noun ** {c : Str ; compl : Str}; -- when N3 is made to N2, need to retain compl
N2 = ResPes.Noun ** {c2 : Str ; compl : Str}; -- when N3 is made to N2, need to retain compl
N3 = ResPes.Noun ** {c2 : Str ; c3 : Str} ;
PN = {s : Str ; animacy : Animacy} ;

6
src/persian/NounPes.gf
View File

@@ -86,18 +86,18 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
UseN2 = useN ;
Use2N3 n3 = useN n3 ** {
c = n3.c2 ;
c2 = n3.c2 ;
compl = []
} ;
Use3N3 n3 = useN n3 ** {
c = n3.c3 ;
c2 = n3.c3 ;
compl = []
} ;
ComplN2 n2 np = n2 ** {
s = \\n,m => n2.s ! n ! Ezafe ;
compl = \\_ => n2.compl ++ n2.c ++ np.s ! Bare ;
compl = \\_ => n2.compl ++ n2.c2 ++ np.s ! Bare ;
hasAdj = False
};

8
src/persian/ParadigmsPes.gf
View File

@@ -289,10 +289,14 @@ oper
} ;
mkN2 = overload {
mkN2 : Str -> N2 -- Predictable N2 without complement
= \s -> lin N2 (mkN01 s inanimate ** {c2,compl = []}) ;
mkN2 : N -> N2 -- N2 from without complement
= \n -> lin N2 (n ** {c2,compl = []}) ;
mkN2 : N -> Str -> N2
= \n,c -> lin N2 (n ** {c = c ; compl=[]}) ;
= \n,c -> lin N2 (n ** {c2 = c ; compl = []}) ;
mkN2 : N -> Prep -> Str -> N2 -- hidden from puclic API
= \n,p,c -> lin N2 (n ** {c = p.s ; c2 = c; compl=[]}) -- there is no c2
= \n,p,c -> lin N2 (n ** {c2 = p.s; compl = []})
} ;
mkN3 = overload {