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

(Hun) Restructure caseFromStem and applyCase

Browse Source
This commit is contained in:
Inari Listenmaa
2020-04-23 20:14:20 +02:00
parent 4dc5b53c3c
commit 26253d5353
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/hungarian/ResHun.gf
View File

@@ -23,15 +23,17 @@ oper
\\n,c => caseFromStem (\a,b -> a+b) (regNounNomAcc no ac) c n ;
caseFromStem : (Str->Str->Str) -> Noun -> Case -> Number -> Str = \bind,cn,cas,n ->
let applyCase' : NumCaseStem -> Str = applyCase bind cas cn in
case <n,cas> of {
<Sg,Nom> => cn.s ! SgNom ;
<Sg,Acc> => bind (cn.s ! SgAccStem) "t" ;
<Sg,Sup> => cn.s ! SgSup ;
<Pl,Acc> => cn.s ! PlAcc ;
<Pl,Nom> => cn.s ! PlStem ;
<Sg,Ins|Tra> => bind (cn.s ! SgInsStem) (endCase cas ! cn.h) ;
<Sg,Ins|Tra> => applyCase' SgInsStem ;
<Pl,Ins|Tra> => bind (bind (cn.s ! PlStem) "k") (endCase cas ! cn.h) ;
_ => applyOblCase bind (endCase cas) n cn
<Sg,_> => applyCase' SgStem ;
<Pl,_> => applyCase' PlStem
} ;
BaseNP : Type = {
@@ -170,11 +172,8 @@ oper
applyAdp : Adposition -> NounPhrase -> Str = \adp,np ->
adp.pr ++ np.s ! adp.c ++ adp.s ;
applyOblCase : (Str->Str->Str) -> HarmForms -> Number -> Noun -> Str =
\bind,adp,n,np ->
let stem : NumCaseStem = case n of {
Sg => SgStem ; Pl => PlStem } ;
in bind (np.s ! stem) (adp ! np.h) ;
applyCase : (Str->Str->Str) -> Case -> Noun -> NumCaseStem -> Str =
\bind,cas,cn,stem -> bind (cn.s ! stem) (endCase cas ! cn.h) ;
------------------
-- Conj