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

fixed the place of AP in Scand.CompAP so that it is before the particle but after negation: 'det ser inte bra ut'

Browse Source
This commit is contained in:
Aarne Ranta
2018-10-09 10:44:46 +02:00
parent 1b0359f217
commit 8334a3fab3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scandinavian/CommonScand.gf
View File

@@ -309,7 +309,11 @@ oper
isSimple = False isSimple = False
} ; } ;
insertObj : (Agr => Str) -> VP -> VP = insertObjPron False ; insertObj : (Agr => Str) -> VP -> VP = insertObjPron False ;
insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** {
n2 = \\a => obj ! a ++ vp.n2 ! a -- e.g. ser inte *bra* ut
} ;
insertObjPost : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** { insertObjPost : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** {
n2 = \\a => vp.n2 ! a ++ obj ! a ; n2 = \\a => vp.n2 ! a ++ obj ! a ;

2
src/scandinavian/VerbScand.gf
View File

@@ -18,7 +18,7 @@ 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 = insertObjPost (\\_ => conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ?
ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ; ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObjPost (\\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 ** {
n3 = \\a => v.c3.s ++ infVP vp a ; n3 = \\a => v.c3.s ++ infVP vp a ;