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

using the ext field more properly in Scand VP

Browse Source
This commit is contained in:
Aarne Ranta
2018-10-09 19:27:21 +02:00
parent 0fa4dd7ab0
commit 05ed75c131
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 ** {