1
0
forked from GitHub/gf-rgl

make CompoundN more flexible

This commit is contained in:
Krasimir Angelov
2023-10-25 11:19:00 +02:00
parent fa8cef4112
commit 01e5165537
13 changed files with 68 additions and 38 deletions

View File

@@ -10,7 +10,7 @@ flags
oper
regFN : Str -> N = \s -> femN (regN s) ;
regMN : Str -> N = \s -> regN s ;
irregMN : Str -> Str -> N = \pa,pans -> M.mkNounIrreg pa pans masculine ** {lock_N=<>} ;
irregMN : Str -> Str -> N = \pa,pans -> M.mkNounIrreg pa pans masculine ** {relType=D.NRelPrep D.P_de; lock_N=<>} ;
saberV : V = verbV (saber_99 "saber") ;
lin

View File

@@ -348,11 +348,11 @@ oper
mkPrep p = {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
mk2N x y g = mkNounIrreg x y g ** {lock_N = <>} ;
regN x = mkNomReg x ** {lock_N = <>} ;
compN x y = {s = \\n => x.s ! n ++ y ; g = x.g ; lock_N = <>} ;
femN x = {s = x.s ; g = feminine ; lock_N = <>} ;
mascN x = {s = x.s ; g = masculine ; lock_N = <>} ;
mk2N x y g = mkNounIrreg x y g ** {relType = NRelPrep P_de; lock_N = <>} ;
regN x = mkNomReg x ** {relType = NRelPrep P_de; lock_N = <>} ;
compN x y = {s = \\n => x.s ! n ++ y ; g = x.g ; relType = x.relType ; lock_N = <>} ;
femN x = x ** {g = feminine} ;
mascN x = x ** {g = masculine} ;
mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p} ;
deN2 n = mkN2 n genitive ;
@@ -525,7 +525,7 @@ oper
mkN = overload {
mkN : (llum : Str) -> N = regN ;
mkN : Str -> Gender -> N = \s,g -> {s = (regN s).s ; g = g ; lock_N = <>};
mkN : Str -> Gender -> N = \s,g -> (regN s) ** {g = g};
mkN : (disc,discos : Str) -> Gender -> N = mk2N
} ;
regN : Str -> N ;