GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-06-29 04:46:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

make CompoundN more flexible

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/spanish/ExtendSpa.gf
+8 -4
View File
@@ -73,10 +73,14 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
(predV (mkV "existir"))) ;
CompoundN noun noun2 = { -- order is different because that's needed for correct translation from english
s = \\n => noun2.s ! n
++ variants {"de" ; genForms "del" "de la" ! noun.g}
++ noun.s ! Sg ;
g = noun2.g
s = \\n => noun2.s ! n ++
case noun2.relType of {
NRelPrep p => prepCase (CPrep p) ; -- tasa de suicidio
NRelNoPrep => [] -- connessione internet = internet connection
} ++
noun.s ! Sg ;
g = noun2.g ;
relType = noun2.relType
} ;
CompoundAP noun adj = {
src/spanish/ParadigmsSpa.gf
+6 -6
View File
@@ -380,11 +380,11 @@ oper
} ;
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 = x ** {s = \\n => x.s ! n ++ y} ;
femN x = {s = x.s ; g = feminine ; relType=NRelPrep P_de; lock_N = <>} ;
mascN x = {s = x.s ; g = masculine ; relType=NRelPrep P_de; lock_N = <>} ;
mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p} ;
deN2 n = mkN2 n genitive ;
@@ -550,7 +550,7 @@ oper
mkN = overload {
mkN : (luz : 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 : (baston,bastones : Str) -> Gender -> N = mk2N ;
mkN : N -> Str -> N = compN ;
} ;