diff --git a/src/arabic/CatAra.gf b/src/arabic/CatAra.gf index 3afc23e1..14aac02f 100644 --- a/src/arabic/CatAra.gf +++ b/src/arabic/CatAra.gf @@ -96,6 +96,6 @@ linref CN = \cn -> uttCN cn ! Masc ; N = \n -> uttCN (useN n) ! Masc ; - VP = \vp -> uttVP vp ! Masc ; + VP = \vp -> uttVP VPPerf vp ! Masc ; } diff --git a/src/arabic/PhraseAra.gf b/src/arabic/PhraseAra.gf index c013f230..138ab57c 100644 --- a/src/arabic/PhraseAra.gf +++ b/src/arabic/PhraseAra.gf @@ -18,7 +18,7 @@ concrete PhraseAra of Phrase = CatAra ** open UttCN cn = {s = ResAra.uttCN cn } ; --IL UttNP np = {s = \\_ => np.s ! Nom} ; - UttVP vp = {s = uttVP vp} ; --IL + UttVP vp = {s = uttVP VPPerf vp} ; --IL UttS s = {s = \\_ => s.s ! Verbal} ; UttAdv, UttIAdv = \s -> {s = \\_ => s.s} ; ---- OK? AR diff --git a/src/arabic/ResAra.gf b/src/arabic/ResAra.gf index 3244dc81..e2d183fb 100644 --- a/src/arabic/ResAra.gf +++ b/src/arabic/ResAra.gf @@ -1749,8 +1749,8 @@ patGeminateImp : (_,_ :Str) -> Gender => Number => Str = \facc,facic -> s : PerGenNum => VPForm => Str ; } ; - uttVP : VP -> (Gender=>Str) = \vp -> - \\g => vp.s ! Per3 g Sg ! VPPerf + uttVP : VPForm -> VP -> (Gender=>Str) = \vpf,vp -> + \\g => vp.s ! Per3 g Sg ! vpf ++ vp.obj.s ++ vp.pred.s ! {n = Sg ; g = g} ! Nom ++ vp.s2 ; diff --git a/src/arabic/SentenceAra.gf b/src/arabic/SentenceAra.gf index e08d120c..cf48c107 100644 --- a/src/arabic/SentenceAra.gf +++ b/src/arabic/SentenceAra.gf @@ -44,7 +44,7 @@ concrete SentenceAra of Sentence = CatAra ** open EmbedS s = {s = "أَنْ" ++ s.s ! Verbal} ; EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = uttVP vp ! Masc} ; + EmbedVP vp = {s = uttVP VPPerf vp ! Masc} ; -- TODO: use VPGer once it's more stable UseCl t p cl = {s = \\o => t.s ++ p.s ++