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

added missing InLN and dayMonthYearAdv in Fin

Browse Source
This commit is contained in:
Aarne Ranta
2024-01-30 16:23:17 +01:00
parent 4a12ecd9d3
commit d98bb99fc1
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/finnish/CatFin.gf
View File

@@ -97,7 +97,7 @@ concrete CatFin of Cat = CommonX ** open ResFin, StemFin, Prelude in {
N2 = SNoun ** {c2 : Compl ; isPre : Bool ; postmod : Number => Str} ; N2 = SNoun ** {c2 : Compl ; isPre : Bool ; postmod : Number => Str} ;
N3 = SNoun ** {c2,c3 : Compl ; isPre,isPre2 : Bool} ; N3 = SNoun ** {c2,c3 : Compl ; isPre,isPre2 : Bool} ;
PN = SPN ; PN = SPN ;
LN = SPN ** {n : Number} ; LN = SPN ** {n : Number ; extCase : Bool} ; -- extCase=True -> Adessive, Ablative, Allative
GN = SPN ** {g : Sex} ; GN = SPN ** {g : Sex} ;
SN = {s : Sex => SPN; pl : SPN} ; SN = {s : Sex => SPN; pl : SPN} ;

7
src/finnish/ConstructionFin.gf
View File

@@ -74,9 +74,10 @@ lin
yearAdv y = SyntaxFin.mkAdv (prePrep nominative "vuonna") y ; yearAdv y = SyntaxFin.mkAdv (prePrep nominative "vuonna") y ;
dayMonthAdv d m = ParadigmsFin.mkAdv ((mkUtt d).s ++ BIND ++ "." ++ (mkUtt (mkNP m)).s) ; dayMonthAdv d m = ParadigmsFin.mkAdv ((mkUtt d).s ++ BIND ++ "." ++ (mkUtt (mkNP m)).s) ;
monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ; monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ;
---- dayMonthYearAdv d m y = dayMonthYearAdv d m y =
---- lin Adv {s = d.s ! R.NPCase R.Nom ++ BIND ++ "." ++ m.s ! R.NCase R.Sg R.Part ++ y.s ! R.NPCase R.Nom} ; ParadigmsFin.mkAdv ((mkUtt d).s ++ BIND ++ "." ++
(SyntaxFin.mkAdv part_Prep (mkNP m)).s ++
(SyntaxFin.mkAdv (casePrep nominative) y).s) ;
intYear = symb ; intYear = symb ;
intMonthday = symb ; intMonthday = symb ;

10
src/finnish/NamesFin.gf
View File

@@ -32,12 +32,8 @@ lin UseLN, PlainLN = \ln -> {
isPron = False ; isNeg = False isPron = False ; isNeg = False
} ; } ;
lin InLP ln = { lin InLN ln =
s = appCompl True Pos ln.c { s = snoun2np ln.n ln ; let c = case ln.extCase of {True => Adess ; False => Iness}
a = agrP3 ln.n ; in {s = ln.s ! c} ;
isPron = False ;
isNeg = False
}
} ;
} }

10
src/finnish/ParadigmsFin.gf
View File

@@ -843,10 +843,12 @@ mkVS = overload {
} ; } ;
mkLN = overload { mkLN = overload {
mkLN : Str -> LN = \s -> lin LN (snoun2spn (mk1N s) ** {n = Sg}) ; mkLN : Str -> LN = \s -> lin LN (snoun2spn (mk1N s) ** {n = Sg ; extCase = False}) ;
mkLN : Str -> Number -> LN = \s,n -> lin LN (snoun2spnGen (mk1N s) n ** {n = n}) ; mkLN : Str -> Number -> LN = \s,n -> lin LN (snoun2spnGen (mk1N s) n ** {n = n ; extCase = False}) ;
mkLN : N -> LN = \noun -> lin LN (snoun2spn noun ** {n = Sg}) ; mkLN : N -> LN = \noun -> lin LN (snoun2spn noun ** {n = Sg ; extCase = False}) ;
mkLN : N -> Number -> LN = \noun,n -> lin LN (snoun2spnGen noun n ** {n = n}) ; mkLN : N -> Number -> LN = \noun,n -> lin LN (snoun2spnGen noun n ** {n = n ; extCase = False}) ;
mkLN : Str -> Number -> Bool -> LN = \s,n,c -> lin LN (snoun2spnGen (mk1N s) n ** {n = n ; extCase = c}) ;
mkLN : N -> Number -> Bool -> LN = \noun,n,c -> lin LN (snoun2spnGen noun n ** {n = n ; extCase = c}) ;
} ; } ;
mkGN = overload { mkGN = overload {