From 1426c07f97804ddcf39139680b1b2e8fd3d388ce Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Mon, 2 Oct 2017 16:16:28 +0200
Subject: [PATCH] fix linVP: use the same functions as mkClause

---
 src/basque/ResEus.gf | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/basque/ResEus.gf b/src/basque/ResEus.gf
index 561faf22e..68ac9f0af 100644
--- a/src/basque/ResEus.gf
+++ b/src/basque/ResEus.gf
@@ -370,20 +370,17 @@ param
 
 oper
   --to be used in linref, PhraseEus ... anything where a VP is turned into string!
-  linVP : VerbPhrase -> Str = linVPTense Pres Pres ;
+  linVP : VerbPhrase -> Str = linVPTense Pres Simul ;
 
- -- TODO: fix trinkoak
-  linVPTense : Tense -> Tense -> VerbPhrase -> Str = 
-   \tnsPrc,tnsAux,vp ->
-   let prc = case vp.val of {
-      Da Izan => vp.nstem ;
-      Da Egon => vp.nstem ;
-      _       => vp.prc ! tnsPrc } ;
+  linVPTense : Tense -> Anteriority -> VerbPhrase -> Str = \t,a,vp ->
+   let verb = case isSynthetic vp.val of {
+                    True  => verbformSynthetic t a vp ;
+                    False => verbformPeriphrastic t a vp } ;     
    in 
     vp.adv 
     ++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! Hau  --all the compls!
-    ++ prc
-    ++ (chooseAux vp ! tnsAux ! Hau).indep ;
+    ++ verb.prc
+    ++ (verb.aux ! Hau).indep ;
 
   -- Used in ComplVV : does not include aux!
   linVPPrc : VerbPhrase -> Str = \vp ->  --TODO make it less of a hack.