diff --git a/src/arabic/QuestionAra.gf b/src/arabic/QuestionAra.gf index ee7edacad..e6bcf6a64 100644 --- a/src/arabic/QuestionAra.gf +++ b/src/arabic/QuestionAra.gf @@ -28,7 +28,7 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA ---- IL guessed -- : IComp -> NP -> QCl QuestIComp ic np = - let vp = UseComp (CompNP np) ; + let vp = UseComp (CompNP np) ; -- puts NP in nominative ip : ResAra.IP = np ** { -- NP's s is already present in VP, we only want its agr s = \\_,_,_,_ => ic.s ! pgn2gn np.a.pgn } ; in QuestVP ip vp ; diff --git a/src/arabic/RelativeAra.gf b/src/arabic/RelativeAra.gf index 9c764ade6..25f1fe645 100644 --- a/src/arabic/RelativeAra.gf +++ b/src/arabic/RelativeAra.gf @@ -13,7 +13,7 @@ concrete RelativeAra of Relative = CatAra ** s = \\t,p,agr,c => let npS : Case => Str = \\_ => rp.s ! agr2ragr agr c ; - np : NP = agrNP agr ** {s = npS} ; + np : ResAra.NP = agrNP agr ** {s = npS} ; cl = predVP np vp ; in cl.s ! t ! p ! Nominal diff --git a/src/arabic/ResAra.gf b/src/arabic/ResAra.gf index 497caa97b..d1d74c9d1 100644 --- a/src/arabic/ResAra.gf +++ b/src/arabic/ResAra.gf @@ -1553,7 +1553,7 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf -> => vp.pred.s ! gn ! Nom; --xabar marfooc _ => vp.pred.s ! gn ! Acc --xabar kaana wa laysa manSoob }; - sc : Preposition = case o of {Subord => {s=[]; c=Acc} ; Dir => vp.sc} ; + sc : Preposition = case o of {Subord => {s=[]; c=Acc} ; _ => vp.sc} ; subj = np.empty ++ sc.s ++ case vp.isPred of { False => (proDrop np).s ! sc.c ; -- prodrop if it's not predicative @@ -1588,8 +1588,8 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf -> Obj : Type = { s : Str ; - a : Agr -- default Agr in a VP without real Obj is Per3 Masc Sg - }; + a : Agr -- default Agr in a VP without real Obj is Per3 Masc Sg. + }; -- need isPron for word order in predVP, and pgn for ImpersCl emptyObj : Obj = emptyNP ** {s=[]} ; diff --git a/src/arabic/SentenceAra.gf b/src/arabic/SentenceAra.gf index a46854c16..e6c7fbdc9 100644 --- a/src/arabic/SentenceAra.gf +++ b/src/arabic/SentenceAra.gf @@ -33,9 +33,9 @@ concrete SentenceAra of Sentence = CatAra ** open ImpVP vp = { s = \\p,g,n => case p of { - Pos => vp.s ! (Per2 g n) ! VPImp ++ vp.obj.s ++ vp.s2 ; - Neg => "لا" ++ vp.s ! (Per2 g n) ! (VPImpf Jus) ++ vp.obj.s ++ vp.s2 - } + Pos => vp.s ! Per2 g n ! VPImp ; + Neg => "لَا" ++ vp.s ! Per2 g n ! VPImpf Jus + } ++ vp.obj.s ++ vp.pred.s ! {g=g;n=n} ! Acc ++ vp.s2 }; -- diff --git a/src/arabic/VerbAra.gf b/src/arabic/VerbAra.gf index aa68506ab..c0e0b7e90 100644 --- a/src/arabic/VerbAra.gf +++ b/src/arabic/VerbAra.gf @@ -56,7 +56,7 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in { } ; -- : VA -> AP -> VP ; -- they become red - ComplVA v ap = predV v ** {comp = CompAP ap} ; + ComplVA v ap = predV v ** {pred = CompAP ap} ; -- ComplV2A v np ap = -- insertObj (\\_ => v.c2 ++ np.s ! Acc ++ ap.s ! np.a) (predV v) ;