mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 09:28:54 -06:00
(Pes) Rename N2's c to c2 for consistency
This commit is contained in:
@@ -89,7 +89,7 @@ concrete CatPes of Cat = CommonX - [Adv] ** open ResPes, Prelude in {
|
|||||||
|
|
||||||
N = ResPes.Noun ;
|
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} ;
|
N3 = ResPes.Noun ** {c2 : Str ; c3 : Str} ;
|
||||||
PN = {s : Str ; animacy : Animacy} ;
|
PN = {s : Str ; animacy : Animacy} ;
|
||||||
|
|
||||||
|
|||||||
@@ -86,18 +86,18 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
|
|||||||
UseN2 = useN ;
|
UseN2 = useN ;
|
||||||
|
|
||||||
Use2N3 n3 = useN n3 ** {
|
Use2N3 n3 = useN n3 ** {
|
||||||
c = n3.c2 ;
|
c2 = n3.c2 ;
|
||||||
compl = []
|
compl = []
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
Use3N3 n3 = useN n3 ** {
|
Use3N3 n3 = useN n3 ** {
|
||||||
c = n3.c3 ;
|
c2 = n3.c3 ;
|
||||||
compl = []
|
compl = []
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
ComplN2 n2 np = n2 ** {
|
ComplN2 n2 np = n2 ** {
|
||||||
s = \\n,m => n2.s ! n ! Ezafe ;
|
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
|
hasAdj = False
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -289,10 +289,14 @@ oper
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
mkN2 = overload {
|
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
|
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
|
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 {
|
mkN3 = overload {
|
||||||
|
|||||||
Reference in New Issue
Block a user