From 6f0f9571bc40d356a8d3965e1e7dbe70c0b8657c Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Fri, 13 Jun 2008 21:09:41 +0000
Subject: [PATCH] fix the word order and agreement in SlashV2VNP

---
 lib/resource-1.4/bulgarian/VerbBul.gf | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/resource-1.4/bulgarian/VerbBul.gf b/lib/resource-1.4/bulgarian/VerbBul.gf
index ec1f7930f..67205432d 100644
--- a/lib/resource-1.4/bulgarian/VerbBul.gf
+++ b/lib/resource-1.4/bulgarian/VerbBul.gf
@@ -36,8 +36,6 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
       insertObj (\\a => ap.s ! aform a.gn Indef (RObj Acc)) 
         (predV v) ** {c2 = v.c2} ;  ---- FIXME: agreement with obj.a 
 
-    ---- AR guessed these five, copying from Compl(VS,VQ,VV)
-
     -- test: I saw a boy to whom she said that they are here
     SlashV2S v s  = insertObj (\\_ => "," ++ "че" ++ s.s) (predV v) ** {c2 = v.c2} ;
 
@@ -48,7 +46,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
     SlashV2V vv vp =
       insertObj (\\agr => vp.ad ! False ++ "да" ++ vp.s ! Pres ! Simul ! Pos ! agr ! False ! Perf)
                 (predV vv)
-         ** {c2 = vv.c2} ;  ---- FIXME: agreement with obj.a 
+         ** {c2 = vv.c2} ;
 
     -- test: I saw a car whom she wanted to buy
     SlashVV vv slash = {
@@ -64,21 +62,18 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
       } ** {c2 = slash.c2} ;
 
     -- test: I saw a car whom she begged me to buy
-    SlashV2VNP vv np slash = 
-      insertObj (\\_ => vv.c2.s ++ np.s ! RObj vv.c2.c) {
+    SlashV2VNP vv np slash = {
       s   = \\t,a,p,agr,q,asp => 
         let 
           vv_verb = (predV vv).s ! t ! a ! p ! agr ! q ! asp ;
-          slash_verb = slash.s ! Pres ! Simul ! Pos ! agr ! False ! Perf ;
-        in vv_verb ++ slash.ad ! False ++ "да" ++ slash_verb ;
+          slash_verb = slash.s ! Pres ! Simul ! Pos ! np.a ! False ! Perf ;
+        in vv_verb ++ vv.c2.s ++ np.s ! RObj vv.c2.c ++ slash.ad ! False ++ "да" ++ slash_verb ;
       imp = slash.imp ;
       ad = \\_ => [] ;
       s2 = slash.s2 ;
       subjRole = slash.subjRole
       } ** {c2 = slash.c2} ;
 
----- END guesses by AR
-
     ComplSlash slash np = {
       s   = slash.s ;
       imp = slash.imp ;