1
0
forked from GitHub/gf-rgl

Merge pull request #36 from inariksit/master

Finnish
This commit is contained in:
Inari Listenmaa
2018-10-05 16:20:44 +02:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@@ -750,7 +750,7 @@ resource MorphoFin = ResFin ** open Prelude in {
vat = "v" + a + "t" ;
liene = init lienee ;
tulta = tult + a ;
tulevaP = (noun2adj (nhn (sKukko tuleva (tuleva + "n") (init tuleva + "ia")))).s ;
tulevaP = (noun2adj (nhn (sKukko tuleva (tuleva + "n") (init tuleva + "i" + a)))).s ;
tultavaP = (noun2adj (nhn (sKukko (tulta + "v" + a) (tulta + "v" + a + "n") (tulta + "vi" + a)))).s ;
tulemaP = (noun2adj (nhn (sKukko tulema (tulema + "n") (init tulema + "i" + a)))).s ;

View File

@@ -642,6 +642,7 @@ mkVS = overload {
mkA : (hyva,parempi,paras : N) -> (hyvin,paremmin,parhaiten : Str) -> A
= \h,p,ps,hn,pn,ph -> lin A (mkAdj h p ps hn pn ph) ;
mkA : V -> A = presPartA ;
} ;
mkA_1 : Str -> A = \x -> lin A (noun2adjDeg (mk1N x)) ;
@@ -667,7 +668,14 @@ mkVS = overload {
(snoun2compar suuri)
(snoun2superl suuri) ;
presPartA : SVerb -> A = \tullaSV ->
let tulla = sverb2verb True tullaSV ;
tuleva : NForm => Str = \\nf => tulla.s ! PresPartAct (AN nf) ;
tuleva_SN = { s = tuleva ;
h = tullaSV.h } ;
in noun2adjDeg tuleva_SN ;
-- verbs