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

(Jpn) Revert misunderstood fix about replaceCounter + update docs

Browse Source
This commit is contained in:
Inari Listenmaa
2020-02-11 16:17:32 +01:00
parent cefb149530
commit 92fdf5b799
2 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/japanese/NounJpn.gf
View File

@@ -11,7 +11,6 @@ flags coding = utf8 ;
True => cn.object ! st ++ det.quant ! st ++ det.num ++ cn.counter ++ det.postpositive True => cn.object ! st ++ det.quant ! st ++ det.num ++ cn.counter ++ det.postpositive
++ "の" ++ cn.s ! det.n ! st ; ++ "の" ++ cn.s ! det.n ! st ;
False => cn.object ! st ++ det.quant ! st ++ det.num ++ cn.counter ++ det.postpositive False => cn.object ! st ++ det.quant ! st ++ det.num ++ cn.counter ++ det.postpositive
++ cn.s ! det.n ! st
} ; } ;
False => case <det.tenPlus, cn.counterTsu> of { False => case <det.tenPlus, cn.counterTsu> of {
<True, True> => cn.object ! st ++ det.quant ! st ++ det.num ++ "個" ++ det.postpositive <True, True> => cn.object ! st ++ det.quant ! st ++ det.num ++ "個" ++ det.postpositive

10
src/japanese/ParadigmsJpn.gf
View File

@@ -18,17 +18,17 @@ oper
mkN = overload { mkN = overload {
mkN : (man : Str) -> N -- Inanimate noun. Counter is つ and not replaceable. mkN : (man : Str) -> N -- Inanimate noun. Counter is つ and not replaceable.
= \n -> lin N (regNoun n Inanim "つ" False True) ; ---- AR 15/11/2014 = \n -> lin N (regNoun n Inanim "つ" False True) ; ---- AR 15/11/2014
mkN : (man : Str) -> (anim : Animacy) -> N -- Animacy given as argument. Counter is つ and not replaceable. mkN : (man : Str) -> (anim : Animacy) -> N -- Animacy given as argument. Counter is つ and doesn't replace the noun.
= \n,a -> lin N (regNoun n a "つ" False True) ; = \n,a -> lin N (regNoun n a "つ" False True) ;
mkN : (kane,okane : Str) -> (anim : Animacy) -> N -- Style variation (plain, respectful) and animacy given. Counter is つ and not replaceable. mkN : (kane,okane : Str) -> (anim : Animacy) -> N -- Style variation (plain, respectful) and animacy given. Counter is つ and doesn't replace the noun.
= \kane,okane,a -> lin N (styleNoun kane okane a "つ" False True) ; = \kane,okane,a -> lin N (styleNoun kane okane a "つ" False True) ;
mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- No style variation. Arguments are animacy, counter and whether counter is replaceable. mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- No style variation. Arguments are animacy, counter and whether counter replaces the noun.
= \n,a,c,b -> lin N (regNoun n a c b False) ; = \n,a,c,b -> lin N (regNoun n a c b False) ;
mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> (men : Str) -> N -- Like previous, but unpredictable plural. mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> (men : Str) -> N -- Like previous, but unpredictable plural.
= \n,a,c,b,pl -> lin N (numberNoun n a c b pl False) ; = \n,a,c,b,pl -> lin N (numberNoun n a c b pl False) ;
mkN : (kane,okane : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- Style variation, animacy, counter and whether counter is replaceable. mkN : (kane,okane : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- Style variation, animacy, counter and whether counter replaces the noun.
= \kane,okane,a,c,b -> lin N (styleNoun kane okane a c b False) ; = \kane,okane,a,c,b -> lin N (styleNoun kane okane a c b False) ;
mkN : (tsuma,okusan : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> (tsumatachi : Str) -> N -- Worst case paradigm: style variation, animacy, counter, whether counter is replaceable and unpredictable plural. mkN : (tsuma,okusan : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> (tsumatachi : Str) -> N -- Worst case paradigm: style variation, animacy, counter, whether counter replaces the noun and unpredictable plural.
= \tsuma,okusan,a,c,b,tsumatachi -> = \tsuma,okusan,a,c,b,tsumatachi ->
lin N (mkNoun tsuma okusan tsumatachi tsumatachi a c b False) lin N (mkNoun tsuma okusan tsumatachi tsumatachi a c b False)
} ; } ;