From d41dc9961a14ee47e775a4b1ca4154ea74cb7330 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 23 Sep 2012 09:35:04 +0000 Subject: [PATCH] VPSlashPrep in Fin and Romance; the word order in VPSlash not yet fixed. --- lib/src/finnish/IdiomFin.gf | 2 +- lib/src/finnish/VerbFin.gf | 1 + lib/src/romance/VerbRomance.gf | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/finnish/IdiomFin.gf b/lib/src/finnish/IdiomFin.gf index f858d80fd..9e4ebcf1e 100644 --- a/lib/src/finnish/IdiomFin.gf +++ b/lib/src/finnish/IdiomFin.gf @@ -18,7 +18,7 @@ concrete IdiomFin of Idiom = CatFin ** let cas : NPForm = NPCase Nom ; ---- also partitive in Extra vp = insertObj (\\_,b,_ => "olemassa") (predV olla) ; - cl = mkClause (subjForm (ip ** {isPron = False ; a = agrP3 ip.n}) cas) (agrP3 Sg) vp + cl = mkClause (subjForm (ip ** {isPron = False ; a = agrP3 ip.n}) cas) (agrP3 ip.n) vp in { s = \\t,a,p => cl.s ! t ! a ! p ! SDecl } ; diff --git a/lib/src/finnish/VerbFin.gf b/lib/src/finnish/VerbFin.gf index 9353a03d8..637b41dff 100644 --- a/lib/src/finnish/VerbFin.gf +++ b/lib/src/finnish/VerbFin.gf @@ -114,6 +114,7 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin in { CompNP np = {s = \\_ => np.s ! NPCase Nom} ; CompAdv a = {s = \\_ => a.s} ; + VPSlashPrep vp prep = vp ** {c2 = prep} ; } diff --git a/lib/src/romance/VerbRomance.gf b/lib/src/romance/VerbRomance.gf index 40e34e385..2d45e2a5a 100644 --- a/lib/src/romance/VerbRomance.gf +++ b/lib/src/romance/VerbRomance.gf @@ -87,6 +87,9 @@ incomplete concrete VerbRomance of Verb = PassV2 v = insertComplement (\\a => let agr = complAgr a in v.s ! VPart agr.g agr.n) (predV auxPassive) ; + VPSlashPrep vp prep = vp ** { + c2 = {s = prep.s ; c = prep.c ; isDir = False} + } ; } {---b