fix linVP: use the same functions as mkClause

This commit is contained in:
Inari Listenmaa
2017-10-02 16:16:28 +02:00
parent 1c9e90f74d
commit 1426c07f97

View File

@@ -370,20 +370,17 @@ param
oper oper
--to be used in linref, PhraseEus ... anything where a VP is turned into string! --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 -> Anteriority -> VerbPhrase -> Str = \t,a,vp ->
linVPTense : Tense -> Tense -> VerbPhrase -> Str = let verb = case isSynthetic vp.val of {
\tnsPrc,tnsAux,vp -> True => verbformSynthetic t a vp ;
let prc = case vp.val of { False => verbformPeriphrastic t a vp } ;
Da Izan => vp.nstem ;
Da Egon => vp.nstem ;
_ => vp.prc ! tnsPrc } ;
in in
vp.adv vp.adv
++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! Hau --all the compls! ++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! Hau --all the compls!
++ prc ++ verb.prc
++ (chooseAux vp ! tnsAux ! Hau).indep ; ++ (verb.aux ! Hau).indep ;
-- Used in ComplVV : does not include aux! -- Used in ComplVV : does not include aux!
linVPPrc : VerbPhrase -> Str = \vp -> --TODO make it less of a hack. linVPPrc : VerbPhrase -> Str = \vp -> --TODO make it less of a hack.