GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hrv: some fixes in Adj

Browse Source
This commit is contained in:
Aarne Ranta
2022-10-01 19:07:39 +02:00
parent 8fc2460af6
commit 8811da5e51
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/croatian/ResHrv.gf
View File

@@ -332,18 +332,18 @@ voicing : Str -> Str = \s -> case s of {
AdjForms : Type = { AdjForms : Type = {
msnom, fsnom, nsnom : Str ; msnom, fsnom, nsnom : Str ;
msgen, fsgen : Str ; -- nsgen = msgen msgen, fsgen : Str ; -- nsgen = msgen
msdat : Str ; -- nsdat = msdat msdat : Str ; -- msloc,nsdat,nsloc = msdat
fsdat : Str ; -- fsloc = fsdat fsdat : Str ; -- fsloc = fsdat
fsacc : Str ; -- fsacc : Str ; --
msloc : Str ; -- nsloc, fsins = msloc
msins : Str ; -- nsins, pdat, ploc, pins = msins msins : Str ; -- nsins, pdat, ploc, pins = msins
fsins : Str ; -- no o/e variation like in msdat
mpnom : Str ; -- mpvoc = mpnom mpnom : Str ; -- mpvoc = mpnom
pgen : Str ; -- pgen : Str ; --
} ; } ;
invarAdjForms : Str -> AdjForms = \s -> { invarAdjForms : Str -> AdjForms = \s -> {
msnom, fsnom, nsnom, msgen, fsgen, msdat, msnom, fsnom, nsnom, msgen, fsgen, msdat,
fsdat, fsacc, msloc, msins, fsins, mpnom, pgen = s ; fsdat, fsacc, msins, fsins, mpnom, pgen = s ;
} ; } ;
-- used in PositA but will also work in Compar and Superl by calling their record fields -- used in PositA but will also work in Compar and Superl by calling their record fields
@@ -361,13 +361,12 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
<Sg, Gen, Fem> <Sg, Gen, Fem>
| <Pl, Nom|Acc|Voc, Fem> | <Pl, Nom|Acc|Voc, Fem>
| <Pl, Acc, Masc _> => afs.fsgen ; | <Pl, Acc, Masc _> => afs.fsgen ;
<Sg, Dat, Masc _|Neutr> => afs.msdat ; <Sg, Dat|Loc, Masc _|Neutr> => afs.msdat ;
<Sg, Dat|Loc, Fem> => afs.fsdat ; <Sg, Dat|Loc, Fem> => afs.fsdat ;
<Sg, Acc, Fem> => afs.fsacc ; <Sg, Acc, Fem> => afs.fsacc ;
<Sg, Loc, Masc _|Neutr>
| <Sg, Ins, Fem> => afs.msloc ;
<Sg, Ins, Masc _|Neutr> <Sg, Ins, Masc _|Neutr>
| <Pl,Dat|Loc|Ins, _> => afs.msins ; | <Pl,Dat|Loc|Ins, _> => afs.msins ;
<Sg, Ins, Fem> => afs.fsins ;
<Pl, Nom|Voc, Masc _> => afs.mpnom ; <Pl, Nom|Voc, Masc _> => afs.mpnom ;
<Pl, Gen,_> => afs.pgen <Pl, Gen,_> => afs.pgen
} }
@@ -382,20 +381,19 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
vel + "a" + k@? => vel + k ; vel + "a" + k@? => vel + k ;
vel + "i" => vel ; vel + "i" => vel ;
_ => velik _ => velik
} } ;
oe : Str = ifSoft velik "e" "o"
in { in {
msnom = velik ; msnom = velik ;
fsnom = velk + "a" ; fsnom = velk + "a" ;
nsnom = ifSoft velik nsnom = velk + oe ;
(velk + "e") msgen = velk + oe + "g" ;
(velk + "o") ;
msgen = velk + "og" ;
fsgen = velk + "e" ; fsgen = velk + "e" ;
msdat = velk + "om" ; msdat = velk + oe + "m" ;
fsdat = velk + "oj" ; fsdat = velk + "oj" ;
fsacc = velk + "u" ; fsacc = velk + "u" ;
msloc = velk + "om" ;
msins = velk + "im" ; msins = velk + "im" ;
fsins = velk + "om" ;
mpnom = velk + "i" ; mpnom = velk + "i" ;
pgen = velk + "ih" ; pgen = velk + "ih" ;
} ; } ;