(Ara) add parameter to uttVP oper

This commit is contained in:
Inari Listenmaa
2019-01-14 21:22:42 +01:00
parent 6348f06052
commit 51e714864e
4 changed files with 5 additions and 5 deletions

View File

@@ -96,6 +96,6 @@ linref
CN = \cn -> uttCN cn ! Masc ; CN = \cn -> uttCN cn ! Masc ;
N = \n -> uttCN (useN n) ! Masc ; N = \n -> uttCN (useN n) ! Masc ;
VP = \vp -> uttVP vp ! Masc ; VP = \vp -> uttVP VPPerf vp ! Masc ;
} }

View File

@@ -18,7 +18,7 @@ concrete PhraseAra of Phrase = CatAra ** open
UttCN cn = {s = ResAra.uttCN cn } ; --IL UttCN cn = {s = ResAra.uttCN cn } ; --IL
UttNP np = {s = \\_ => np.s ! Nom} ; 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} ; UttS s = {s = \\_ => s.s ! Verbal} ;
UttAdv, UttAdv,
UttIAdv = \s -> {s = \\_ => s.s} ; ---- OK? AR UttIAdv = \s -> {s = \\_ => s.s} ; ---- OK? AR

View File

@@ -1749,8 +1749,8 @@ patGeminateImp : (_,_ :Str) -> Gender => Number => Str = \facc,facic ->
s : PerGenNum => VPForm => Str ; s : PerGenNum => VPForm => Str ;
} ; } ;
uttVP : VP -> (Gender=>Str) = \vp -> uttVP : VPForm -> VP -> (Gender=>Str) = \vpf,vp ->
\\g => vp.s ! Per3 g Sg ! VPPerf \\g => vp.s ! Per3 g Sg ! vpf
++ vp.obj.s ++ vp.pred.s ! {n = Sg ; g = g} ! Nom ++ vp.obj.s ++ vp.pred.s ! {n = Sg ; g = g} ! Nom
++ vp.s2 ; ++ vp.s2 ;

View File

@@ -44,7 +44,7 @@ concrete SentenceAra of Sentence = CatAra ** open
EmbedS s = {s = "أَنْ" ++ s.s ! Verbal} ; EmbedS s = {s = "أَنْ" ++ s.s ! Verbal} ;
EmbedQS qs = {s = qs.s ! QIndir} ; 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 = UseCl t p cl =
{s = \\o => t.s ++ p.s ++ {s = \\o => t.s ++ p.s ++