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

Merge branch 'master' of https://github.com/GrammaticalFramework/gf-rgl

Browse Source
This commit is contained in:
Inari Listenmaa
2018-10-11 17:02:07 +02:00
parent 43227578c5 56fd159e34
commit a36c3278a5
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/finnish/Kotus.gf
View File

@@ -106,11 +106,11 @@ oper
d28A : Str -> NForms -- 1 jälsi d28A : Str -> NForms -- 1 jälsi
= \s -> dArpi s (Predef.tk 2 s + "len") ; = \s -> dArpi s (Predef.tk 2 s + "len") ;
d29 : Str -> NForms -- 1 lapsi d29 : Str -> NForms -- 1 lapsi
= \s -> let lapsi = dArpi s (init s + "en") in = \s -> let lapsi = dArpi s (init s + "en") ; a = vowHarmony s in
table {2 => Predef.tk 3 s + "ta" ; i => lapsi ! i} ; table {2 => Predef.tk 3 s + "st" + a ; i => lapsi ! i} ;
d30 : Str -> NForms -- 2 veitsi d30 : Str -> NForms -- 2 veitsi
= \s -> let lapsi = dArpi s (init s + "en") in = \s -> let lapsi = dArpi s (init s + "en") ; a = vowHarmony s in
table {2 => Predef.tk 3 s + "stä" ; i => lapsi ! i} ; table {2 => Predef.tk 3 s + "st" + a ; i => lapsi ! i} ;
d31 : Str -> NForms -- 3 yksi d31 : Str -> NForms -- 3 yksi
= \s -> let = \s -> let
y = Predef.tk 3 s ; y = Predef.tk 3 s ;

2
src/finnish/MorphoFin.gf
View File

@@ -639,7 +639,7 @@ resource MorphoFin = ResFin ** open Prelude in {
in vForms12 in vForms12
harkita harkita
(harkit + "sen") (harkit + "sen")
(harkit + "se") (harkit + "see")
(harkit + "sev" + a + "t") (harkit + "sev" + a + "t")
(harkit + "k" + a + a) (harkit + "k" + a + a)
(harkit + a + a + "n") (harkit + a + a + "n")

2
src/scandinavian/SentenceScand.gf
View File

@@ -36,7 +36,7 @@ incomplete concrete SentenceScand of Sentence =
SlashVS np vs slash = SlashVS np vs slash =
mkClause mkClause
(np.s ! nominative) np.a (np.s ! nominative) np.a
(insertObj (\\_ => conjThat ++ slash.s ! Sub) (predV vs)) ** (insertExt (conjThat ++ slash.s ! Sub) (predV vs)) **
{n3 = slash.n3 ; c2 = slash.c2} ; {n3 = slash.n3 ; c2 = slash.c2} ;
EmbedS s = {s = conjThat ++ s.s ! Sub} ; EmbedS s = {s = conjThat ++ s.s ! Sub} ;

10
src/scandinavian/VerbScand.gf
View File

@@ -16,8 +16,8 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand,
} ; } ;
ComplVV v vp = insertObjPost (\\a => v.c2.s ++ infVP vp a) (predV v) ; ComplVV v vp = insertObjPost (\\a => v.c2.s ++ infVP vp a) (predV v) ;
ComplVS v s = insertObjPost (\\_ => conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ? ComplVS v s = insertExt (conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ?
ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ; ComplVQ v q = insertExt (q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObjPre (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ; ComplVA v ap = insertObjPre (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ;
SlashV2V v vp = predV v ** { SlashV2V v vp = predV v ** {
@@ -25,11 +25,13 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand,
c2 = v.c2 c2 = v.c2
} ; } ;
SlashV2S v s = predV v ** { SlashV2S v s = predV v ** {
n3 = \\_ => conjThat ++ s.s ! Sub ; n3 = \\_ => [] ;
ext = conjThat ++ s.s ! Sub ;
c2 = v.c2 c2 = v.c2
} ; } ;
SlashV2Q v q = predV v ** { SlashV2Q v q = predV v ** {
n3 = \\_ => q.s ! QIndir ; n3 = \\_ => [] ;
ext = q.s ! QIndir ;
c2 = v.c2 c2 = v.c2
} ; } ;
SlashV2A v ap = predV v ** { SlashV2A v ap = predV v ** {