From 1e894281b7c7cad95e3965de4dfb36184db2b99d Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Tue, 22 Sep 2009 08:08:54 +0000
Subject: [PATCH] remove the redundant complement fields in V2V and V2A

---
 lib/src/romanian/CatRon.gf  |  4 ++--
 lib/src/romanian/VerbRon.gf | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/src/romanian/CatRon.gf b/lib/src/romanian/CatRon.gf
index 6acaaeaf1..47d1cd62b 100644
--- a/lib/src/romanian/CatRon.gf
+++ b/lib/src/romanian/CatRon.gf
@@ -110,9 +110,9 @@ concrete CatRon of Cat =
 
     VQ, VA = ResRon.Verb ; 
 
-    V2,V2S, V2Q = ResRon.Verb ** {c2 : Compl} ;
+    V2,V2S,V2Q,V2V,V2A = ResRon.Verb ** {c2 : Compl} ;
 
-    V3,V2A, V2V = ResRon.Verb ** {c2,c3 : Compl} ;
+    V3 = ResRon.Verb ** {c2,c3 : Compl} ;
 
     VS = ResRon.Verb ** {m : Polarity => Mood} ;
 
diff --git a/lib/src/romanian/VerbRon.gf b/lib/src/romanian/VerbRon.gf
index 7f676f7f1..7c1b9cd89 100644
--- a/lib/src/romanian/VerbRon.gf
+++ b/lib/src/romanian/VerbRon.gf
@@ -68,8 +68,8 @@ concrete VerbRon of Verb =
  -- more usually the adverbial form is used, hence no agreement
  
    SlashV2A v ap =  
-     (insertSimpObj  (\\a => v.c3.s ++ ap.s ! (AF Masc Sg Indef (convCase v.c3.c)))  
-(useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c2} ;
+     (insertSimpObj  (\\a => ap.s ! (AF Masc Sg Indef ANomAcc)) (useVerb v))
+       ** {needAgr = False ; needClit = True ; c2 = v.c2} ;
 
     ComplSlash vp np =  let  s1 = vp.c2.s ++(np.s ! (vp.c2.c)).comp ;
                              ss = if_then_Str np.hasRef (vp.c2.prepDir ++ s1) s1 ; 
@@ -128,14 +128,12 @@ concrete VerbRon of Verb =
                               vvp = vp ** {lock_VP = <>};
                               vcomp = (getConjComp vvp np.a).s
                            in   
-                              case v.c2.isDir  of
-                                {Dir PAcc => (insertObje (\\a => sir ++ vcomp ! a) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ;c2 = vp.c2} ;
-                                
-                                 Dir PDat =>  (insertObje (\\a => sir ++ vcomp ! a) RNoAg (clitFromNoun np Da) False vcDa (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ; c2 = vp.c2};
-                                 
-                                 _        => (insertSimpObjPre (\\a => ss ++ vcomp ! a) (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ; c2 = vp.c2}  
-                                };
-
+                              case v.c2.isDir of {
+                                 Dir PAcc => insertObje (\\a => sir ++ vcomp ! a) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v) ;
+                                 Dir PDat => insertObje (\\a => sir ++ vcomp ! a) RNoAg (clitFromNoun np Da) False vcDa (useVerb v) ;
+                                 _        => insertSimpObjPre (\\a => ss ++ vcomp ! a) (useVerb v)
+                              }
+                               ** {needAgr = vp.needAgr ; needClit = False ;c2 = vp.c2} ;
 
     UseComp comp = insertSimpObj comp.s copula ;